Merge pull request #374 from hdefazio/dev/reorg

Delete deprecated parts of the project, reorganize some files
PTG-Kitware · Dec 4, 2023 · 576549e · 576549e
2 parents 4584271 + 667994e
commit 576549e
Show file tree

Hide file tree

Showing 910 changed files with 311 additions and 140,649 deletions.
diff --git a/angel_system/__init__.py b/angel_system/__init__.py
@@ -1,4 +0,0 @@
-from angel_system.interfaces.detect_activities import DetectActivities  # noqa: F401
-from angel_system.interfaces.mm_detect_activities import (
-    MMDetectActivities,
-)  # noqa: F401

diff --git a/angel_system/activity_hmm/__init__.py → ...ystem/activity_classification/__init__.py b/angel_system/activity_hmm/__init__.py → ...ystem/activity_classification/__init__.py
diff --git a/scripts/score_ros_tcn_predictions.ipynb → ...ification/score_ros_tcn_predictions.ipynb b/scripts/score_ros_tcn_predictions.ipynb → ...ification/score_ros_tcn_predictions.ipynb
diff --git a/angel_system/berkeley/__init__.py → ...tivity_classification/tcn_hpl/__init__.py b/angel_system/berkeley/__init__.py → ...tivity_classification/tcn_hpl/__init__.py
diff --git a/angel_system/tcn_hpl/predict.py → ...ctivity_classification/tcn_hpl/predict.py b/angel_system/tcn_hpl/predict.py → ...ctivity_classification/tcn_hpl/predict.py
@@ -18,7 +18,7 @@
 from tcn_hpl.data.components.augmentations import NormalizePixelPts
 from tcn_hpl.models.ptg_module import PTGLitModule
 
-from angel_system.impls.detect_activities.detections_to_activities.utils import (
+from angel_system.activity_classification.utils import (
     tlbr_to_xywh,
     obj_det2d_set_to_feature,
 )

diff --git a/...activity_hmm/train_activity_classifier.py → ...assification/train_activity_classifier.py b/...activity_hmm/train_activity_classifier.py → ...assification/train_activity_classifier.py
@@ -14,9 +14,9 @@
 from sklearn import preprocessing
 from sklearn.metrics import average_precision_score
 
-from angel_system.activity_hmm.support_functions import sanitize_str
+from angel_system.data.common.load_data import sanitize_str
 
-from angel_system.impls.detect_activities.detections_to_activities.utils import (
+from angel_system.activity_classification.utils import (
     obj_det2d_set_to_feature,
 )
 

diff --git a/...ivities/detections_to_activities/utils.py → ...l_system/activity_classification/utils.py b/...ivities/detections_to_activities/utils.py → ...l_system/activity_classification/utils.py