Merge pull request #13 from datamllab/wangyang

fixed AE, VAE and NNMF

Former-commit-id: da5d465f4b [formerly 68c6344055] [formerly ab68218f92 [formerly ad00ea923b]] [formerly efc1b24291 [formerly 6670967fcf] [formerly c37f7d973b [formerly 94a32938e0]]] [formerly fcb17ba17b [formerly 934101309a] [formerly e22cdbacd1 [formerly ca558db3b9]] [formerly aee12308df [formerly 71374a55aa] [formerly b355b4eca2 [formerly ce84bb831c]]]] [formerly 70a07914ba [formerly 8fd1670ac6] [formerly 0177e6aba1 [formerly 0823278e47]] [formerly 9a57174562 [formerly aa19fff2b0] [formerly 6bd0b1beff [formerly b50fd73ea2]]] [formerly cbe32c2c38 [formerly 4db516914c] [formerly 0cba25ab5a [formerly ea98b9e6ad]] [formerly 1562df29e5 [formerly 15641067ba] [formerly 59e6e95012 [formerly e4dca72a9c]]]]] [formerly 272dbcb13d [formerly fbc9bace3e] [formerly 37cc8f20f1 [formerly 47aed11643]] [formerly 811c4b8356 [formerly 0a267d80b7] [formerly 8d79daa083 [formerly e77e503c7f]]] [formerly 1bbd595225 [formerly d739e6316b] [formerly 9db0a622fd [formerly 7a3b8e4c61]] [formerly 357ad0fc47 [formerly eceeabc99a] [formerly 828e829fa3 [formerly b41f52c989]]]] [formerly 820bd7daaf [formerly 86aeb2a3c3] [formerly b378162f92 [formerly c306e05b1a]] [formerly 6d88f05f14 [formerly a1aeb69ad4] [formerly 230c846b39 [formerly 9ca55e0a6a]]] [formerly ef38c2f71a [formerly 9c13ff5f5a] [formerly 70704182aa [formerly e2cc7d6d3a]] [formerly 0268e5564c [formerly 224c78c76d] [formerly 091d9d8423 [formerly 51d0f0863c]]]]]]
Former-commit-id: afd4e7b02c [formerly 58563206f3] [formerly d9ca29591c [formerly 099f99d062]] [formerly 9734d6841b [formerly 386e095fcc] [formerly 3f0795d205 [formerly 5643bdac54]]] [formerly 9478c58f40 [formerly a9a96aa539] [formerly 7728a6d3c7 [formerly bf9e087bc4]] [formerly d937b8e4c1 [formerly 2cba322379] [formerly 6f2ec96eb3 [formerly dbceaacaf4]]]] [formerly 08a348f3a3 [formerly 4ec9b85632] [formerly 624cb97f6b [formerly 49d288e0c8]] [formerly b50234433b [formerly a26b9db627] [formerly 8c75caf7ec [formerly ba921859b6]]] [formerly 0d3e2f6b1c [formerly 5733eac372] [formerly e87f8e9a98 [formerly 473e0d9589]] [formerly 9959f1f4db [formerly 5ed004a6aa] [formerly 091d9d8423]]]]
Former-commit-id: 912d25c301 [formerly 4fb45042b0] [formerly 815bb67411 [formerly 39adeb404b]] [formerly df021a0bf0 [formerly b9008923fd] [formerly 68979ff167 [formerly 4da137b771]]] [formerly 31c8907e5c [formerly 2bf234bd66] [formerly 91433513c4 [formerly a31b2649f7]] [formerly 2c2a589550 [formerly 9eb5386d73] [formerly 550c7f7b0f [formerly f43589dd5f]]]]
Former-commit-id: e09716d87e [formerly a4735787c3] [formerly 09fdb92ffa [formerly 12bd5a149e]] [formerly c2e65b3969 [formerly 28f8e39d8f] [formerly 17ea60541c [formerly f22b574bef]]]
Former-commit-id: 71ad31759e [formerly 3192d69827] [formerly 05bc1e1ae8 [formerly ce0795cc93]]
Former-commit-id: 301a084ccb [formerly 97882f39d1]
Former-commit-id: 353300054f

tods/detection_algorithm/PyodAE.py

@@ -56,7 +56,7 @@ class Hyperparams(Hyperparams_ODBase):
     ######## Add more Hyperparamters #######
 
     hidden_neurons = hyperparams.List(
-        default=[1, 2, 1],
+        default=[1, 4, 1],
         elements=hyperparams.Hyperparameter[int](1),
         description='The number of neurons per hidden layers.',
         semantic_types=['https://metadata.datadrivendiscovery.org/types/TuningParameter']

tods/detection_algorithm/PyodVAE.py

@@ -56,7 +56,7 @@ class Hyperparams(Hyperparams_ODBase):
     ######## Add more Hyperparamters #######
 
     encoder_neurons = hyperparams.List(
-        default=[1, 2, 1],
+        default=[1, 4, 1],
         elements=hyperparams.Hyperparameter[int](1),
         description='The number of neurons per hidden layers in encoder.',
         semantic_types=['https://metadata.datadrivendiscovery.org/types/TuningParameter']

tods/tods_skinterface/test/detection_algorithm/AutoEncoder_skitest.py

@@ -1,8 +1,10 @@
 import numpy as np
 from tods.tods_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]])
+X_train = np.array([[3., 4., 8.]])
+X_test = np.array([[3., 4., 8.6]])
+# 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 = AutoEncoderSKI()
 transformer.fit(X_train)

tods/tods_skinterface/test/feature_analysis/NonNegativeMatrixFactorization_skitest.py

@@ -1,7 +1,7 @@
 import numpy as np
 from tods.tods_skinterface.primitiveSKI.feature_analysis.NonNegativeMatrixFactorization_skinterface import NonNegativeMatrixFactorizationSKI
 
-X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, -23, 59.2]])
+X_test = np.array([[3., 4., 8.6, 13.4, 22.5, 17, 19.2, 36.1, 127, 23, 59.2]])
 
 transformer = NonNegativeMatrixFactorizationSKI()
 X_transform = transformer.produce(X_test)