adding examples and updating functions

Author: pedroccufc

pymove/tests/test_utils_data_augmentation.py

@@ -1,4 +1,3 @@
-import numpy as np
 import pandas as pd
 from numpy.testing import assert_array_almost_equal
 from pandas.testing import assert_frame_equal
@@ -19,9 +18,9 @@
 from pymove.utils.data_augmentation import (
     _augmentation,
     append_row,
+    flatten_trajectories_dataframe,
     generate_trajectories_df,
     get_all_paths,
-    flatten_trajectories_dataframe,
     instance_crossover_augmentation,
     sliding_window,
     split_crossover,
@@ -342,4 +341,4 @@ def test_transition_graph_augmentation_all_vertex():
     })
 
     transition_graph_augmentation_all_vertex(traj_df)
-    assert_frame_equal(traj_df, expected)
+    assert_frame_equal(traj_df, expected)

pymove/tests/test_utils_networkx.py

@@ -62,24 +62,24 @@
 
 def _transition_graph():
     expected_graph = DiGraph()
-    expected_graph.add_node('85', coords=(-3.8347478, -38.592189), 
+    expected_graph.add_node('85', coords=(-3.8347478, -38.592189),
                    datetime=['2017-09-02 22:00:27'], freq_source=1, freq_target=0)
-    expected_graph.add_node('673', coords=(-3.8235834, -38.590389), 
+    expected_graph.add_node('673', coords=(-3.8235834, -38.590389),
                    datetime=['2017-09-02 22:01:36'], freq_source=0, freq_target=0)
-    expected_graph.add_node('394', coords=(-3.813889, -38.5904445), 
+    expected_graph.add_node('394', coords=(-3.813889, -38.5904445),
                    datetime=['2017-09-02 22:03:08'], freq_source=0, freq_target=0)
-    expected_graph.add_node('263', coords=(-3.9067654, -38.5907723), 
+    expected_graph.add_node('263', coords=(-3.9067654, -38.5907723),
                    datetime=['2017-09-02 22:03:46'], freq_source=0, freq_target=0)
-    expected_graph.add_node('224', coords=(-3.8857223, -38.5928892), 
+    expected_graph.add_node('224', coords=(-3.8857223, -38.5928892),
                    datetime=['2017-09-02 22:07:19'], freq_source=0, freq_target=0)
-    expected_graph.add_node('623', coords=(-3.8828723, -38.5929789), 
+    expected_graph.add_node('623', coords=(-3.8828723, -38.5929789),
                datetime=['2017-09-02 22:07:40'], freq_source=0, freq_target=1)
     expected_graph.add_edge( '85', '673', weight=1, mean_times='0 days 00:01:09')
     expected_graph.add_edge('673', '394', weight=1, mean_times='0 days 00:01:32')
     expected_graph.add_edge('394', '263', weight=1, mean_times='0 days 00:00:38')
     expected_graph.add_edge('263', '224', weight=1, mean_times='0 days 00:03:33')
     expected_graph.add_edge('224', '623', weight=1, mean_times='0 days 00:00:21')
-    
+
     return expected_graph
 
 
@@ -225,4 +225,4 @@ def test_read_graph_json(tmpdir):
 
     saved_graph = read_graph_json(filename_write_default)
 
-    assert_equal(saved_graph, expected)
+    assert_equal(saved_graph, expected)

pymove/tests/test_utils_trajectories.py

@@ -21,10 +21,10 @@
 )
 from pymove.utils.networkx import build_transition_graph_from_df
 from pymove.utils.trajectories import (
-    append_trajectory, 
-    split_trajectory,
+    append_trajectory,
+    columns_to_array,
     object_for_array,
-    columns_to_array
+    split_trajectory,
 )
 
 list_data = [
@@ -59,7 +59,7 @@
                 pd.Timestamp('2017-09-02 22:03:08')],
                [pd.Timestamp('2017-09-02 23:03:46'),
                 pd.Timestamp('2017-09-02 23:07:19'),
-                pd.Timestamp('2017-09-02 23:07:40'), 
+                pd.Timestamp('2017-09-02 23:07:40'),
                 pd.Timestamp('2017-09-02 23:09:10')]],
     LOCAL_LABEL: [[85, 673, 394], [263, 224, 623, 394]],
     LATITUDE: [[-3.8347478, -3.8235834, -3.813889],
@@ -264,4 +264,4 @@ def test_columns_to_array():
     })
 
     columns_to_array(df)
-    assert_frame_equal(df, expected)
+    assert_frame_equal(df, expected)

pymove/utils/trajectories.py

@@ -15,6 +15,7 @@
 """
 from __future__ import annotations
 
+from ast import literal_eval
 from itertools import chain
 from typing import Any, Generator, Text
 
@@ -27,16 +28,15 @@
 from pandas._typing import FilePathOrBuffer
 
 from pymove.core.dataframe import MoveDataFrame
-from pymove.utils.networkx import graph_to_dict
 from pymove.utils.constants import (
     DATETIME,
     LATITUDE,
     LOCAL_LABEL,
     LONGITUDE,
-    TID_STAT,
     TRAJ_ID,
     TYPE_PANDAS,
 )
+from pymove.utils.networkx import graph_to_dict
 
 
 def read_csv(
@@ -484,19 +484,19 @@ def object_for_array(object_: str) -> ndarray:
     >>> from pymove.utils.trajectories import object_for_array
     >>>
     >>> object_1, object_2, object_3
-    ('[1, 2, 3]', '[1.5, 2.5, 3.5]', '[event, event]')
+    ('[1, 2, 3]', '[1.5, 2.5, 3.5]', "['event', 'event']")
     >>>
     >>> object_for_array(object_1)
     [1, 2, 3]
     >>> object_for_array(object_2)
     [1.5, 2.5, 3.5]
     >>> object_for_array(object_3)
-    [event, event]
+    ['event', 'event'   ]
     """
     if object_ is None:
         return object_
 
-    return eval('[' + object_ + ']', {'nan': np.nan})[0]
+    return literal_eval('[' + object_ + ']')[0]
 
 
 def columns_to_array(