From ee24854d17addff435b4ef8680ab4b39615daba3 Mon Sep 17 00:00:00 2001 From: hwy893747147 Date: Thu, 21 Jan 2021 23:16:28 -0600 Subject: [PATCH] fixed Telemanom sk Test Former-commit-id: 4204e3b5fbd5a9de86ef48982a551919db415077 [formerly 3fbfdb0ec8f7750ce57f79c1d547c7124c462ba2] [formerly 4c9fc4bbd77e79376070ec4e16d8f3699d615552 [formerly 9f275d8e30ad09260a8b7598bf51920651aa9b4a]] [formerly 6f237961b29240fd7acc255eccba6c1decb335e1 [formerly 0eab69014f8ac65a1ac61fcd9ed7572d140f777c] [formerly 6c98b0caa9bc85d8470af47e8f3b47f9961f4194 [formerly 8d08ffe00a33cb5b389d3ed10169cb8af8489bd4]]] [formerly d42bf6b222af23350da5367b3e2e1bd93cc8688e [formerly 7553bf4003ca719d2ba25ecdcd54a474ed5f4bc7] [formerly 833af70021dc774c7d20e105c834da865dd9e47d [formerly 7ed219fef417242337a64f2fa1546173b898a231]] [formerly 11e6178c849a3e9d9247ca474be7de84b4473437 [formerly b81294c92f5d33a71831948f2322ee0b038b0c39] [formerly a88dcbcf6da9bb079e7ea4fc7bbe655b68f82841 [formerly 0b60711627415fc2c4bcb33650ca5b6c33238e6b]]]] [formerly e24cdace04fe631b12388e2540a044a308fbdc07 [formerly 991c8a47e65e9cb7d349da0e467225eeeab0992e] [formerly 5cacc3c8fe525a84dac80d08611fd6329c04930a [formerly 9af0e1775a840b714ff3a964195354674590746a]] [formerly 1c73a9965b8da361e3dd401afa14c931d9c5fd84 [formerly 2c9dcdd0e6f003babfe580016b43a77a7c39a4ce] [formerly f6b1e1af4b87e366640e2988d9066e47d8b9efd1 [formerly 7e62b52f04db5080d969e1255ded2807159d7b42]]] [formerly 93c68f6d2a09b3c22c7166d8955df21fffd0ef10 [formerly f842a6719e4f5b9d80a8a393b19e5fad402ae61f] [formerly c3b974ae9eacfdc415504ab258fda82e4793635b [formerly 0d7721f99d7514f38f75d97bfbaf41a7421b0ca1]] [formerly e674dc254cb78c8bdd0c8b6a56e8a1b2a3187a21 [formerly 6ad7bb9129a9e7a156c1bfb2cb962d63f49bca57] [formerly 874594867ad59030b714a792b462fb6da9f2e634 [formerly 580209353e21a377d470b08b8327fdf0f32ee02e]]]]] [formerly dfe16bf213539226351561306269bac101452282 [formerly a4c76f3aa19f1245ad7a6b0c2a5df7bfbf331cbc] [formerly 8738954d3c674a56230e50d7d9125bc17dc86213 [formerly e9b37bee5c471a67178b8e019de4f009a8f62dae]] [formerly f50c64aa3f3d67ace2b4f769b0d98febf9f563e6 [formerly 8c97708edd3451af63582168774a301b6298a98e] [formerly d499e22481a76d9356e581c8e28865676d467a1e [formerly e9578e26025e0ead5a173cdd52b9573f8864ab53]]] [formerly 4d9d7c56b21abf9adb5dcfa600527907fa612333 [formerly b93d77566e92c7efb6b563848600167e1f2a833f] [formerly 06b3d55378598e5f0a3d3258662cc107feb7c8ff [formerly 83e2a455319a7e7042cdccea2c702e731e8f14d5]] [formerly fe7e108a7a39f596942c3a7857d974513537c36f [formerly 96ed2e9adea4693d1568da4c02c493bc00ab737b] [formerly 81b5b000c95e20f29d5759d37e34a22c1222641a [formerly 7ac384bdcf5be44df42bf424f25f98dc85d5dece]]]] [formerly 00efeefde7418c9737b80e13da99add64c5900ac [formerly 80319dc57e64b019ce33b6853055730e380459d9] [formerly ae553c9d10fd5f2e7658e928c443a99661ba764a [formerly 11a6613d53ffe9fb2848ff6c14ca1612dcdb34bf]] [formerly 47bb54af7251c17a6bafd9348e04d0dba135c1d6 [formerly d2b058127244cd31dc947575b75b4f2e0d875c86] [formerly 429eae57a81858368b00e9d53b2dca2c0e71e5f3 [formerly 25d16b6950cc75c4ed6a5543f49efad0f17e137e]]] [formerly 4dcbb9fc314e276566705c523592321f074e976c [formerly 2299efc10b223b5bb732adb9e4f2a6561c03dc44] [formerly a575aab859e8f25a9b97bb917fb0fd6ea4dcd8e0 [formerly 71df16bd005ac43382b7b141a9a3f07bb4a3b180]] [formerly fbfeab04446f3fc1536881300bf33cda3f0a4009 [formerly 3be0ae82551c77b0fbaf9876284dd0d16f8eaddf] [formerly e4f67368ac6942dedb33653b1d5fad0f12002a50 [formerly 1079d0b435a1a06498aa1404e0335637ed663495]]]]]] Former-commit-id: 983de90fdbbf7398c4556a600f8cd7b55ddd37c1 [formerly 70a58c684a08e948bafc3dd30fd78d2ceb3cd42f] [formerly e98df061415c071c1fc2360b30f9508ea64f34c1 [formerly ec422f32be6b41919b6e578334e5d8e18c846daa]] [formerly ce7bb8c4a529c42c4e268f9934345be548d1e9f3 [formerly af177dbfc56bc80fe5dc1044526c022cd1d69dc6] [formerly 2bb29b2563fb62080695b7ed6939ab2876da3aa4 [formerly e24db05a603082d13d29133caa7a7d9b2ed9d477]]] [formerly 771ea1d21eb84b3604e06bd9a1dcfaf16d506ed6 [formerly 0fef9e68b08f4ef11304180047d329c88820648e] [formerly 7b378f8cf96a31c5f4f58b265446d659efd57b58 [formerly aa383cc9f6d1be2acb02b20181c4098570aa8527]] [formerly f46e6b9d17256c3306691bc76ae02306f88abf79 [formerly c0c60998ffbe7bb5795ec8fa224bcf098990a494] [formerly a8995f860d65aa814249f54694f1a9796eb50674 [formerly 438f2be3f76e76b449036728e6abee4533fca3d3]]]] [formerly 559904e322201755996953349ca475160b96e23d [formerly 7964cccd2b0661edcc47ee7aefda271d968bfb08] [formerly e1ce24c113129c8d219e280d235d0298a81e4130 [formerly bef20455765b937f15cc83b7219e57c07ea3883d]] [formerly d10477418db598776af76d41c18e90fee05f368a [formerly f043e50647fba3717d4985d697db28d45d764f62] [formerly 118c2d745528b8ec9755da97380e77e620399ed2 [formerly 21ae896bb6d401d227dc3fc7d5e1cd01d434a562]]] [formerly d9a9911e9e0a12b70edd59b773818f9692febbbd [formerly effa6e50ecf4db0778e50d3d39a0dc1a4c66ebbc] [formerly 0aa9e259bc683bea99601500ef2e1ee5d1bb01e1 [formerly 2ae4040a7d9c7831ab565c14108aab245ebce623]] [formerly f55d85b2a31637fdefd912d5c4e8a97542e3ac44 [formerly 9d752c374fedaf7b8e1eeccbfb4202ebbcf19258] [formerly e4f67368ac6942dedb33653b1d5fad0f12002a50]]]] Former-commit-id: 34c1021dbf75897a26100d9db79e207e1b693075 [formerly b8915460ddf50b4b8a777e09e932dc8697fd2566] [formerly ad51a2deef198239368ee8dc2bf70d93a36acee1 [formerly bd03e81c73298f5ddc471f1f6f27b50fe6b7f086]] [formerly cb520584fd25b67f83164b3ea06df9dc85f439dd [formerly 899477e251aee9173773d348433d2fef81b43372] [formerly 42c3c436ad6076955d3d8fecbfdc17854dee79c4 [formerly b84fa63fecd84dd4fbf0e657b33db846f402bf25]]] [formerly 254eeedb550b8db3a6b15acd07befc22fd83790a [formerly f26617dd50d07c6d98169270aefa7d9427f847d8] [formerly 572b9c1288774c387d939ccfee433f8851a14100 [formerly 5d943a2c4e159a214eac5941034dc04c7d7bb8aa]] [formerly 5442b13869e4e35820d0ac5880f6de070e9a5cd8 [formerly 41fa6c96acdc475fb353c0941f8c760bf3c0d3a0] [formerly 46689c94f16acea0c7f8eb019afa2e2d12b158b7 [formerly 6b11da4706e27079efae3709b798c406a33ca3f3]]]] Former-commit-id: e502dd9c272af1495ac91a5e30ed04a0735fe40f [formerly 04577b301822a6b07914bbde6c0e631336e5ef68] [formerly 2bc72280b9a6870db37a789e682573135ae9c10e [formerly 7b165255c21717f83218333a35c62a77d9a2cc9d]] [formerly 3d4df281992c23617bf3bbc4984ee080cbf75af6 [formerly a6fa26b73f643724d03dd8f943aa8eee68ba0710] [formerly 0550dd430770bd34c21989e563dbafe5941f66a0 [formerly c12b7376a879b88382bf81e2b4cf6f0e24abdb71]]] Former-commit-id: 393454137e38aaf1299bf5c263f339e7fe7f8e66 [formerly b597a7c1c62be1c6699262bc5359b48fe4731e9e] [formerly 8cb291d7e14e12c43b944d86373a973e366f923d [formerly 74c5d07aca7dd2b7bbe39fb15375d685c7a6169b]] Former-commit-id: 06c1ab5a8afcd61658719e755c3da1cc130e2c3f [formerly 96b3ae00aef955944369033f24dd4d8cb3bbe815] Former-commit-id: 53e9dea6a8c3366533b99c1319535c8854bbde9c --- .../primitiveSKI/Base_skinterface.py | 29 +++++++++++----------- .../detection_algorithm/Telemanom_skinterface.py | 1 + .../test/detection_algorithm/Telemanom_skitest.py | 8 +++--- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/tods/tods_skinterface/primitiveSKI/Base_skinterface.py b/tods/tods_skinterface/primitiveSKI/Base_skinterface.py index 76ef244..55ab814 100644 --- a/tods/tods_skinterface/primitiveSKI/Base_skinterface.py +++ b/tods/tods_skinterface/primitiveSKI/Base_skinterface.py @@ -25,32 +25,33 @@ class BaseSKI(): self.fit_available = False self.predict_available = False self.produce_available = False - #print(hyperparams) + + # print(hyperparams) def transform(self, X): #transform the ndarray to d3m dataframe, select columns to use - # if self.use_columns==(): - # self.use_columns = [iter for iter in range(len(X))] - # else: - # pass - # print(self.use_columns) - - use_columns = [iter for iter in range(len(X))] - inputs = {} - for i in use_columns: - inputs['col_'+str(i)] = list(X[i]) - inputs = container.DataFrame(inputs, columns=list(inputs.keys()), generate_metadata=True) - return inputs + column_name = [str(col_index) for col_index in range(X.shape[1])] + return container.DataFrame(X, columns=column_name, generate_metadata=True) + + # use_columns = [iter for iter in range(len(X))] + # inputs = {} + # for i in 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): + # print(data) if not self.fit_available: raise AttributeError('type object ' + self.__class__.__name__ + ' has no attribute \'fit\'') data = self.transform(data) + # print(data) self.set_training_data(data) + return self.primitive.fit() def predict(self, data): @@ -102,4 +103,4 @@ if __name__ == '__main__': 'use_columns': use_columns, 'return_result': return_result, """ -#use_columns=(-1,), contamination=0.1, return_result='append' \ No newline at end of file +#use_columns=(-1,), contamination=0.1, return_result='append' diff --git a/tods/tods_skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py b/tods/tods_skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py index 3d9f46f..c6236bc 100644 --- a/tods/tods_skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py +++ b/tods/tods_skinterface/primitiveSKI/detection_algorithm/Telemanom_skinterface.py @@ -8,3 +8,4 @@ class TelemanomSKI(BaseSKI): self.fit_available = True self.predict_available = True self.produce_available = False + diff --git a/tods/tods_skinterface/test/detection_algorithm/Telemanom_skitest.py b/tods/tods_skinterface/test/detection_algorithm/Telemanom_skitest.py index 3dc5de7..5942155 100644 --- a/tods/tods_skinterface/test/detection_algorithm/Telemanom_skitest.py +++ b/tods/tods_skinterface/test/detection_algorithm/Telemanom_skitest.py @@ -1,10 +1,10 @@ import numpy as np from tods.tods_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]]) +X_train = np.random.rand(9, 3) +X_test = np.random.rand(9, 3) -transformer = TelemanomSKI() +transformer = TelemanomSKI(l_s= 2, n_predictions= 1) transformer.fit(X_train) prediction_labels = transformer.predict(X_test) prediction_score = transformer.predict_score(X_test) @@ -12,3 +12,5 @@ prediction_score = transformer.predict_score(X_test) print("Primitive: ", transformer.primitive) print("Prediction Labels\n", prediction_labels) print("Prediction Score\n", prediction_score) + +