Merge pull request #106 from yupidevs/develop

Develop
yupidevs · Oct 9, 2022 · 5d38bd6 · 5d38bd6
2 parents 34eec5b + df41c40
commit 5d38bd6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 9 deletions.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -30,7 +30,7 @@
 author = "Gustavo Viera-López, Alfredo Reyes, Jorge Morgado, Ernesto Altshuler"
 
 # The full version, including alpha/beta/rc tags
-release = "0.11.0"
+release = "0.11.1"
 
 
 # -- General configuration ---------------------------------------------------

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "yupi"
-version = "0.11.0"
+version = "0.11.1"
 description = "A package for tracking and analysing objects trajectories"
 authors = [
     "Gustavo Viera-López <[email protected]>",

diff --git a/tests/test_stats/test_stats.py b/tests/test_stats/test_stats.py
@@ -54,7 +54,6 @@ def test_turning_angles(traj):
 
 
 def test_speed_ensemble(traj1):
-    print(traj1.v)
     se = speed_ensemble([traj1, traj1])
     assert se == pytest.approx([4, 1.5, 3, 3, 4, 1.5, 3, 3], APPROX_REL_TOLERANCE)
 

diff --git a/yupi/__init__.py b/yupi/__init__.py
@@ -27,4 +27,4 @@
     "WindowType",
 ]
 
-__version__ = "0.11.0"
+__version__ = "0.11.1"
diff --git a/yupi/_differentiation.py b/yupi/_differentiation.py
@@ -237,7 +237,6 @@ def estimate_accelereation(
     if method == DiffMethod.LINEAR_DIFF:
         diff = _linear_diff(traj.r, traj.t, window_type)
         diff = _linear_diff(diff, traj.t, window_type)
-        print(diff)
         return diff
     if method == DiffMethod.FORNBERG_DIFF:
         if window_type == WindowType.FORWARD:

diff --git a/yupi/core/serializers/csv_serializer.py b/yupi/core/serializers/csv_serializer.py
@@ -53,7 +53,7 @@ def save(
             )
             accuracy = Trajectory.general_diff_est.get("accuracy", 1)
             method = traj.diff_est.get("method", diff_method).value
-            window = traj.diff_est.get("window", diff_win).value
+            window = traj.diff_est.get("window_type", diff_win).value
             accuracy = traj.diff_est.get("accuracy", accuracy)
 
             writer.writerow([traj.traj_id, dt, traj.dim])

diff --git a/yupi/core/serializers/json_serializer.py b/yupi/core/serializers/json_serializer.py
@@ -40,10 +40,13 @@ def save(
             file_name, overwrite=overwrite, extension=".json"
         )
 
+        method = Trajectory.general_diff_est.get("method", diff.DiffMethod.LINEAR_DIFF)
+        window = Trajectory.general_diff_est.get("window_type", diff.WindowType.CENTRAL)
+        accuracy = Trajectory.general_diff_est.get("accuracy", 1)
         diff_est = {
-            "method": traj.diff_est.get("method", diff.DiffMethod.LINEAR_DIFF).value,
-            "window_type": traj.diff_est.get("window", diff.WindowType.CENTRAL).value,
-            "accuracy": traj.diff_est.get("accuracy", 1),
+            "method": traj.diff_est.get("method", method).value,
+            "window_type": traj.diff_est.get("window_type", window).value,
+            "accuracy": traj.diff_est.get("accuracy", accuracy),
         }
 
         json_dict = {