Skip to content

Commit f12e783

Browse files
committed
Minor docs and naming changes
1 parent 7c35e10 commit f12e783

5 files changed

Lines changed: 25 additions & 22 deletions

File tree

build_docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ poetry run make clean
2626
echo "Building docs in html"
2727
poetry run make html
2828

29-
# export requirements.txt for setup.py
29+
# export requirements.txt for Conda environment setup
3030
cd ..
3131
poetry export -f requirements.txt --output ./requirements.txt --without-hashes

docs/source/install.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Editable Installation
5353
5454
python -m pip install -U pip
5555
56-
4. Install :code:`gnss_lib_py` locally from directory containing :code:`setup.py`
56+
4. Install :code:`gnss_lib_py` locally from directory containing :code:`pyproject.toml`
5757

5858
.. code-block:: bash
5959

gnss_lib_py/parsers/rinex.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
from gnss_lib_py.utils.time_conversions import datetime_to_gps_millis
1414

1515

16-
class RinexObs3(NavData):
17-
"""Class handling Rinex 3 observation files [1]_.
16+
class RinexObs(NavData):
17+
"""Class handling Rinex observation files [1]_.
1818
1919
The Rinex Observation files (of the format .yyo) contain measured
2020
pseudoranges, carrier phase, doppler and signal-to-noise ratio
@@ -23,6 +23,9 @@ class RinexObs3(NavData):
2323
measurements from different bands are treated as separate measurement
2424
instances. Inherits from NavData().
2525
26+
This class has primarily been built with Rinex v3.05 in mind but it
27+
should also work for prior Rinex versions.
28+
2629
2730
References
2831
----------
@@ -32,7 +35,7 @@ class RinexObs3(NavData):
3235
"""
3336

3437
def __init__(self, input_path):
35-
"""Loading Rinex 3 observation files into a NavData based class.
38+
"""Loading Rinex observation files into a NavData based class.
3639
3740
Should input path to `.yyo` file.
3841

notebooks/tutorials/parsers.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@
431431
"source": [
432432
"# download Rinex obs file and load it into NavData instance\n",
433433
"!wget https://raw.githubusercontent.com/Stanford-NavLab/gnss_lib_py/ashwin/rinex-3-o/data/unit_test/rinex/obs/rinex_obs_mixed_types.20o --quiet -O \"rinex_obs_mixed_types.20o\"\n",
434-
"rinex_obs_3 = glp.RinexObs3(\"rinex_obs_mixed_types.20o\")\n",
434+
"rinex_obs_3 = glp.RinexObs(\"rinex_obs_mixed_types.20o\")\n",
435435
"print('Loaded Rinex Obs 3 data for the first time instant\\n', \\\n",
436436
" rinex_obs_3.where('gps_millis', rinex_obs_3['gps_millis', 0], 'eq'))"
437437
]

tests/parsers/test_rinex.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import pytest
1212
from pytest_lazyfixture import lazy_fixture
1313

14-
from gnss_lib_py.parsers.rinex import RinexObs3
14+
from gnss_lib_py.parsers.rinex import RinexObs
1515

1616
# pylint: disable=protected-access
1717

@@ -47,12 +47,12 @@ def fixture_rinex_mixed_values(root_path):
4747
4848
Returns
4949
-------
50-
rinex_mixed : gnss_lib_py.parsers.rinex.RinexObs3
51-
Instance of RinexObs3 class with mixed values.
50+
rinex_mixed : gnss_lib_py.parsers.rinex.RinexObs
51+
Instance of RinexObs class with mixed values.
5252
"""
5353
rinex_mixed_path = os.path.join(root_path, 'rinex_obs_mixed_types.20o')
5454
with pytest.warns(RuntimeWarning):
55-
rinex_mixed = RinexObs3(rinex_mixed_path)
55+
rinex_mixed = RinexObs(rinex_mixed_path)
5656
return rinex_mixed
5757

5858

@@ -71,13 +71,13 @@ def fixture_rinex_single_values(root_path):
7171
7272
Returns
7373
-------
74-
rinex_single : gnss_lib_py.parsers.rinex.RinexObs3
75-
Instance of RinexObs3 class with single values.
74+
rinex_single : gnss_lib_py.parsers.rinex.RinexObs
75+
Instance of RinexObs class with single values.
7676
"""
7777
rinex_single_path = os.path.join(root_path,
7878
'rinex_obs_single_type_only.22o')
7979
with pytest.warns(RuntimeWarning):
80-
rinex_single = RinexObs3(rinex_single_path)
80+
rinex_single = RinexObs(rinex_single_path)
8181
return rinex_single
8282

8383

@@ -123,8 +123,8 @@ def test_rinex_obs_3_load_single(rinex_single_values, single_exp_values):
123123
124124
Parameters
125125
----------
126-
rinex_single_values : gnss_lib_py.parsers.rinex.RinexObs3
127-
Instance of RinexObs3 class with data loaded from appropriate
126+
rinex_single_values : gnss_lib_py.parsers.rinex.RinexObs
127+
Instance of RinexObs class with data loaded from appropriate
128128
file.
129129
compare_values : list
130130
List of lists containing time instance, gnss_sv_id, and expected
@@ -148,8 +148,8 @@ def test_rinex_obs_3_load_mixed(rinex_mixed_values, mixed_exp_values):
148148
149149
Parameters
150150
----------
151-
rinex_navdata : gnss_lib_py.parsers.rinex.RinexObs3
152-
Instance of RinexObs3 class with data loaded from appropriate
151+
rinex_navdata : gnss_lib_py.parsers.rinex.RinexObs
152+
Instance of RinexObs class with data loaded from appropriate
153153
file.
154154
compare_values : list
155155
List of indices and values to compare against.
@@ -206,7 +206,7 @@ def test_rinex_obs_3_complete_load(rinex_navdata, time_steps, sats_per_time):
206206
Parameters
207207
----------
208208
rinex_navdata : str
209-
Instance of RinexObs3 class with data loaded from appropriate
209+
Instance of RinexObs class with data loaded from appropriate
210210
file.
211211
time_steps : int
212212
Total times that have measurements in the observation file.
@@ -223,16 +223,16 @@ def test_rinex_obs_3_complete_load(rinex_navdata, time_steps, sats_per_time):
223223

224224

225225
def test_rinex_obs_3_fails(rinex_mixed_values):
226-
"""Test for cases when no measurements should exist in RinexObs3.
226+
"""Test for cases when no measurements should exist in RinexObs.
227227
228228
The cases where no measurements should be loaded are: 1) when the
229229
SV hasn't been received, and 2) when the SV has been received but
230230
a measurement is unavailable.
231-
231+
232232
Parameters
233233
----------
234-
rinex_mixed_values : gnss_lib_py.parsers.rinex.RinexObs3
235-
Instance of RinexObs3 class with data loaded from file with
234+
rinex_mixed_values : gnss_lib_py.parsers.rinex.RinexObs
235+
Instance of RinexObs class with data loaded from file with
236236
measurements received in both, single and double bands.
237237
"""
238238
for count , (_, _, rinex_frame) in enumerate(rinex_mixed_values.loop_time('gps_millis')):

0 commit comments

Comments
 (0)