Browse Source

fixed (AE, VAE, NNMF)

Former-commit-id: 9e92357cd8 [formerly d3416b7ecf] [formerly e1c7cef07d [formerly 4f7deef10b]] [formerly 0c6089371e [formerly 1b5f0723e9] [formerly 7ff18d7764 [formerly 848ec9364f]]] [formerly d9f66028dc [formerly 65f7236a63] [formerly 46e44182ce [formerly 1717df0264]] [formerly a417523d62 [formerly 938e9dc039] [formerly 357ed0ce48 [formerly e1cf1bc229]]]] [formerly 7a6af72566 [formerly 2e332b01b5] [formerly f3c5de19ea [formerly fc6d017a14]] [formerly 93916906e1 [formerly 64aedb0bbc] [formerly 67aaf15642 [formerly fc1ce44ae4]]] [formerly 673c660575 [formerly 08f4d4cee4] [formerly 7695f6ef45 [formerly b3c3ec4851]] [formerly 91624e5930 [formerly a735a08c9c] [formerly 42ad72fd08 [formerly b45d9ffb00]]]]] [formerly 8e03ba3edf [formerly 4f040286f0] [formerly f7d406ecdc [formerly 7e519cefc0]] [formerly 33c1c90340 [formerly 9e46bcb8af] [formerly 68e68d46a0 [formerly 82f8abcd78]]] [formerly 8799cd1486 [formerly 43f80a118b] [formerly 59bc153a6e [formerly a604f4bb6e]] [formerly bec1632505 [formerly 86d18e9554] [formerly f6042a6a2a [formerly 0c0993ee9b]]]] [formerly 56becb6987 [formerly bd23ea4c16] [formerly 836cbd1e0e [formerly c5086bea98]] [formerly ca1a62e549 [formerly 3d46188807] [formerly 9164e66639 [formerly e7912eec83]]] [formerly c12ab5aa77 [formerly a5ecc25ae1] [formerly 01f86b9562 [formerly d1b710bb22]] [formerly e93acb81ef [formerly 3b300f49ce] [formerly 9c9c60ff10 [formerly f62d376cf2]]]]]]
Former-commit-id: 8694d5d9d4 [formerly 0e0eaf35d4] [formerly 27da5fbae3 [formerly 1110491682]] [formerly 9df17ad266 [formerly 52abc9ba12] [formerly 369ca10520 [formerly 9bc9900d79]]] [formerly c77d0f80d9 [formerly 9e02dea1a9] [formerly 4d505c846a [formerly 0ab814cff1]] [formerly d9a8979822 [formerly 5ab37d6576] [formerly bac1d49b2b [formerly 4ec9ee5b1d]]]] [formerly 4222597032 [formerly 84433aae1e] [formerly eb2bba8c7f [formerly 2a766f791c]] [formerly b8f79a77f2 [formerly 31a7739796] [formerly 2dd8f299c3 [formerly ece1794dac]]] [formerly a04ae33f89 [formerly 02b8f320f2] [formerly ee6082e7ec [formerly e8e5eb8ae3]] [formerly 0e1a9169cb [formerly 698f0825df] [formerly 9c9c60ff10]]]]
Former-commit-id: 77904b214d [formerly 9f64ebd8a0] [formerly 3f221f936f [formerly 2d285677dc]] [formerly f100a35d9c [formerly 5e3b49883d] [formerly 77798d4d83 [formerly 5288ab37ba]]] [formerly cb621185a6 [formerly 78e60cda36] [formerly 96051071b5 [formerly b186525a57]] [formerly 6bd696ee63 [formerly f6af424599] [formerly 9614c39e8e [formerly 48964d4b55]]]]
Former-commit-id: c730223ea1 [formerly 22785d8fe2] [formerly f66828a033 [formerly 11f0aa4db8]] [formerly d994b2c62f [formerly 6d6dc2d00b] [formerly ba45d1bcae [formerly ea2cc1b14d]]]
Former-commit-id: c27edde415 [formerly 0d52c5ff2a] [formerly bb1fd17cff [formerly 42993b3acb]]
Former-commit-id: 12851b571e [formerly 197010aa0d]
Former-commit-id: 9918e0afb3
master
hwy893747147 4 years ago
parent
commit
9b022be5d7
4 changed files with 7 additions and 5 deletions
  1. +1
    -1
      tods/detection_algorithm/PyodAE.py
  2. +1
    -1
      tods/detection_algorithm/PyodVAE.py
  3. +4
    -2
      tods/tods_skinterface/test/detection_algorithm/AutoEncoder_skitest.py
  4. +1
    -1
      tods/tods_skinterface/test/feature_analysis/NonNegativeMatrixFactorization_skitest.py

+ 1
- 1
tods/detection_algorithm/PyodAE.py View File

@@ -56,7 +56,7 @@ class Hyperparams(Hyperparams_ODBase):
######## Add more Hyperparamters ####### ######## Add more Hyperparamters #######


hidden_neurons = hyperparams.List( hidden_neurons = hyperparams.List(
default=[1, 2, 1],
default=[1, 4, 1],
elements=hyperparams.Hyperparameter[int](1), elements=hyperparams.Hyperparameter[int](1),
description='The number of neurons per hidden layers.', description='The number of neurons per hidden layers.',
semantic_types=['https://metadata.datadrivendiscovery.org/types/TuningParameter'] semantic_types=['https://metadata.datadrivendiscovery.org/types/TuningParameter']


+ 1
- 1
tods/detection_algorithm/PyodVAE.py View File

@@ -56,7 +56,7 @@ class Hyperparams(Hyperparams_ODBase):
######## Add more Hyperparamters ####### ######## Add more Hyperparamters #######


encoder_neurons = hyperparams.List( encoder_neurons = hyperparams.List(
default=[1, 2, 1],
default=[1, 4, 1],
elements=hyperparams.Hyperparameter[int](1), elements=hyperparams.Hyperparameter[int](1),
description='The number of neurons per hidden layers in encoder.', description='The number of neurons per hidden layers in encoder.',
semantic_types=['https://metadata.datadrivendiscovery.org/types/TuningParameter'] semantic_types=['https://metadata.datadrivendiscovery.org/types/TuningParameter']


+ 4
- 2
tods/tods_skinterface/test/detection_algorithm/AutoEncoder_skitest.py View File

@@ -1,8 +1,10 @@
import numpy as np import numpy as np
from tods.tods_skinterface.primitiveSKI.detection_algorithm.AutoEncoder_skinterface import AutoEncoderSKI 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 = AutoEncoderSKI()
transformer.fit(X_train) transformer.fit(X_train)


+ 1
- 1
tods/tods_skinterface/test/feature_analysis/NonNegativeMatrixFactorization_skitest.py View File

@@ -1,7 +1,7 @@
import numpy as np import numpy as np
from tods.tods_skinterface.primitiveSKI.feature_analysis.NonNegativeMatrixFactorization_skinterface import NonNegativeMatrixFactorizationSKI 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() transformer = NonNegativeMatrixFactorizationSKI()
X_transform = transformer.produce(X_test) X_transform = transformer.produce(X_test)


Loading…
Cancel
Save