From 0528c7ab0ca26ecb1c3809eae1bf5a71ba1ff017 Mon Sep 17 00:00:00 2001 From: YileAllenChen1 Date: Sun, 13 Dec 2020 01:28:37 -0600 Subject: [PATCH] remove extras Former-commit-id: e5cea1a1ad57fabbb4492ea63eec57412bb5cd55 [formerly a39f5f92912962c5e38a8e91317bec3ea7fac2b6] [formerly 7b17b5a7adf0b352784653e05483d31c60580810 [formerly 2b1f2dc8d2e5edb9fad0a5ebd4cd1e507824bfdb]] [formerly cfc09981ad5554f04ed0bab3c9622e2f5df0a9bd [formerly 3c1d069cae06e38c695a0f7f2036177173204254] [formerly 62db499ecbdafd4006fc74d7e89818c676fd0aaf [formerly 44f42940d52c565401b3d5e8ce701b9dc43c0f04]]] [formerly 43ea91c5ff9b6e230404e39e2e2ea682ebb8ca86 [formerly 3b6d513435c10a1c9dfb0e141026e2ec1f84fd9e] [formerly d06da72b3c5e374de6979dc105d5843c3c423c36 [formerly ddf022e985a39dfac06b1709da32e3638793e4d3]] [formerly 8cde60716cd0d36737d38771434d4b56f9129b00 [formerly 40fb4cd373f8d262cbe132b1c8cd9ec32f6b095a] [formerly a662602d28c30c6bd900b6a6e2410b14179ace82 [formerly 982483a194f7fd60aa32ff8128bb126221705e18]]]] [formerly cd43dd84bc3743d796e5ea1844cbfafb2249342b [formerly 1fe2584c1e3ed0f9696f801d6a77c1c9b7f5f453] [formerly f61d7e5d5fe3252a0427710710845df6e6b63fc8 [formerly 718ef01860359a838c7a4ddd82718a364b0b2459]] [formerly c514cd4bd58b9c20abd6314a46f3d913bd66ca30 [formerly 3f79f1e3404cab24611b33165bee85e07b0a118b] [formerly 7d4b1e7ba8dffdd68aeaf41c9e1dc37efc4199ed [formerly 680bd0e4e133cc2ea9da49a94af785c083b07b0a]]] [formerly 837b6577d578351c6a1beb7f642d9e6039475a38 [formerly 126b14eb9f1bdac2c11625a7fa8a04ca961a9cff] [formerly f39b310f42d4e6a223f7c1e00958a6dbdb1dd2f4 [formerly f34096494cc0710534dbf6863c6d2f60779698cc]] [formerly 6881d71a7621660460be5717587119363ec6c0fe [formerly b39d72fd5418a9fe4e046edbcb9e768ed0521ff6] [formerly 4a970d70798485b009f85d2ed2fbe87096c17e68 [formerly 6683215a3fbac54d9832e4110beaea20ecf6c543]]]]] [formerly 6787d3d6f2c40deb74ed149eb6bf4997508f6add [formerly 39b7d18dfdd084c426b77095391970111e96ef63] [formerly dd7fb7980dc44e9c0d026c0a4bb4bf903aca931e [formerly a492c3818ab48bb5b23b9aba43d96b4c6d50e367]] [formerly 786ba2a7b77dc920270f89e947a32f8ace523d03 [formerly 3998e1286436ab2b2a778414fb31985ede12f122] [formerly b3fe0139c7a1960811a9ad919c5151fd25fa3f21 [formerly 44b4254b1fcb3ef8d68840eadaa0fbb4a7ae7ce4]]] [formerly fea24c48f9045282384ea20b7ee8c67b5b5ecdae [formerly 92d8cfa2712e29a9bad05cb180f229518e1d582c] [formerly 4843b581a02aef37690e8b4ef14ef4c7ccb705f7 [formerly 0de3fb98efe0aa55e17ec6999702fecf09902863]] [formerly b14a50a3bdd4f9642ded312b8f8f597ebe55afe9 [formerly 2bdd11709cfa934bc39388c0be41d810ed3d7d20] [formerly dcb8c0ef57fa2831ed91e8566a5fab8c51935a43 [formerly f7e210f15e1713edc3a3d4b9f79a27a1bfebc97f]]]] [formerly d0dd5fa78f0b330d4f66afb97e02e0a276205a92 [formerly 0ae3009a57c81b980e2ca10724998942f99357ad] [formerly 160e1f7fffd413a26276cefd094e6c3015aecdee [formerly 4931bb462a1597d1585f5a3935f22711ce1df709]] [formerly a549faaff130e0ec97b0e3cdf9babe1533944c7b [formerly ae529d3466c3b3c44656f8819e12f95a488b87d1] [formerly 478cee7974cdab3445a343b8f54353a30066a6bb [formerly ec7b54b1aae92ee4833756a7584ac4971b1dac07]]] [formerly e6306d0bdb29e0bfeb1a04aaf9d33cc0acfcd94a [formerly f74191a6eb8fc708f343c5b3c34abf292e3306be] [formerly fc2e27c0ae6a369b952170eee7db02c2779b5a4f [formerly 998036b7355e241b7d77bbcb98a2489e547320f8]] [formerly 0dd6b560fdf52e9863ce47c0b5869ae42f1b84b1 [formerly dce99a58d69571599b0cfc0f210099173abc783e] [formerly 226b580d5759443d2825f43f9a91a9fc3b48dfac [formerly 313f6be91a445ea59ab93388013743640065cbd0]]]]]] Former-commit-id: b94d741be17d3bd2fd8289ad9075bb2a1138908d [formerly 8b209eca453717646d59c8f3210188b14f3c9404] [formerly 36130ea55d9533e818aab756dd2c2c4027f538ca [formerly 130125bfd1383913df2d3112adac09e1b3e168ad]] [formerly ebb0ff8601c0f7e4f858c7218d4122c15030ad3e [formerly 778251686052c1f337b1563b7a6058c9cdcdda55] [formerly 2d08911f3881b4e346daf396f96466f6aa5a7fd5 [formerly 3ccd4ebcea74e37cadd9f6b86b30a330d5b5a0f6]]] [formerly cdf215c55527c9317771b44db8064357138a0815 [formerly 95b881d34cae196008367ccc691f63941f4d7c43] [formerly c6ae47a01f45dddbb0dd6ca92bbf7ae54fa918a0 [formerly b05f4a307ac287126f2e2f4c1d70409e25b8e4f6]] [formerly cd7dd12a467dfe26270f58d65e8f8c323b0659f5 [formerly cb09f3c61875932f7b8b6d48aa0e84903b11c12f] [formerly d60f9683c6ab5e0de9e32343f74ae330bd0d0385 [formerly 2c9930e5f70b36309f493df62ad8946d673ebb1a]]]] [formerly 9ca973d904759a2fa8eba22dfd201d1474dd16e1 [formerly fd09901c6ed000f3d1f940aee0c41f36a4034cbd] [formerly a2945d7e301d131e6a69a17266aff19f9bc22b55 [formerly e2454c6d274cad1d8fe49953d45a9bde42d16a07]] [formerly 85a30d33f198227ee2e59fda99fa41eab87003db [formerly 19a6655db7051fcd838ba830b1fefd4155fc39fe] [formerly 2505eea1732b637c58a13301e6bc8dee82a278b0 [formerly df25222f8a0c77c471a30d25bb87bef4d7bfbfb8]]] [formerly 7df818ca5af332bd5e6eeeb7b836afd311b52045 [formerly f7267cc52e6762d1794027f40fb1b72b2ed76867] [formerly 3c5a064d82cefc5e091f7aaa034a47c47bce655b [formerly edf0faed5b22d583f17e058b82a3fe5b3d94a4e2]] [formerly f15c3da551b390e566f7d1ce4ebbfb150bca64c5 [formerly d1ee728ddf003e0944f3ac52f5d5a58b27dce683] [formerly 226b580d5759443d2825f43f9a91a9fc3b48dfac]]]] Former-commit-id: 5ce28fc2774869c40b6c9ebbfb050182bffa5f76 [formerly 5777b513ea9f27d95e4e3941313c6e17dd27a68d] [formerly 05497eee56771c20cd4fd5b23f1dc823ed7dd00e [formerly 317e9d8cafce70d099bf011d318db8721100d2bb]] [formerly c682c3818759ca0a0e4537564ce4ce9a50a3a0ee [formerly cab2abfaac8d1b1a7dbfe7b01335825b8b521482] [formerly eaf9d9b00fbe20c7a6887201a7322521ae36afa2 [formerly df71dc2f460219f666eeda2d1d6e02c2b7abe219]]] [formerly 6f4832a3341ea8b1513763078d573af51258eeeb [formerly b8dc65d75f478a7bdd16af17242f5882fc2e7b00] [formerly bb61e51274d8168800ad995aa3fd12a02429608a [formerly 5665330fdd60c471a8e5480af14c17a0828308a9]] [formerly 993407f9df474d56dc43e4dde2eb3887e680f94d [formerly 3f56fd525b81682807363fc4f151d5c5ec88ec36] [formerly 20e9e442d46a8e5e9c3eb7c8e76d9abcd1b9df02 [formerly 6205e4bba5a18111d5d2d9a3393d4b7334efe005]]]] Former-commit-id: 263049457b18650e6d6bc0fd4c94e8a5060ce905 [formerly 95776666dc55e9379f62e5f5bbf177d5b62c3c11] [formerly b8dc45ce926743ab841b6ea90343430ec57f05fe [formerly 2ddcaa3a3b755beeff03a92ffdfda473714ae053]] [formerly 8594b5d67a0649e45faee9ba98d4d4ae54a28b40 [formerly 2d3e6452277863bb13f908da47d77f9859f02f8d] [formerly 157d80f68f4700f93f2ea5f8514860b93bb3bd50 [formerly 523ef8e21dd6508b40822e926efc478b72e5a323]]] Former-commit-id: 64514659b6b9eba54104fd26408092ff0e550570 [formerly d58a355a680a23d7f94a68f470dcc3125b25e00e] [formerly 030b45d96201e8bb095beeeca2de1312f2a763df [formerly 48ccfa73b044b9dc25f79117744a081fdb97d2fc]] Former-commit-id: 7a000c9ecb2e155ad3b8f32c9c788fdcf735679b [formerly feb0eda40cfde0bc5e4e86f098ae795ec575a7fb] Former-commit-id: e89a8f6adb1008d329cef9dd1b5e795db9aaa08f --- tods/utils/interface.py | 71 ------------------------------------------------- tods/utils/test_main.py | 14 ---------- 2 files changed, 85 deletions(-) delete mode 100644 tods/utils/interface.py delete mode 100644 tods/utils/test_main.py diff --git a/tods/utils/interface.py b/tods/utils/interface.py deleted file mode 100644 index 0a0ffb0..0000000 --- a/tods/utils/interface.py +++ /dev/null @@ -1,71 +0,0 @@ -from d3m import container -from tods.detection_algorithm import DeepLog -from tods.detection_algorithm.PyodABOD import ABODPrimitive -from tods.detection_algorithm.PyodAE import AutoEncoderPrimitive -from tods.detection_algorithm.PyodSOD import SODPrimitive -from tods.detection_algorithm.AutoRegODetect import AutoRegODetectorPrimitive - -class SKInterface(): - def __init__(self, primitive, hyperparameter=None): - hyperparams_class = primitive.metadata.get_hyperparams() - hyperparams = hyperparams_class.defaults() - if hyperparameter is not None: - hyperparams = hyperparams.replace(hyperparameter) - - self.primitive = primitive(hyperparams=hyperparams) - self.use_columns = hyperparams['use_columns'] - print(hyperparams) - - def transform(self, X): - if self.use_columns==(): - self.use_columns = [iter for iter in range(len(X))] - else: - pass - - inputs = {} - for i in self.use_columns: - inputs['col_'+str(i)] = list(X[i]) - inputs = container.DataFrame(inputs, columns=list(inputs.keys()), generate_metadata=True) - return inputs - - def set_training_data(self, data): - return self.primitive.set_training_data(inputs=data) - - def fit(self, data): - data = self.transform(data) - self.set_training_data(data) - return self.primitive.fit() - - def produce(self, data): - data = self.transform(data) - return self.primitive.produce(inputs=data).value - - def produce_score(self, data): - data = self.transform(data) - return self.primitive.produce_score(inputs=data).value - -if __name__ == '__main__': - import numpy as np - 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 = SKInterface(AutoRegODetectorPrimitive) - 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) - -""" - def transform(self, X): - inputs = {} - for i in range(len(X)): - inputs['col_'+str(i)] = list(X[i]) - inputs = container.DataFrame(inputs, columns=list(inputs.keys()), generate_metadata=True) - outputs = self.primitive.produce(inputs=inputs).value.to_numpy() - return outputs - - 'contamination': contamination, - 'use_columns': use_columns, - 'return_result': return_result, -""" -#use_columns=(-1,), contamination=0.1, return_result='append' \ No newline at end of file diff --git a/tods/utils/test_main.py b/tods/utils/test_main.py deleted file mode 100644 index 005e8bf..0000000 --- a/tods/utils/test_main.py +++ /dev/null @@ -1,14 +0,0 @@ -import numpy as np -from skinterface.primitiveSKI.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]]) - -transformer = AutoRegODetectorSKI(contamination=0.2, window_size=2) -transformer.fit(X_train) -prediction_labels = transformer.predict(X_test) -prediction_score = transformer.predict_score(X_test) - -print("Primitive: ", transformer.primitive) -print("Prediction Labels\n", prediction_labels) -print("Prediction Score\n", prediction_score) \ No newline at end of file