group into folder

Former-commit-id: dc7bfbbd0c [formerly 3ca744df99] [formerly 3d16bb5bbd [formerly 5f41e183ae]] [formerly 729a2471b4 [formerly b5327658f8] [formerly 01f906b4f1 [formerly 7f0be2827f]]] [formerly 78eb5bf681 [formerly 92482fb4aa] [formerly 625c2e3a7e [formerly 7bf6e5fa28]] [formerly 6d54fd6bed [formerly d03643875a] [formerly 53d12df6df [formerly 268bb82a91]]]] [formerly 00bc78bbd3 [formerly 0922eab7c6] [formerly 18af0b7ecd [formerly abd196b7b7]] [formerly 0cb85e92b3 [formerly 8e3a53b6d7] [formerly aef929ccdb [formerly 26ab8eeba0]]] [formerly 7047bd92f1 [formerly 8965b0faf0] [formerly ab53b96565 [formerly 814f8f0f36]] [formerly 3072224f91 [formerly 93fa2d4f6d] [formerly 76ab40fe1b [formerly 3959e5ad4a]]]]] [formerly 4f25096e37 [formerly 15a2980fb9] [formerly 2338b79a16 [formerly 430ee94468]] [formerly 9539cf1df5 [formerly e023b5484a] [formerly 3f61ea1839 [formerly fcc6cd8f54]]] [formerly dfc45b0372 [formerly 715350ee31] [formerly 31eb8eb936 [formerly 79ef03df7f]] [formerly 8271b2c198 [formerly 6f58155921] [formerly 1973d5c7a7 [formerly a146a4f3db]]]] [formerly 0ca1c64472 [formerly 0e87d6bf8a] [formerly e4361a10c1 [formerly eceb1696e3]] [formerly 9062576230 [formerly 7b1577b61c] [formerly feae077f63 [formerly 0f1e3701df]]] [formerly e2415ee142 [formerly 095d3b4211] [formerly 0ac0f249c1 [formerly 49acfcf617]] [formerly be42573943 [formerly 742f73259a] [formerly e70fec1de9 [formerly 3511514342]]]]]]
Former-commit-id: cbdc86d196 [formerly 22518f24fc] [formerly 6a29499061 [formerly 3f4664f615]] [formerly 672b52311b [formerly ffc476e91b] [formerly 83f13f2b62 [formerly 997ad876a9]]] [formerly 0a74eaf4c1 [formerly b90f15a550] [formerly 8aaab6be45 [formerly 3de83aa3f2]] [formerly 50b16c4e09 [formerly 5dbbb455c0] [formerly ac4f17a3f1 [formerly 3a4f876f0c]]]] [formerly ad77b05e09 [formerly 8942efd170] [formerly e35fd3659c [formerly 804e8443d2]] [formerly e0bb5e8b11 [formerly 29fb65a56e] [formerly 4039900e8b [formerly a18e638938]]] [formerly d733af0635 [formerly 130fa77c67] [formerly edd515d3ef [formerly 8f7782ccad]] [formerly 21ebc4753c [formerly 8e6a82ad59] [formerly e70fec1de9]]]]
Former-commit-id: dec666697f [formerly 2e605492b7] [formerly 6037d93bff [formerly 436cc99a3c]] [formerly 178668f0d2 [formerly 075d38fed4] [formerly 99a90daec6 [formerly 3d619f8d42]]] [formerly 080f9d57c9 [formerly a239a36a23] [formerly 1aae767967 [formerly 6e11d426c3]] [formerly 92c7495eb0 [formerly 9a5363b1c6] [formerly 5e94bcdbf9 [formerly 020cd2a13c]]]]
Former-commit-id: 31c811bc8a [formerly a3090b22f2] [formerly f8cd8cfb06 [formerly 108f6a2ae4]] [formerly f8c5eea6bd [formerly f27013177a] [formerly 1bacd4bf63 [formerly c262029fae]]]
Former-commit-id: c1a8dce789 [formerly 4e4ece5e54] [formerly 4731a09f7a [formerly 223694eb2b]]
Former-commit-id: 58143b789f [formerly 0eefa0e1e2]
Former-commit-id: 8f4ff51cf2

tods/utils/ABOD_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.ABOD_skinterface import ABODSKI
+from skinterface.primitiveSKI.detection_algorithm.ABOD_skinterface import ABODSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/AutoEncoder_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.AutoEncoder_skinterface import AutoEncoderSKI
+from skinterface.primitiveSKI.detection_algorithm.AutoEncoder_skinterface import AutoEncoderSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/AutoRegODetectAPI.py

@@ -1,23 +0,0 @@
-import numpy as np
-from test_interface import SKInterface
-from tods.detection_algorithm.AutoRegODetect import AutoRegODetectorPrimitive
-
-class AutoRegODetect(SKInterface):
-    def __init__(self, **hyperparams):
-        super().__init__(primitive=AutoRegODetectorPrimitive, **hyperparams)
-
-    
-
-
-if __name__ == '__main__':
-    X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
-    X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
-
-    transformer = AutoRegODetect(contamination=0.2, window_size=2)#use_column=(1,)
-    transformer.fit(X_train)
-    prediction_labels = transformer.produce(X_test)
-    prediction_score = transformer.produce_score(X_test)
-
-    print("Prediction Labels\n", prediction_labels)
-    print("Prediction Score\n", prediction_score)
-

tods/utils/AutoRegODetector_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.AutoRegODetector_skinterface import AutoRegODetectorSKI
+from skinterface.primitiveSKI.detection_algorithm.AutoRegODetector_skinterface import AutoRegODetectorSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/CBLOF_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.CBLOF_skinterface import CBLOFSKI
+from skinterface.primitiveSKI.detection_algorithm.CBLOF_skinterface import CBLOFSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/COF_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.COF_skinterface import COFSKI
+from skinterface.primitiveSKI.detection_algorithm.COF_skinterface import COFSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/DeepLog_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.DeepLog_skinterface import DeepLogSKI
+from skinterface.primitiveSKI.detection_algorithm.DeepLog_skinterface import DeepLogSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/Ensemble_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.Ensemble_skinterface import EnsembleSKI
+from skinterface.primitiveSKI.detection_algorithm.Ensemble_skinterface import EnsembleSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/HBOS_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.HBOS_skinterface import HBOSSKI
+from skinterface.primitiveSKI.detection_algorithm.HBOS_skinterface import HBOSSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/IsolationForest_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.IsolationForest_skinterface import IsolationForestSKI
+from skinterface.primitiveSKI.detection_algorithm.IsolationForest_skinterface import IsolationForestSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/KDiscordODetector_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.KDiscordODetector_skinterface import KDiscordODetectorSKI
+from skinterface.primitiveSKI.detection_algorithm.KDiscordODetector_skinterface import KDiscordODetectorSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/KNN_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.KNN_skinterface import KNNSKI
+from skinterface.primitiveSKI.detection_algorithm.KNN_skinterface import KNNSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/LODA_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.LODA_skinterface import LODASKI
+from skinterface.primitiveSKI.detection_algorithm.LODA_skinterface import LODASKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/LOF_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.LOF_skinterface import LOFSKI
+from skinterface.primitiveSKI.detection_algorithm.LOF_skinterface import LOFSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/LSTMODetector_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.LSTMODetector_skinterface import LSTMODetectorSKI
+from skinterface.primitiveSKI.detection_algorithm.LSTMODetector_skinterface import LSTMODetectorSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/MatrixProfile_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.MatrixProfile_skinterface import MatrixProfileSKI
+from skinterface.primitiveSKI.detection_algorithm.MatrixProfile_skinterface import MatrixProfileSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/Mo_Gaal_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.Mo_Gaal_skinterface import Mo_GaalSKI
+from skinterface.primitiveSKI.detection_algorithm.Mo_Gaal_skinterface import Mo_GaalSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/OCSVM_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.OCSVM_skinterface import OCSVMSKI
+from skinterface.primitiveSKI.detection_algorithm.OCSVM_skinterface import OCSVMSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/PCAODetector_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.PCAODetector_skinterface import PCAODetectorSKI
+from skinterface.primitiveSKI.detection_algorithm.PCAODetector_skinterface import PCAODetectorSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/SOD_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.SOD_skinterface import SODSKI
+from skinterface.primitiveSKI.detection_algorithm.SOD_skinterface import SODSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/So_Gaal_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.So_Gaal_skinterface import So_GaalSKI
+from skinterface.primitiveSKI.detection_algorithm.So_Gaal_skinterface import So_GaalSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/SystemWiseDetection_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.SystemWiseDetection_skinterface import SystemWiseDetectionSKI
+from skinterface.primitiveSKI.detection_algorithm.SystemWiseDetection_skinterface import SystemWiseDetectionSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/Telemanom_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.Telemanom_skinterface import TelemanomSKI
+from skinterface.primitiveSKI.detection_algorithm.Telemanom_skinterface import TelemanomSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/VariationalAutoEncoder_main.py

@@ -1,5 +1,5 @@
 import numpy as np
-from skinterface.primitiveSKI.VariationalAutoEncoder_skinterface import VariationalAutoEncoderSKI
+from skinterface.primitiveSKI.detection_algorithm.VariationalAutoEncoder_skinterface import VariationalAutoEncoderSKI
 
 X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])
 X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])

tods/utils/skinterface/main_generation.py

@@ -30,7 +30,7 @@ for primitive_index, primitive_start_loc in enumerate(primitive_start_loc_buf):
 # sys.path.insert(0, 'tods/utils')"""
     import_line1 = 'import numpy as np' 
 
-    import_line2 = '\nfrom skinterface.primitiveSKI.'+ primitve_api_name + ' import ' + class_name + '\n\n'
+    import_line2 = '\nfrom skinterface.primitiveSKI.detection_algorithm.'+ primitve_api_name + ' import ' + class_name + '\n\n'
     #print(import_line)
 
     main_line1 = """X_train = np.array([[3., 4., 8., 16, 18, 13., 22., 36., 59., 128, 62, 67, 78, 100]])

tods/utils/skinterface/primitiveSKI/AutoCorrelation_skinterface.py

@@ -1,8 +0,0 @@
-import numpy as np 
-from .Base_skinterface import BaseSKI
-from tods.feature_analysis.AutoCorrelation import AutoCorrelationPrimitive
-
-class AutoCorrelationSKI(BaseSKI):
-	def __init__(self, **hyperparams):
-		super().__init__(primitive=AutoCorrelationPrimitive, **hyperparams)
-

tods/utils/skinterface/primitiveSKI/__init__.py

@@ -1,6 +0,0 @@
-# from primitiveSKI.ABOD_skinterface import ABODSKI 
-# from primitiveSKI.AutoRegODetector_skinterface import AutoRegODetectorSKI
-#from ABOD_skinterface import ABODSKI 
-#from AutoRegODetector_skinterface import AutoRegODetectorSKI
-# import ABODSKI
-# import AutoRegODetectorSKI

tods/utils/skinterface/primitiveSKI/ABOD_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/ABOD_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodABOD import ABODPrimitive
 
 class ABODSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/AutoEncoder_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoEncoder_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodAE import AutoEncoderPrimitive
 
 class AutoEncoderSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/AutoRegODetector_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoRegODetector_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.AutoRegODetect import AutoRegODetectorPrimitive
 
 class AutoRegODetectorSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/CBLOF_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/CBLOF_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodCBLOF import CBLOFPrimitive
 
 class CBLOFSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/COF_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/COF_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodCOF import COFPrimitive
 
 class COFSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/DeepLog_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/DeepLog_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.DeepLog import DeepLogPrimitive
 
 class DeepLogSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/Ensemble_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/Ensemble_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.Ensemble import EnsemblePrimitive
 
 class EnsembleSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/HBOS_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/HBOS_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodHBOS import HBOSPrimitive
 
 class HBOSSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/IsolationForest_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/IsolationForest_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodIsolationForest import IsolationForestPrimitive
 
 class IsolationForestSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/KDiscordODetector_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/KDiscordODetector_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.KDiscordODetect import KDiscordODetectorPrimitive
 
 class KDiscordODetectorSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/KNN_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/KNN_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodKNN import KNNPrimitive
 
 class KNNSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/LODA_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/LODA_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodLODA import LODAPrimitive
 
 class LODASKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/LOF_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/LOF_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodLOF import LOFPrimitive
 
 class LOFSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/LSTMODetector_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/LSTMODetector_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.LSTMODetect import LSTMODetectorPrimitive
 
 class LSTMODetectorSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/MatrixProfile_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/MatrixProfile_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.MatrixProfile import MatrixProfilePrimitive
 
 class MatrixProfileSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/Mo_Gaal_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/Mo_Gaal_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodMoGaal import Mo_GaalPrimitive
 
 class Mo_GaalSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/OCSVM_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/OCSVM_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodOCSVM import OCSVMPrimitive
 
 class OCSVMSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/PCAODetector_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/PCAODetector_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PCAODetect import PCAODetectorPrimitive
 
 class PCAODetectorSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/SOD_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/SOD_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodSOD import SODPrimitive
 
 class SODSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/So_Gaal_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/So_Gaal_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodSoGaal import So_GaalPrimitive
 
 class So_GaalSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/SystemWiseDetection_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/SystemWiseDetection_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.SystemWiseDetection import SystemWiseDetectionPrimitive
 
 class SystemWiseDetectionSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/Telemanom_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.Telemanom import TelemanomPrimitive
 
 class TelemanomSKI(BaseSKI):

tods/utils/skinterface/primitiveSKI/VariationalAutoEncoder_skinterface.py → tods/utils/skinterface/primitiveSKI/detection_algorithm/VariationalAutoEncoder_skinterface.py

@@ -1,5 +1,5 @@
 import numpy as np 
-from .Base_skinterface import BaseSKI
+from ..Base_skinterface import BaseSKI
 from tods.detection_algorithm.PyodVAE import VariationalAutoEncoderPrimitive
 
 class VariationalAutoEncoderSKI(BaseSKI):

tods/utils/skinterface/skinterface_generation.py

@@ -5,7 +5,7 @@ import os
 with open('tods/utils/skinterface/entry_points.txt','r',encoding='utf-8') as f:
     entry_file = f.read()
 
-output_dir = 'tods/utils/skinterface/primitiveSKI'
+output_dir = 'tods/utils/skinterface/primitiveSKI/detection_algorithm'
 
 
 primitive_folder_start_loc_buf = [i.start()+2 for i in re.finditer('=', entry_file)]
@@ -22,7 +22,7 @@ for primitive_index, primitive_start_loc in enumerate(primitive_start_loc_buf):
     # print(entry_file[primitive_folder_start_loc:primitive_start_loc-1])
     # print(entry_file[primitive_start_loc:primitive_end_loc])
 
-    import_line1 = 'import numpy as np \nfrom .Base_skinterface import BaseSKI\n'
+    import_line1 = 'import numpy as np \nfrom ..Base_skinterface import BaseSKI\n'
     import_line2 = 'from ' + primitive_folder + ' import ' + primitive_name + '\n\n'
     # print(import_line)
 
@@ -34,7 +34,7 @@ for primitive_index, primitive_start_loc in enumerate(primitive_start_loc_buf):
     python_name = primitive_name.replace('Primitive', '_skinterface.py')
     with open(os.path.join(output_dir, python_name), 'w', encoding='utf-8') as f:
         f.write(python_content)
-    #print(os.path.join(output_dir, python_name))
+    print(os.path.join(output_dir, python_name))
     print(python_content)