Merge pull request #16 from datamllab/wangyang

fixed Telemanom sk Test

Former-commit-id: e910f90871 [formerly 6afe0f2c16] [formerly e3e452a671 [formerly 519bc7f439]] [formerly c1044c48e2 [formerly d0c0a8f49d] [formerly 15ccbfe8dc [formerly f6c4fa381d]]] [formerly 9b264b8905 [formerly 7bc05db00f] [formerly a5c9ce1ac8 [formerly 91676ec440]] [formerly b6f897c78d [formerly 2d9f7af129] [formerly 78196f9df2 [formerly 4caddb763e]]]] [formerly f930894b00 [formerly 35b3ffdeb7] [formerly 99be29ffe4 [formerly c5fb668dd4]] [formerly f5492f4398 [formerly 9a6d8f1834] [formerly e62f26eeb0 [formerly f9100a78ae]]] [formerly 6497376516 [formerly fb760a7b55] [formerly a79dbd2149 [formerly bdb9796c72]] [formerly f592d205f3 [formerly abe0bcb5cb] [formerly 316201b01f [formerly e059a59aa2]]]]] [formerly e4551db5e3 [formerly d63a62a9ba] [formerly 1c81818e1c [formerly c2f1623869]] [formerly 18982eb7bd [formerly 4f7e4ebde7] [formerly d97d8026f6 [formerly 30811f79d6]]] [formerly 574008b70f [formerly 62c5363e64] [formerly 35713cf277 [formerly cbf358f3ee]] [formerly 2572091d69 [formerly 0664b80676] [formerly 19f2dae440 [formerly 21f575dd0b]]]] [formerly 940f03c4eb [formerly 280a5c920d] [formerly d416fb3e1b [formerly b4e5200cd1]] [formerly 3bb406a850 [formerly 2f72993503] [formerly 229f60af8b [formerly 5593fb0c4a]]] [formerly b1ba73e9b9 [formerly ac33b23d09] [formerly 7f26cb6b4f [formerly 9a10049a89]] [formerly 17dc90facf [formerly 3ec2ed16f6] [formerly fbe21cdf64 [formerly 95262b7aa5]]]]]]
Former-commit-id: cce0e70cd8 [formerly 83e3109d71] [formerly 51509a0bfa [formerly 31baa30e55]] [formerly 626ef6fd46 [formerly 100cb4691c] [formerly 2437845807 [formerly 01d2605b8d]]] [formerly ff32aa8773 [formerly 8b682f2b0f] [formerly 1a513998c2 [formerly ead9b7a098]] [formerly 6e57010cc1 [formerly f768ff5133] [formerly cb90f9b7c3 [formerly 0c76204e60]]]] [formerly e0868b95fd [formerly 3a55f25855] [formerly d600abd58c [formerly eb017cfa70]] [formerly bcd40cd2a8 [formerly 6cdb6df6c9] [formerly 782f6e9403 [formerly fa36f7eb03]]] [formerly f05df2f87c [formerly 8059d73b82] [formerly fa330e1eca [formerly 59f8893e8d]] [formerly ebdfe04f9b [formerly bc98d1210f] [formerly fbe21cdf64]]]]
Former-commit-id: 7fa6958dae [formerly e56d03682f] [formerly 7d4943d4cb [formerly a2b34f96c3]] [formerly d0a7aa5e1e [formerly 0c400d978b] [formerly e62cc4f4f7 [formerly bd9b3e694b]]] [formerly 06b49b1af2 [formerly 0eff88f651] [formerly 28938cf86b [formerly 444edb4b05]] [formerly 4dcf9d5230 [formerly e281870bd0] [formerly 2527d5dfae [formerly 20c6240d4a]]]]
Former-commit-id: 8e01369828 [formerly 6e27f6f2c8] [formerly ada2f6e49f [formerly b7c893d435]] [formerly 11eec4723f [formerly d432027120] [formerly 13d85ec4b4 [formerly c208264a3c]]]
Former-commit-id: ce11cd49b6 [formerly 536b13f9aa] [formerly 2dd30e73af [formerly 1f8ee519d3]]
Former-commit-id: 3e8e507403 [formerly eb1c3fb5cf]
Former-commit-id: 96dc87c1c4

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'
+#use_columns=(-1,), contamination=0.1, return_result='append'

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
+

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)
+
+