interpolate inplace, add verbose option

Author: betaBison

gnss_lib_py/parsers/android.py

@@ -564,10 +564,10 @@ def prepare_kaggle_submission(state_estimate, trip_id="trace/phone"):
     output["LongitudeDegrees"] = state_estimate[wildcards["lon_*_deg"]]
 
     output.interpolate("UnixTimeMillis",["LatitudeDegrees",
-                                         "LongitudeDegrees"])
+                                         "LongitudeDegrees"],inplace=True)
     return output
 
-def solve_kaggle_dataset(folder_path, solver, *args):
+def solve_kaggle_dataset(folder_path, solver, verbose=False, *args):
     """Run solver on all kaggle traces.
 
     Additional ``*args`` arguments are passed into the ``solver``
@@ -583,6 +583,9 @@ def solve_kaggle_dataset(folder_path, solver, *args):
         AndroidDerived2022 and outputs a state_estimate NavData object.
         Additional ``*args`` arguments are passed into this ``solver``
         function.
+    verbose : bool
+        If verbose, will print each trace trajectory name and phone name
+	pair when it is solving the state estimate for that pair.
 
     Returns
     -------
@@ -606,6 +609,9 @@ def solve_kaggle_dataset(folder_path, solver, *args):
                 # convert data to Measurement class
                 derived_data = AndroidDerived2022(data_path)
 
+                if verbose:
+                    print("solving:",trace_name,phone_type)
+
                 # compute state estimate using provided solver function
                 state_estimate = solver(derived_data, *args)
 

tests/parsers/test_android.py

@@ -712,14 +712,17 @@ def test_solve_kaggle_dataset(root_path):
                    solve_wls,
                    solve_gnss_ekf,
                   ]:
-        solution = android.solve_kaggle_dataset(folder_path, solver)
+        for verbose in [True, False]:
+            solution = android.solve_kaggle_dataset(folder_path, solver,
+                                                    verbose)
 
-        solution.in_rows(["tripId","UnixTimeMillis",
-                        "LatitudeDegrees","LongitudeDegrees"])
+            solution.in_rows(["tripId","UnixTimeMillis",
+                            "LatitudeDegrees","LongitudeDegrees"])
 
-        assert solution.shape[1] == 6
+            assert solution.shape[1] == 6
 
-        expected = np.array([1619735725999,1619735726999,1619735727999,
-                             1619735728999,1619735729999,1619735730999])
-        np.testing.assert_array_equal(solution["UnixTimeMillis"],
-                                      expected)
+            expected = np.array([1619735725999,1619735726999,
+                                 1619735727999,1619735728999,
+                                 1619735729999,1619735730999])
+            np.testing.assert_array_equal(solution["UnixTimeMillis"],
+                                          expected)