From 59850e3698ee4b68919973a54c2983ab3c82e8c1 Mon Sep 17 00:00:00 2001 From: YileAllenChen1 Date: Sun, 13 Dec 2020 02:12:17 -0600 Subject: [PATCH] group into folder Former-commit-id: dc7bfbbd0c677a554df692d5ca5e15a6287102a9 [formerly 3ca744df9947d1332122d8ca18a5b1981e5eadc3] [formerly 3d16bb5bbd2b2b68a3df75950247b0ca1ea43441 [formerly 5f41e183ae6bb187f3e622d150a4f73564f11d2b]] [formerly 729a2471b43a3947fd395d5fc842187295f3caa3 [formerly b5327658f8fe13423236d7651e06744f2f34a764] [formerly 01f906b4f10d7ddbcf2fc147f10b9b291996c016 [formerly 7f0be2827fc571ae5bd662de72a1de1e001d5ebe]]] [formerly 78eb5bf681bbbd28f46acc800a707fabb29b12b4 [formerly 92482fb4aaf63a0503bc622dd10f376d994c5a93] [formerly 625c2e3a7ea8260a51f9d2002698c2f4155f83a1 [formerly 7bf6e5fa281c8532ff59f85b393a96d3b2742889]] [formerly 6d54fd6bedb67d842f196c67bb62b464db8408ef [formerly d03643875a40d0c5535db55df13a801491ae82e1] [formerly 53d12df6df27524eed90f101fee81433d1b3d5c3 [formerly 268bb82a914913ecad5a7321dd28cc44e0dd17e2]]]] [formerly 00bc78bbd3541da9778c5aaffa384d340b21e517 [formerly 0922eab7c6e50913971636986791e75c5b92ad92] [formerly 18af0b7ecd09e9688b9be76415c4adc65bf61d34 [formerly abd196b7b77b8924eef6d67c2f5f3e0b78be87d2]] [formerly 0cb85e92b341c0bf40acf974521f2f87873304ea [formerly 8e3a53b6d7442ce71ef319f2f5518a44532c9410] [formerly aef929ccdb7e8145047faf25529d94e87ac8898f [formerly 26ab8eeba0e5ad7943a9712aa8fc3628d166c80f]]] [formerly 7047bd92f1fa5f26646518831b6762c8670e0467 [formerly 8965b0faf00ed8f7ccd7b3190f57a23a3ee5500a] [formerly ab53b96565323e1f81b834725b52aa128741d63a [formerly 814f8f0f36a73d3aca9b63e89d72ed94d5501f12]] [formerly 3072224f91a97d6c8e431dfb4cadc66a8b41a24b [formerly 93fa2d4f6dbbaa205af64153dcd258bea6a55bf3] [formerly 76ab40fe1b02ff46bb950f25d7e0b6246b780c4b [formerly 3959e5ad4ad0702d2b1012fe94b2de41c2bdfaff]]]]] [formerly 4f25096e37e27a8665044d1a6dff2df677db4c37 [formerly 15a2980fb98eab84a2f78eff7a6a590750ef8534] [formerly 2338b79a16fd5caf827df70c58e76a24250332a9 [formerly 430ee94468f17cbe7f30ef9a1c1c56524e4434a0]] [formerly 9539cf1df594b2abe1debb0591558ee4c82d0185 [formerly e023b5484a4f1422a3ac8320e64ed6ac939915ed] [formerly 3f61ea1839c927333b91d20bd8acd59866ed2428 [formerly fcc6cd8f54bbb235fe8a7b229702219baa91f130]]] [formerly dfc45b03725099b33c248e9cf3b764ad54ad99bb [formerly 715350ee31522167be4af15948a070ede577bce9] [formerly 31eb8eb9363a469e3201a74cb86d28232d05acb0 [formerly 79ef03df7f97c450ff8e6ae862209beee6841f10]] [formerly 8271b2c19867b328c44af95dcc694e512bcbe801 [formerly 6f58155921d758fc29510464024005e92d1cfc0a] [formerly 1973d5c7a7eaa137bc09a11fa2916dca843f5cce [formerly a146a4f3db147fa96f488762717870d332b1306c]]]] [formerly 0ca1c64472bd5b5d8a93fb175900f1717288cc3a [formerly 0e87d6bf8a8b0eb4217333e39037cfd3956fb4fa] [formerly e4361a10c157e3d6c4f3d15bea2ad446ed097d1d [formerly eceb1696e3c3b55981033eee428f0a8a5f3834d7]] [formerly 90625762304f013e5d746656d76e384e99c458e2 [formerly 7b1577b61cce9216bd1cf904edc705abf923b90b] [formerly feae077f637278a02337873ab8fef2c177d51a8e [formerly 0f1e3701dfcd516158e156ff9840fabefbd2422a]]] [formerly e2415ee142022c5e9713c5bbc018f94d6960c206 [formerly 095d3b4211630b9dd94361dfdcff5c9f1f8327ea] [formerly 0ac0f249c101852dd01400e21ceae8c79e67821c [formerly 49acfcf617c8d573e8dd6feaa989bf402e365328]] [formerly be425739432afa148751195a18f47038cf7473ef [formerly 742f73259aab133ea5b7311d8ea67457ea777b43] [formerly e70fec1de9267b9b128c7b45f2b2530fda1326cb [formerly 3511514342be9bc9ef664299db875cc07cb70d97]]]]]] Former-commit-id: cbdc86d1963981afa92cf2fc8d2742f81e92e84d [formerly 22518f24fcd237927b094c128fed92efe6dade1e] [formerly 6a29499061027d5ee1813a8da94c4eb38f7e1f70 [formerly 3f4664f615acc4e74f77a4a5d700c32db4f297a5]] [formerly 672b52311b8d653405be3692ad31f581e833320c [formerly ffc476e91b2e20c14695d9772e7679bd7b1a5a8b] [formerly 83f13f2b62d3cf3712e4e685120e8acdc2960945 [formerly 997ad876a96b8f22d2eb4ef8802c85244ed1e02e]]] [formerly 0a74eaf4c1b2de6696400844fcba40d597bc2c0c [formerly b90f15a550571b65d6185bcc4a735fe91be248a0] [formerly 8aaab6be45c7f929b3d007e4f233f09a97d02bfd [formerly 3de83aa3f2da1efd93d17f1eaf14a35a1fba638c]] [formerly 50b16c4e09c9ffe94d9f1b6fc783acd6aaff0e52 [formerly 5dbbb455c0dc02463e56b3231f0a8d547c0c87f4] [formerly ac4f17a3f11f5c51139a03aff2aa84c0f4c79150 [formerly 3a4f876f0c8d5fedbdf626793113d7a5640ef041]]]] [formerly ad77b05e09bc429b136e0d362748dd38840a4a05 [formerly 8942efd170380534889739075907efe4b3197f61] [formerly e35fd3659c448ceec080d19ffd218a1af6d8499b [formerly 804e8443d2bf66d024c627e405959a1b1c8062fe]] [formerly e0bb5e8b11b353d0dbbb5a9d09e4c58c9863aa57 [formerly 29fb65a56ef0e69ba5299138e5814818c2c6ecd3] [formerly 4039900e8bc6d1b42b5b6ead8f5b85e4df85b8ab [formerly a18e6389387c2f5bae40ba27f27572bab3d8e4cc]]] [formerly d733af0635c0271407a4b37eb3b875ce5e7f36dc [formerly 130fa77c67f387f6809b284ebe22e28ee7190bdd] [formerly edd515d3ef599122fd8acc76f3bb3373b77372fc [formerly 8f7782ccad19397a5878e3387fa5fc42c5e78ab1]] [formerly 21ebc4753c3bc3bd141acfcd94bf329f28d300da [formerly 8e6a82ad59a3d65d84cffcfa658e2b7faa452ddf] [formerly e70fec1de9267b9b128c7b45f2b2530fda1326cb]]]] Former-commit-id: dec666697f3c3bfbbaa63cde5c65687021fb9f07 [formerly 2e605492b77cd861ac7de0f231a2a8a9f0669ddd] [formerly 6037d93bff8d7deb01da6b2c0a1123be5d7ffd44 [formerly 436cc99a3c2f9d4f640653e9ead1fd95a61f8f9e]] [formerly 178668f0d225416c48856702cbbe5e5ec5ac6692 [formerly 075d38fed49f541df0edfeded4f81f24963cfb44] [formerly 99a90daec616508adbad827fa39af3637a7d8108 [formerly 3d619f8d4238e3fc6ac6fc93883411c3659dbf8f]]] [formerly 080f9d57c9595b589aa14c55ef32ed7f20df6a6b [formerly a239a36a237a842750e75171b1e71763582fc4b9] [formerly 1aae7679679f565e92d1568127f7774ba1840bbf [formerly 6e11d426c3afa56e8fafacac8959d8496e8a4850]] [formerly 92c7495eb045251622c159afb94ac189c53b813e [formerly 9a5363b1c6333fe45803b2168d134902a16d4728] [formerly 5e94bcdbf9bae66ccd012ff0acd0d5fb6ce0c7ee [formerly 020cd2a13cf6701dc4932bbb250e41b6ef700f93]]]] Former-commit-id: 31c811bc8abc7b9d2a22bbc282f8e6b2ea7cdfef [formerly a3090b22f2310131b15cacd2c980ae91f6972ead] [formerly f8cd8cfb06ac5662cd8ea3e98ad0e63e9e9f89e5 [formerly 108f6a2ae42a8695bfd71b574167b9939d8af204]] [formerly f8c5eea6bdc98ad6a5b4e7ec01507133aff099e2 [formerly f27013177ae65774c284e95d6cc97a7c8ba95640] [formerly 1bacd4bf6310e1cdde2eaae3dc47a44ee7d6a865 [formerly c262029fae7dda6a158130d5b0e48222c009f312]]] Former-commit-id: c1a8dce78931099c6b9ef74d194535f35b516886 [formerly 4e4ece5e54078769905821ef4731aae98f17eabd] [formerly 4731a09f7a38b2b8ac58c4818f7b30646bed4c02 [formerly 223694eb2b8940968a224152d75c0aa6be124e14]] Former-commit-id: 58143b789f727f514adaad360fe79294d14312fe [formerly 0eefa0e1e2bde791a1c8c04271e206a9e7211e55] Former-commit-id: 8f4ff51cf278151de435c48c209b3dd456fbc84e --- tods/utils/ABOD_main.py | 2 +- tods/utils/AutoEncoder_main.py | 2 +- tods/utils/AutoRegODetectAPI.py | 23 ---------------------- tods/utils/AutoRegODetector_main.py | 2 +- tods/utils/CBLOF_main.py | 2 +- tods/utils/COF_main.py | 2 +- tods/utils/DeepLog_main.py | 2 +- tods/utils/Ensemble_main.py | 2 +- tods/utils/HBOS_main.py | 2 +- tods/utils/IsolationForest_main.py | 2 +- tods/utils/KDiscordODetector_main.py | 2 +- tods/utils/KNN_main.py | 2 +- tods/utils/LODA_main.py | 2 +- tods/utils/LOF_main.py | 2 +- tods/utils/LSTMODetector_main.py | 2 +- tods/utils/MatrixProfile_main.py | 2 +- tods/utils/Mo_Gaal_main.py | 2 +- tods/utils/OCSVM_main.py | 2 +- tods/utils/PCAODetector_main.py | 2 +- tods/utils/SOD_main.py | 2 +- tods/utils/So_Gaal_main.py | 2 +- tods/utils/SystemWiseDetection_main.py | 2 +- tods/utils/Telemanom_main.py | 2 +- tods/utils/VariationalAutoEncoder_main.py | 2 +- tods/utils/skinterface/main_generation.py | 2 +- .../primitiveSKI/AutoCorrelation_skinterface.py | 8 -------- tods/utils/skinterface/primitiveSKI/__init__.py | 6 ------ .../{ => detection_algorithm}/ABOD_skinterface.py | 2 +- .../AutoEncoder_skinterface.py | 2 +- .../AutoRegODetector_skinterface.py | 2 +- .../{ => detection_algorithm}/CBLOF_skinterface.py | 2 +- .../{ => detection_algorithm}/COF_skinterface.py | 2 +- .../DeepLog_skinterface.py | 2 +- .../Ensemble_skinterface.py | 2 +- .../{ => detection_algorithm}/HBOS_skinterface.py | 2 +- .../IsolationForest_skinterface.py | 2 +- .../KDiscordODetector_skinterface.py | 2 +- .../{ => detection_algorithm}/KNN_skinterface.py | 2 +- .../{ => detection_algorithm}/LODA_skinterface.py | 2 +- .../{ => detection_algorithm}/LOF_skinterface.py | 2 +- .../LSTMODetector_skinterface.py | 2 +- .../MatrixProfile_skinterface.py | 2 +- .../Mo_Gaal_skinterface.py | 2 +- .../{ => detection_algorithm}/OCSVM_skinterface.py | 2 +- .../PCAODetector_skinterface.py | 2 +- .../{ => detection_algorithm}/SOD_skinterface.py | 2 +- .../So_Gaal_skinterface.py | 2 +- .../SystemWiseDetection_skinterface.py | 2 +- .../Telemanom_skinterface.py | 2 +- .../VariationalAutoEncoder_skinterface.py | 2 +- tods/utils/skinterface/skinterface_generation.py | 6 +++--- 51 files changed, 50 insertions(+), 87 deletions(-) delete mode 100644 tods/utils/AutoRegODetectAPI.py delete mode 100644 tods/utils/skinterface/primitiveSKI/AutoCorrelation_skinterface.py delete mode 100644 tods/utils/skinterface/primitiveSKI/__init__.py rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/ABOD_skinterface.py (83%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/AutoEncoder_skinterface.py (84%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/AutoRegODetector_skinterface.py (86%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/CBLOF_skinterface.py (84%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/COF_skinterface.py (83%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/DeepLog_skinterface.py (84%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/Ensemble_skinterface.py (84%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/HBOS_skinterface.py (83%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/IsolationForest_skinterface.py (86%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/KDiscordODetector_skinterface.py (86%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/KNN_skinterface.py (83%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/LODA_skinterface.py (83%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/LOF_skinterface.py (83%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/LSTMODetector_skinterface.py (85%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/MatrixProfile_skinterface.py (85%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/Mo_Gaal_skinterface.py (84%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/OCSVM_skinterface.py (84%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/PCAODetector_skinterface.py (85%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/SOD_skinterface.py (83%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/So_Gaal_skinterface.py (84%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/SystemWiseDetection_skinterface.py (86%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/Telemanom_skinterface.py (84%) rename tods/utils/skinterface/primitiveSKI/{ => detection_algorithm}/VariationalAutoEncoder_skinterface.py (86%) diff --git a/tods/utils/ABOD_main.py b/tods/utils/ABOD_main.py index 8050958..ccba04a 100644 --- a/tods/utils/ABOD_main.py +++ b/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]]) diff --git a/tods/utils/AutoEncoder_main.py b/tods/utils/AutoEncoder_main.py index a4faef2..92e9652 100644 --- a/tods/utils/AutoEncoder_main.py +++ b/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]]) diff --git a/tods/utils/AutoRegODetectAPI.py b/tods/utils/AutoRegODetectAPI.py deleted file mode 100644 index adc0e62..0000000 --- a/tods/utils/AutoRegODetectAPI.py +++ /dev/null @@ -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) - diff --git a/tods/utils/AutoRegODetector_main.py b/tods/utils/AutoRegODetector_main.py index f845387..cab9fb5 100644 --- a/tods/utils/AutoRegODetector_main.py +++ b/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]]) diff --git a/tods/utils/CBLOF_main.py b/tods/utils/CBLOF_main.py index bfcba07..f36eaf2 100644 --- a/tods/utils/CBLOF_main.py +++ b/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]]) diff --git a/tods/utils/COF_main.py b/tods/utils/COF_main.py index 3b47094..9bd34f7 100644 --- a/tods/utils/COF_main.py +++ b/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]]) diff --git a/tods/utils/DeepLog_main.py b/tods/utils/DeepLog_main.py index d95a950..6260e40 100644 --- a/tods/utils/DeepLog_main.py +++ b/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]]) diff --git a/tods/utils/Ensemble_main.py b/tods/utils/Ensemble_main.py index ee8f93c..7d3bf75 100644 --- a/tods/utils/Ensemble_main.py +++ b/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]]) diff --git a/tods/utils/HBOS_main.py b/tods/utils/HBOS_main.py index 509d866..afb575c 100644 --- a/tods/utils/HBOS_main.py +++ b/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]]) diff --git a/tods/utils/IsolationForest_main.py b/tods/utils/IsolationForest_main.py index 4c6844a..40dc23b 100644 --- a/tods/utils/IsolationForest_main.py +++ b/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]]) diff --git a/tods/utils/KDiscordODetector_main.py b/tods/utils/KDiscordODetector_main.py index b474f7c..098d960 100644 --- a/tods/utils/KDiscordODetector_main.py +++ b/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]]) diff --git a/tods/utils/KNN_main.py b/tods/utils/KNN_main.py index f17d31e..ab09833 100644 --- a/tods/utils/KNN_main.py +++ b/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]]) diff --git a/tods/utils/LODA_main.py b/tods/utils/LODA_main.py index 01f66b9..31f0651 100644 --- a/tods/utils/LODA_main.py +++ b/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]]) diff --git a/tods/utils/LOF_main.py b/tods/utils/LOF_main.py index dd77d8e..d6a9bcb 100644 --- a/tods/utils/LOF_main.py +++ b/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]]) diff --git a/tods/utils/LSTMODetector_main.py b/tods/utils/LSTMODetector_main.py index 7f0d08b..87dd4c8 100644 --- a/tods/utils/LSTMODetector_main.py +++ b/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]]) diff --git a/tods/utils/MatrixProfile_main.py b/tods/utils/MatrixProfile_main.py index a6cab14..93816f6 100644 --- a/tods/utils/MatrixProfile_main.py +++ b/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]]) diff --git a/tods/utils/Mo_Gaal_main.py b/tods/utils/Mo_Gaal_main.py index 6b8c7b8..b8238ca 100644 --- a/tods/utils/Mo_Gaal_main.py +++ b/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]]) diff --git a/tods/utils/OCSVM_main.py b/tods/utils/OCSVM_main.py index 67db169..711efc6 100644 --- a/tods/utils/OCSVM_main.py +++ b/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]]) diff --git a/tods/utils/PCAODetector_main.py b/tods/utils/PCAODetector_main.py index aec212e..4cb4ba2 100644 --- a/tods/utils/PCAODetector_main.py +++ b/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]]) diff --git a/tods/utils/SOD_main.py b/tods/utils/SOD_main.py index 3d68f87..f0402af 100644 --- a/tods/utils/SOD_main.py +++ b/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]]) diff --git a/tods/utils/So_Gaal_main.py b/tods/utils/So_Gaal_main.py index edc48da..daa1cbf 100644 --- a/tods/utils/So_Gaal_main.py +++ b/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]]) diff --git a/tods/utils/SystemWiseDetection_main.py b/tods/utils/SystemWiseDetection_main.py index e33518a..87e54b0 100644 --- a/tods/utils/SystemWiseDetection_main.py +++ b/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]]) diff --git a/tods/utils/Telemanom_main.py b/tods/utils/Telemanom_main.py index 42c90d3..d5e0c2f 100644 --- a/tods/utils/Telemanom_main.py +++ b/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]]) diff --git a/tods/utils/VariationalAutoEncoder_main.py b/tods/utils/VariationalAutoEncoder_main.py index 6efa26d..8928290 100644 --- a/tods/utils/VariationalAutoEncoder_main.py +++ b/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]]) diff --git a/tods/utils/skinterface/main_generation.py b/tods/utils/skinterface/main_generation.py index 9130916..a146f09 100644 --- a/tods/utils/skinterface/main_generation.py +++ b/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]]) diff --git a/tods/utils/skinterface/primitiveSKI/AutoCorrelation_skinterface.py b/tods/utils/skinterface/primitiveSKI/AutoCorrelation_skinterface.py deleted file mode 100644 index 451f1c2..0000000 --- a/tods/utils/skinterface/primitiveSKI/AutoCorrelation_skinterface.py +++ /dev/null @@ -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) - diff --git a/tods/utils/skinterface/primitiveSKI/__init__.py b/tods/utils/skinterface/primitiveSKI/__init__.py deleted file mode 100644 index cbc6184..0000000 --- a/tods/utils/skinterface/primitiveSKI/__init__.py +++ /dev/null @@ -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 \ No newline at end of file diff --git a/tods/utils/skinterface/primitiveSKI/ABOD_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/ABOD_skinterface.py similarity index 83% rename from tods/utils/skinterface/primitiveSKI/ABOD_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/ABOD_skinterface.py index 5d88b1e..5736796 100644 --- a/tods/utils/skinterface/primitiveSKI/ABOD_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/AutoEncoder_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoEncoder_skinterface.py similarity index 84% rename from tods/utils/skinterface/primitiveSKI/AutoEncoder_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoEncoder_skinterface.py index a0bf75c..3d1b470 100644 --- a/tods/utils/skinterface/primitiveSKI/AutoEncoder_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/AutoRegODetector_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoRegODetector_skinterface.py similarity index 86% rename from tods/utils/skinterface/primitiveSKI/AutoRegODetector_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/AutoRegODetector_skinterface.py index 6783f03..0ebbdd7 100644 --- a/tods/utils/skinterface/primitiveSKI/AutoRegODetector_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/CBLOF_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/CBLOF_skinterface.py similarity index 84% rename from tods/utils/skinterface/primitiveSKI/CBLOF_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/CBLOF_skinterface.py index d48dccf..e12d1b6 100644 --- a/tods/utils/skinterface/primitiveSKI/CBLOF_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/COF_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/COF_skinterface.py similarity index 83% rename from tods/utils/skinterface/primitiveSKI/COF_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/COF_skinterface.py index cc07b54..785ca66 100644 --- a/tods/utils/skinterface/primitiveSKI/COF_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/DeepLog_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/DeepLog_skinterface.py similarity index 84% rename from tods/utils/skinterface/primitiveSKI/DeepLog_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/DeepLog_skinterface.py index 4afc9ba..06b793b 100644 --- a/tods/utils/skinterface/primitiveSKI/DeepLog_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/Ensemble_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/Ensemble_skinterface.py similarity index 84% rename from tods/utils/skinterface/primitiveSKI/Ensemble_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/Ensemble_skinterface.py index 4027cda..7505cff 100644 --- a/tods/utils/skinterface/primitiveSKI/Ensemble_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/HBOS_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/HBOS_skinterface.py similarity index 83% rename from tods/utils/skinterface/primitiveSKI/HBOS_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/HBOS_skinterface.py index 2035cd9..28b0cb2 100644 --- a/tods/utils/skinterface/primitiveSKI/HBOS_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/IsolationForest_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/IsolationForest_skinterface.py similarity index 86% rename from tods/utils/skinterface/primitiveSKI/IsolationForest_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/IsolationForest_skinterface.py index 32750bb..5e89604 100644 --- a/tods/utils/skinterface/primitiveSKI/IsolationForest_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/KDiscordODetector_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/KDiscordODetector_skinterface.py similarity index 86% rename from tods/utils/skinterface/primitiveSKI/KDiscordODetector_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/KDiscordODetector_skinterface.py index 9e970e1..8d7cd0b 100644 --- a/tods/utils/skinterface/primitiveSKI/KDiscordODetector_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/KNN_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/KNN_skinterface.py similarity index 83% rename from tods/utils/skinterface/primitiveSKI/KNN_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/KNN_skinterface.py index eff500c..74c1c87 100644 --- a/tods/utils/skinterface/primitiveSKI/KNN_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/LODA_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/LODA_skinterface.py similarity index 83% rename from tods/utils/skinterface/primitiveSKI/LODA_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/LODA_skinterface.py index 390dfed..6565684 100644 --- a/tods/utils/skinterface/primitiveSKI/LODA_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/LOF_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/LOF_skinterface.py similarity index 83% rename from tods/utils/skinterface/primitiveSKI/LOF_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/LOF_skinterface.py index bde097d..b6407e9 100644 --- a/tods/utils/skinterface/primitiveSKI/LOF_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/LSTMODetector_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/LSTMODetector_skinterface.py similarity index 85% rename from tods/utils/skinterface/primitiveSKI/LSTMODetector_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/LSTMODetector_skinterface.py index e85d850..fa3d4b7 100644 --- a/tods/utils/skinterface/primitiveSKI/LSTMODetector_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/MatrixProfile_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/MatrixProfile_skinterface.py similarity index 85% rename from tods/utils/skinterface/primitiveSKI/MatrixProfile_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/MatrixProfile_skinterface.py index cda28af..306fd6d 100644 --- a/tods/utils/skinterface/primitiveSKI/MatrixProfile_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/Mo_Gaal_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/Mo_Gaal_skinterface.py similarity index 84% rename from tods/utils/skinterface/primitiveSKI/Mo_Gaal_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/Mo_Gaal_skinterface.py index bfc5ada..92cdeb0 100644 --- a/tods/utils/skinterface/primitiveSKI/Mo_Gaal_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/OCSVM_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/OCSVM_skinterface.py similarity index 84% rename from tods/utils/skinterface/primitiveSKI/OCSVM_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/OCSVM_skinterface.py index 2a341bb..8bec9e1 100644 --- a/tods/utils/skinterface/primitiveSKI/OCSVM_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/PCAODetector_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/PCAODetector_skinterface.py similarity index 85% rename from tods/utils/skinterface/primitiveSKI/PCAODetector_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/PCAODetector_skinterface.py index 2f31d54..b99155f 100644 --- a/tods/utils/skinterface/primitiveSKI/PCAODetector_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/SOD_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/SOD_skinterface.py similarity index 83% rename from tods/utils/skinterface/primitiveSKI/SOD_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/SOD_skinterface.py index 8a64d18..b16dc2c 100644 --- a/tods/utils/skinterface/primitiveSKI/SOD_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/So_Gaal_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/So_Gaal_skinterface.py similarity index 84% rename from tods/utils/skinterface/primitiveSKI/So_Gaal_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/So_Gaal_skinterface.py index 1a4cc9d..576d36a 100644 --- a/tods/utils/skinterface/primitiveSKI/So_Gaal_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/SystemWiseDetection_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/SystemWiseDetection_skinterface.py similarity index 86% rename from tods/utils/skinterface/primitiveSKI/SystemWiseDetection_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/SystemWiseDetection_skinterface.py index 3109276..bbe042a 100644 --- a/tods/utils/skinterface/primitiveSKI/SystemWiseDetection_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/Telemanom_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py similarity index 84% rename from tods/utils/skinterface/primitiveSKI/Telemanom_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py index 6d6b581..062b3f2 100644 --- a/tods/utils/skinterface/primitiveSKI/Telemanom_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/primitiveSKI/VariationalAutoEncoder_skinterface.py b/tods/utils/skinterface/primitiveSKI/detection_algorithm/VariationalAutoEncoder_skinterface.py similarity index 86% rename from tods/utils/skinterface/primitiveSKI/VariationalAutoEncoder_skinterface.py rename to tods/utils/skinterface/primitiveSKI/detection_algorithm/VariationalAutoEncoder_skinterface.py index 305a94b..0be9451 100644 --- a/tods/utils/skinterface/primitiveSKI/VariationalAutoEncoder_skinterface.py +++ b/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): diff --git a/tods/utils/skinterface/skinterface_generation.py b/tods/utils/skinterface/skinterface_generation.py index 00d0791..9e1a3d1 100644 --- a/tods/utils/skinterface/skinterface_generation.py +++ b/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)