pygnss 0.1.0__cp312-cp312-musllinux_1_2_x86_64.whl → 0.2.0__cp312-cp312-musllinux_1_2_x86_64.whl

pygnss/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.0"
+__version__ = "0.2.0"

pygnss/_c_ext/src/hatanaka.c

@@ -3,7 +3,6 @@
 
 #include "hatanaka/include/crx2rnx.h"
 
-static const int N_FIELDS = 4;  // Number of fields for struct gnss_meas
 
 static char* get_crx_line(void* _args, size_t n_max, char* dst) {
 
@@ -21,6 +20,8 @@ static bool is_eof(void* _args) {
 
 static int on_measurement(const struct gnss_meas* gnss_meas, void* _args) {
 
+    static const int N_FIELDS = 5;  // Number of fields for struct gnss_meas
+
     int ret = -1;
     PyObject* list = (PyObject*)_args;
 
@@ -41,10 +42,11 @@ static int on_measurement(const struct gnss_meas* gnss_meas, void* _args) {
     PyList_SetItem(row, 1, PyUnicode_FromStringAndSize(gnss_meas->satid, 3));
     PyList_SetItem(row, 2, PyUnicode_FromStringAndSize(gnss_meas->rinex3_code, 3));
     PyList_SetItem(row, 3, PyFloat_FromDouble(gnss_meas->value));
+    PyList_SetItem(row, 4, PyLong_FromUnsignedLong(gnss_meas->lli));
 
     // Add inner lists to the outer list
     PyList_Append(list, row);
-    Py_DECREF(row); // Decrement the reference count of 'row'
+    Py_DECREF(row);  // Decrement the reference count of 'row'
 
     ret = 0;
 exit:

pygnss/filter/__init__.py

@@ -33,7 +33,7 @@ class Model(ABC):
         """
 
     @abstractmethod
-    def to_observations(self, state: np.array, compute_jacobian: bool = False) -> ModelObs:
+    def to_observations(self, state: np.array, compute_jacobian: bool = False, **kwargs) -> ModelObs:
         """
         Propagate a state to its corresponding modelled observations (i.e.
         compute expected observations/measurements for the input state)
@@ -56,7 +56,7 @@ class StateHandler(ABC):
     """
 
     @abstractmethod
-    def process_state(self, state: np.array, covariance_matrix: np.array):
+    def process_state(self, state: np.array, covariance_matrix: np.array, **kwargs):
         """
         Process the state and associated covariance_matrix
         """

pygnss/filter/ekf.py

@@ -36,7 +36,7 @@ class Ekf(object):
 
         self.L = len(self.x)
 
-    def process(self, y_k: np.array, R: np.array):
+    def process(self, y_k: np.array, R: np.array, **kwargs):
         """
         Process an observation batch
         """
@@ -45,7 +45,7 @@ class Ekf(object):
         x_m, P_m = self._time_update()
 
         # Measurement update ---------------------------------------------------
-        y_m, H = self.model.to_observations(x_m, compute_jacobian=True)
+        y_m, H = self.model.to_observations(x_m, compute_jacobian=True, **kwargs)
 
         P_yy = H @ P_m @ H.T + R
         P_xy = P_m @ H.T
@@ -62,7 +62,10 @@ class Ekf(object):
         except np.linalg.LinAlgError as e:
             self.logger.warning(f'Unable to compute state, keeping previous one. Error: {e}')
 
-        self.state_handler.process_state(self.x, self.P)
+        # Compute postfit residuals
+        r = y_k - self.model.to_observations(self.x, **kwargs).y_m
+
+        self.state_handler.process_state(self.x, self.P, postfits=r, **kwargs)
 
     def _time_update(self) -> Tuple[np.array, np.array]:
         """

pygnss/filter/ukf.py

@@ -60,7 +60,7 @@ class Ukf(object):
         self.w_m[0] = k
         self.w_c[0] = k + 1 - alpha2 + beta
 
-    def process(self, y_k: np.array, R: np.array):
+    def process(self, y_k: np.array, R: np.array, **kwargs):
         """
         Process an observation batch
 
@@ -85,7 +85,7 @@ class Ukf(object):
         P_m = self.Q + _weighted_average_of_outer_product(spread_chi_m, spread_chi_m, self.w_c)
 
         # Propagate the sigma points to the observation space (psi_m, $\mathcal{Y}_{k|k-1}$)
-        psi_m = np.array([self.model.to_observations(sigma_point).y_m for sigma_point in chi_m])
+        psi_m = np.array([self.model.to_observations(sigma_point, **kwargs).y_m for sigma_point in chi_m])
         n_dim = len(psi_m.shape)
         if n_dim == 1:
             raise ValueError(f'Unexpected size for sigma point propagation, got [ {n_dim} ], '
@@ -115,7 +115,10 @@ class Ukf(object):
         except np.linalg.LinAlgError as e:
             self.logger.warning(f'Unable to compute state, keeping previous one. Error: {e}')
 
-        self.state_handler.process_state(self.x, self.P)
+        # Compute postfit residuals
+        r = y_k - self.model.to_observations(self.x, **kwargs).y_m
+
+        self.state_handler.process_state(self.x, self.P, postfits=r, **kwargs)
 
     def _generate_sigma_points(self) -> np.array:
         """

pygnss/hatanaka.py

@@ -4,10 +4,15 @@ import tempfile
 
 from pygnss._c_ext import _read_crx
 
-def to_dataframe(filename:str, station:str = "none") -> pd.DataFrame:
+def to_dataframe(filename:str, station:str = "none", strict_lli: bool = True) -> pd.DataFrame:
     """
     Convert a Compressed (crx.gz) or uncompressed (crx) Hatanaka file into a
     DataFrame
+
+    :param filename: Hatanaka [gzip compressed] filename
+    :param station: force station name
+    :param strict_lli: Mark cycle slips only when Phase LLI is 1 (as per RINEX convention).
+    If False, any value of Phase LLI will trigger a cycle slip flag
     """
 
     if filename.endswith('crx.gz') or filename.endswith('crx.Z') or filename.endswith('crz'):
@@ -23,13 +28,24 @@ def to_dataframe(filename:str, station:str = "none") -> pd.DataFrame:
     else:
         array = _read_crx(filename)
 
-    df = pd.DataFrame(array, columns=['epoch', 'sat', 'rinex3_code', 'value'])
+    df = pd.DataFrame(array, columns=['epoch', 'sat', 'rinex3_code', 'value', 'lli'])
     df['channel'] = df['rinex3_code'].str[-2:]
     df['signal'] = df['sat'] + df['channel']
     MAPPING = {'C': 'range', 'L': 'phase', 'D': 'doppler', 'S': 'snr'}
     df['obstype'] = df['rinex3_code'].str[0].map(lambda x: MAPPING.get(x, 'Unknown'))
-    df = df.pivot_table(index=['epoch', 'signal', 'sat', 'channel'], columns=['obstype'], values='value')
+    df = df.pivot_table(index=['epoch', 'signal', 'sat', 'channel'], columns=['obstype'], values=['value', 'lli'])
+
+    # Remove all LLI columns except for the phase (for the cycle slips)
+    if strict_lli:
+        df['cslip'] = (df.loc[:, pd.IndexSlice['lli', 'phase']] % 2) == 1
+    else:
+        df['cslip'] = df.loc[:, pd.IndexSlice['lli', 'phase']] > 0
+
+    df.drop('lli', axis=1, inplace=True)
+    df.columns = [v[1] if v[0] == 'value' else v[0] for v in df.columns.values]
+
     df.reset_index(inplace=True)
+
     df['station'] = station
 
     return df

{pygnss-0.1.0.dist-info → pygnss-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pygnss
-Version: 0.1.0
+Version: 0.2.0
 Summary: Package with utilities and tools for GNSS data processing
 Author-email: Miquel Garcia-Fernandez <miquel@mgfernan.com>
 License: MIT
@@ -18,19 +18,13 @@ Requires-Dist: flake8>=7.0.0; extra == "test"
 Provides-Extra: release
 Requires-Dist: python-semantic-release>=9.4.0; extra == "release"
 
-# pyrok-tools
-
-Python tools used in internal Rokubun projects. This repository contains the following modules:
-
-- `logger`, a module that extends basic Python logging
-- `geodetic`, to perform basic geodetic transformation (Cartesian to Geodetic,
-  Cartesian to Local Tangential Plane, ...)
+# GNSS and Navigation modules
 
 ## Installation
 
 To make sure that the extensions are installed along with the package, run
 
-`pip install pygnss*.whl`
+`pip install pygnss`
 
 ## Modules
 
@@ -58,10 +52,3 @@ Traceback (most recent call last):
   ...
 ValueError: Exception message
 ```
-
-## Deployment to PyPi
-
-The project is published automatically using internal Gitlab CI on each commit to `trunk` to PyPi repository [pygnss](https://pypi.org/project/pygnss/)
-
-It uses semantic versioning and conventional commits to set the version and [semantic-release](https://python-semantic-release.readthedocs.io/en/latest/index.html) as
-versioning tool.

{pygnss-0.1.0.dist-info → pygnss-0.2.0.dist-info}/RECORD

@@ -1,36 +1,36 @@
-pygnss/hatanaka.py,sha256=s8XnJ_ZEm3IknBcUQJU5vW5lKRFpLSlhWQDIsRjB3uo,1286
-pygnss/file.py,sha256=kkMBWjoTPkxJD1UgH0mXJT2fxnhU8u7_l2Ph5Xz2-hY,933
-pygnss/rinex.py,sha256=LsOOh3Fc263kkM8KOUBNeMeIAmbOn2ASSBO4rAUJWj8,68783
+pygnss-0.2.0.dist-info/LICENSE,sha256=Wwany6RAAZ9vVHjFLA9KBJ0HE77d52s2NOUA1CPAEug,1067
+pygnss-0.2.0.dist-info/WHEEL,sha256=c9GU1jhDUn7S-APtjPhve05mT2FAOW_4NMGdpCIyIBM,112
+pygnss-0.2.0.dist-info/METADATA,sha256=Hak3b6_DXaFefbHOylzU0BfjjErmA7MxzZhbTqzSdks,1614
+pygnss-0.2.0.dist-info/top_level.txt,sha256=oZRSR-qOv98VW2PRRMGCVNCJmewcJjyJYmxzxfeimtg,7
+pygnss-0.2.0.dist-info/RECORD,,
+pygnss-0.2.0.dist-info/entry_points.txt,sha256=mCuKrljB_wh9ZQVROiId9m68EDbTiY1oef_L1N3IDDA,262
 pygnss/sinex.py,sha256=nErOmGCFFmGSnmWGNTJhaj3yZ6IIB8GgtW5WPypJc6U,3057
+pygnss/file.py,sha256=kkMBWjoTPkxJD1UgH0mXJT2fxnhU8u7_l2Ph5Xz2-hY,933
+pygnss/__init__.py,sha256=Zn1KFblwuFHiDRdRAiRnDBRkbPttWh44jKa5zG2ov0E,22
 pygnss/geodetic.py,sha256=gfVsOeEKLn2RaJYpaCk0OrQpYz6QiDPMX6PoJHEaP9Q,34029
 pygnss/cl.py,sha256=ISmd2RjikUMmj3nLPN0VSjvQLG5rLizp2X2ajeBkoDE,4509
+pygnss/constants.py,sha256=1hF6K92X6E6Ofo0rAuCBCgrwln9jxio26RV2a6vyURk,133
+pygnss/decorator.py,sha256=ldlZuvwuIlJf2pkoWteyXyp5tLds8KRkphrPsrURw9U,491
 pygnss/tensorial.py,sha256=aA0-0WK2MXhDUg0_8HMbECOt9cXmp3EnKFQXjdYMBXA,1598
 pygnss/time.py,sha256=YdMNs2xA43LrSgEOgB7jpEq0dCWv89fUBF5syDLjbu0,11178
-pygnss/logger.py,sha256=4kvcTWXPoiG-MlyP6B330l4Fu7MfCuDjuIlIiLA8f1Y,1479
-pygnss/decorator.py,sha256=ldlZuvwuIlJf2pkoWteyXyp5tLds8KRkphrPsrURw9U,491
+pygnss/hatanaka.py,sha256=P9XG6bZwUzfAPYn--6-DXfFQIEefeimE7fMJm_DF5zE,1951
+pygnss/_c_ext.cpython-312-x86_64-linux-musl.so,sha256=HIZmPjMg3D5ZISMjeWWIsqK-MCepnPHQLwPJnAYO82Q,83184
 pygnss/stats.py,sha256=mDiY0K-VTndlFEkbxTzq9PYxCOjYDYsY3ZQV0PuMREM,1924
-pygnss/__init__.py,sha256=kUR5RAFc7HCeiqdlX36dZOHkUI5wI6V_43RpEcD8b-0,22
-pygnss/_c_ext.cpython-312-x86_64-linux-musl.so,sha256=bQnKnKKlBn4CqS2OPJKuEE73XwzaJ_XjO71UrlyYARQ,83008
-pygnss/constants.py,sha256=1hF6K92X6E6Ofo0rAuCBCgrwln9jxio26RV2a6vyURk,133
+pygnss/rinex.py,sha256=LsOOh3Fc263kkM8KOUBNeMeIAmbOn2ASSBO4rAUJWj8,68783
+pygnss/logger.py,sha256=4kvcTWXPoiG-MlyP6B330l4Fu7MfCuDjuIlIiLA8f1Y,1479
+pygnss/gnss/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+pygnss/gnss/types.py,sha256=lmL15KRckRiTwVkYvGzF4c1BrojnQlegrYCXSz1hGaI,10377
+pygnss/gnss/observables.py,sha256=0x0NLkTjxf8cO9F_f_Q1b-1hEeoNjWB2x-53ecUEv0M,1656
+pygnss/gnss/edit.py,sha256=T1r0WbJmt8tLJpG_IIsy4Atej6cy0IStBaSGxw0S5ho,1884
+pygnss/gnss/residuals.py,sha256=8qKGNOYkrqxHGOSjIfH21K82PAqEh2068kf78j5usL8,1244
+pygnss/filter/ukf.py,sha256=koaal4aLyYtYwPhVIvjn4uXsmSDDOQnnFEv4xenryqo,10646
+pygnss/filter/__init__.py,sha256=0gGBaZZgaFSiTxt0Mycn0oGZjJyATo8AAAgXhxh9k6c,1850
+pygnss/filter/ekf.py,sha256=D-qtalFRguVj4HcOtCtE0lGGXtVibC7qg-AZhKjmwgM,2017
 pygnss/filter/models.py,sha256=gXq7-YBcAoDq4-7Wr0ChNWxwXr9m1EEhUnlLtKVlsAQ,2165
-pygnss/filter/__init__.py,sha256=Ek5NM48EiDbnjYDz7l1QLojkAQre5tzPjCgssH0hwoU,1830
-pygnss/filter/ekf.py,sha256=wtjjXbeJ7_MSL32dMsoTcppEAaWvqMNuDIcMmDCwyFQ,1871
-pygnss/filter/ukf.py,sha256=wEgDKV6VpEIIZl2KG3sLT0HA-K8yAw9UI0WlA1gyYm0,10500
-pygnss/_c_ext/src/mtable_init.c,sha256=5w869E6PX-ca9UHhKBxLFRW694-VaNwGlMs0I5v99mk,1132
-pygnss/_c_ext/src/hatanaka.c,sha256=IhQa7s2bwNCVb8ARxmhFDdJ8VzitN2-cpMlCMqRD8Wk,2445
-pygnss/_c_ext/src/helpers.c,sha256=gINr73ktRgox_S7fYdFR58lLqAUACRpJfog4M5BW1-Q,364
-pygnss/parsers/rtklib/stats.py,sha256=YV6yadxMeQMQYZvsUCaSf4ZTpK8Bbv3f2xgu0l4PekA,5449
+pygnss/orbit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pygnss/orbit/kepler.py,sha256=QORTgg5yBtsQXxLWSzoZ1pmh-CwPiZlFdIYqhQhv1a0,1745
 pygnss/orbit/tle.py,sha256=6CIEielPgui3DXNv46XxOGlig31ROIwjH42xLGaeE5M,5905
-pygnss/orbit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pygnss/gnss/types.py,sha256=lmL15KRckRiTwVkYvGzF4c1BrojnQlegrYCXSz1hGaI,10377
-pygnss/gnss/residuals.py,sha256=8qKGNOYkrqxHGOSjIfH21K82PAqEh2068kf78j5usL8,1244
-pygnss/gnss/edit.py,sha256=T1r0WbJmt8tLJpG_IIsy4Atej6cy0IStBaSGxw0S5ho,1884
-pygnss/gnss/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pygnss/gnss/observables.py,sha256=0x0NLkTjxf8cO9F_f_Q1b-1hEeoNjWB2x-53ecUEv0M,1656
-pygnss-0.1.0.dist-info/LICENSE,sha256=Wwany6RAAZ9vVHjFLA9KBJ0HE77d52s2NOUA1CPAEug,1067
-pygnss-0.1.0.dist-info/WHEEL,sha256=c9GU1jhDUn7S-APtjPhve05mT2FAOW_4NMGdpCIyIBM,112
-pygnss-0.1.0.dist-info/RECORD,,
-pygnss-0.1.0.dist-info/top_level.txt,sha256=oZRSR-qOv98VW2PRRMGCVNCJmewcJjyJYmxzxfeimtg,7
-pygnss-0.1.0.dist-info/entry_points.txt,sha256=mCuKrljB_wh9ZQVROiId9m68EDbTiY1oef_L1N3IDDA,262
-pygnss-0.1.0.dist-info/METADATA,sha256=SC0RWTHDiJbzIZNN4GimNwhH90bRDqbuQSVnvsV_5I4,2240
+pygnss/_c_ext/src/hatanaka.c,sha256=YNWaMzQQQnTNls5J6TMNuyhlq505NGDfzU-MJAHab8Q,2520
+pygnss/_c_ext/src/helpers.c,sha256=gINr73ktRgox_S7fYdFR58lLqAUACRpJfog4M5BW1-Q,364
+pygnss/_c_ext/src/mtable_init.c,sha256=5w869E6PX-ca9UHhKBxLFRW694-VaNwGlMs0I5v99mk,1132
+pygnss/parsers/rtklib/stats.py,sha256=YV6yadxMeQMQYZvsUCaSf4ZTpK8Bbv3f2xgu0l4PekA,5449