From 9b022be5d7004f4ca1c072c6565d03f1d7b9b7f2 Mon Sep 17 00:00:00 2001 From: hwy893747147 Date: Tue, 12 Jan 2021 12:54:33 -0600 Subject: [PATCH] fixed (AE, VAE, NNMF) Former-commit-id: 9e92357cd89c3a9b4c230c4ce19bdd0f3e24f7b7 [formerly d3416b7ecfb793d4899e5a8b3c88ff92ae68fd3e] [formerly e1c7cef07d1d279aeb6afbe33c2711a8a9ce5fae [formerly 4f7deef10b8fd78298af5e5e725475957bc44137]] [formerly 0c6089371e561293c97c1b541da03fa59f2ebf99 [formerly 1b5f0723e954b5f4fc0ce17743a20cc8587c7a8a] [formerly 7ff18d77640a025de16b42377921760769bb6c7c [formerly 848ec9364fcff1c645f70dc60c930b11c9914c2d]]] [formerly d9f66028dc6fabfa61eb8dcca4195e986541f3ac [formerly 65f7236a630756c20bd8ca1e4115147f1ce79710] [formerly 46e44182cecac4806286cbe5dc7558f9407b867a [formerly 1717df0264c8d5e9f8d9dc00caaebda59144495c]] [formerly a417523d627baef8aac9218946f5623227c1f9f8 [formerly 938e9dc039fea9f083764c295e87534ae8273ca2] [formerly 357ed0ce48e354e370dd97317e89b2815b0f73ca [formerly e1cf1bc2296d2c02f9d83c9690606e4b3206d274]]]] [formerly 7a6af725660d806a748126faeb9854a07ef69715 [formerly 2e332b01b52647022535a2b039b8ca3f94d6fc9c] [formerly f3c5de19eae8c8b7fa4e4bf810cb041abbae8eee [formerly fc6d017a140f0ff85799aa6a7d5ee3b89514db4f]] [formerly 93916906e1ffb5c49d1d50d1928a11a461246fe9 [formerly 64aedb0bbc2cd4740bfc49ee2e4e2e922030319a] [formerly 67aaf1564279c3262fb88cf2a01e1b1e3121b697 [formerly fc1ce44ae46015721b3dfb92d92c4262b1556d34]]] [formerly 673c6605759212370d2221f364e90ec5809fed9c [formerly 08f4d4cee4eb2447deddcac28275b08f1f76f5af] [formerly 7695f6ef459b6f206e7039faf323acebc0f16dc1 [formerly b3c3ec4851d501c58a6a6465f490b1e535daa713]] [formerly 91624e59300e3c1ffe2a720695b3c8a5029fb2ff [formerly a735a08c9ce2ffba27da0a3fa833da26a2549100] [formerly 42ad72fd0861bafc1ad99909428e7f3c546ccc2f [formerly b45d9ffb002703fd1dea9c49a8fafeda6ba03d5e]]]]] [formerly 8e03ba3edf8cbd8366ffd611116b6cd6fd10e83f [formerly 4f040286f07711dbb43d9d5a854fb141c80cf357] [formerly f7d406ecdcf55bb7c4ef3371dbb665b820f7a456 [formerly 7e519cefc02fb7ff026f1b166de6eb60ee2b8dfd]] [formerly 33c1c903405b945fd95cdde2fbdc2f4f44e53b63 [formerly 9e46bcb8afed7b1b4a99858dd607997fd1fb2d32] [formerly 68e68d46a08adc40bda1bca252391f14cc4de59f [formerly 82f8abcd782b9a4a45e912b7f96329f3c9fd06f5]]] [formerly 8799cd1486c487d168907faf8aa90c25554e23bf [formerly 43f80a118bbc4569cdedf3727f44ae12b654c29c] [formerly 59bc153a6ede5b2525bd9939ddccd82c74566b2b [formerly a604f4bb6ef423b323f5ee2357015da0a06fd067]] [formerly bec1632505788543315ade60c98a7b136446fee2 [formerly 86d18e95543ed6ecfb63b03f4c6f7128237cd84d] [formerly f6042a6a2a96143a4c4a41a0cd4eb697ffb67f3c [formerly 0c0993ee9b2cfe228758e632a6cff57786f49d01]]]] [formerly 56becb6987395d0f389dd14ec563071e61384cb2 [formerly bd23ea4c16b65a98a714cb89977fa27ecb48a5e7] [formerly 836cbd1e0e474a6ef1848150389ae1ba373a46ac [formerly c5086bea98a34a14d61d56708b555b817a590370]] [formerly ca1a62e5499eaebb7da29c8de8d4edacc798f049 [formerly 3d4618880775e6d774af5e86205f8555c93caffd] [formerly 9164e66639347df402ef9ae296912bfaadde199e [formerly e7912eec83f4705cfce33101bc5948091b18b60f]]] [formerly c12ab5aa77851b249a5f151e90817460e5b87869 [formerly a5ecc25ae1425dd7897e83742efede989df303b0] [formerly 01f86b95620c1be374d3e8c0cb08686ed4b32646 [formerly d1b710bb22c27551d567ea6fb8df3125e6770e1b]] [formerly e93acb81ef9ff700667b43578450c1522a751157 [formerly 3b300f49ce7870edef04f50ef940d2afd8a36709] [formerly 9c9c60ff10300cda89427cb970cf5d617a389dc8 [formerly f62d376cf294303285879f29d17c4950bb80fb1f]]]]]] Former-commit-id: 8694d5d9d4d406f03e8bbf317b731c64df09cf73 [formerly 0e0eaf35d4cc4104284aeadbd0bfa0721e826c69] [formerly 27da5fbae38d73e5cc7175aff1c2dce26f424fa0 [formerly 111049168221ab028191176aa232565319aaa69d]] [formerly 9df17ad266959a866c2dbe7ae3a4340c3b9941c6 [formerly 52abc9ba12b957b57a797ae926ac80480e8a9a89] [formerly 369ca1052026ab82863c0af626f08dc887a66796 [formerly 9bc9900d79c46af7db1555cd504b8873ef61f9a2]]] [formerly c77d0f80d9e93a8a294c19ac5921c5de82d339d5 [formerly 9e02dea1a923730570c2581e710c6d2272b0d93a] [formerly 4d505c846ae0d55be8258dc9cd209b0a7316f1c0 [formerly 0ab814cff10f4bad3bd16eb3207239b60a3148e0]] [formerly d9a8979822136565ef6ef7f27f1a515a4a710598 [formerly 5ab37d65766ac3ea0ef55fd1875518583f2af7e3] [formerly bac1d49b2be9858305a4bbae722b6f665582babc [formerly 4ec9ee5b1daf3c3e1fbdc0930039e42514a1eb8d]]]] [formerly 42225970324ee9aae245ce4da061b75527e339c3 [formerly 84433aae1e9b8e98d6938a5963c54c6aa738a477] [formerly eb2bba8c7fa2512848ebcda31911214ec6aab346 [formerly 2a766f791c31a1ca956035edf59dbd3a525eca27]] [formerly b8f79a77f294902362e685b796778f0315643c42 [formerly 31a7739796583f66c4354fc5878753fed41cc85e] [formerly 2dd8f299c3d319df12828561a6550ba35abe3a31 [formerly ece1794dac439ef7d70bbcc8fcea69c6f8b134a1]]] [formerly a04ae33f890a6038824f52c58d04b709dd1f306c [formerly 02b8f320f245e59d4c354221f65c3d010b29d60e] [formerly ee6082e7ecacdec6bc6a31004e12bfd2014887bb [formerly e8e5eb8ae3690f5fa58d5588c48efb3d09a9a3ca]] [formerly 0e1a9169cb7faa4f76c2852b122e362d37bfd3fe [formerly 698f0825dfb180bb098f94142fb7ce5998cc6a9e] [formerly 9c9c60ff10300cda89427cb970cf5d617a389dc8]]]] Former-commit-id: 77904b214d8f96257a92130696ec85c7481d4372 [formerly 9f64ebd8a033275a8a4207fb852d92c1d97df25c] [formerly 3f221f936f307b725e937578f16eb289593e9ed9 [formerly 2d285677dc72b1cc81370dc23dd9a1fa1696ebf9]] [formerly f100a35d9c7f338ceee7e2ad49f9bfa5cd7ee2b6 [formerly 5e3b49883d2945d5b589b9890ca188514860666e] [formerly 77798d4d83c1aa9527290c73b2202b5a08064607 [formerly 5288ab37bad5f2c510ee15d76e6b1fe870eae188]]] [formerly cb621185a62294f82f3cb1370768d4d2a2434e41 [formerly 78e60cda3670ca2300dbdc0adb3e35011b145e15] [formerly 96051071b5a425b77632a0533e60347fa3f41e5b [formerly b186525a57d302f765c02b8fcf9b29a8672ab3d3]] [formerly 6bd696ee6367c052fd1dc4976e759dc5b8b6d8c1 [formerly f6af424599bc5e5d22d91b8032c9ff78c24ef0a3] [formerly 9614c39e8e6521f16cb295b99f9f8762841eadfd [formerly 48964d4b551090180d940c0ca2b205e58ff89f76]]]] Former-commit-id: c730223ea1e5a8d5e8294f6ef990a4b56327f2db [formerly 22785d8fe25a2788841f319d8b80ca87159e8113] [formerly f66828a03352dc0d74a7681fc4093d1a51629681 [formerly 11f0aa4db89bbb5bd591a8af04b6e30cc889c796]] [formerly d994b2c62f2aa4907f56fa7415654c1cde6f9441 [formerly 6d6dc2d00b7098c4c0fb35aa8f5ff78636228545] [formerly ba45d1bcaea3a6b713756918bd97e7d6d8cf0916 [formerly ea2cc1b14d35661b8139be57f64521dcc2e7aea5]]] Former-commit-id: c27edde4154e67e77dd1fcb4400e6215ae90de6a [formerly 0d52c5ff2ab42c68b2acc8657ac1e165aaa7e006] [formerly bb1fd17cff04a5bef1f6f6ce1b18c8a98f868c2c [formerly 42993b3acb87f71866c6d6be170ee6590b7dfe3f]] Former-commit-id: 12851b571ea225ad60fa31f451241a4e529bf3cf [formerly 197010aa0d338fdeb74f0910922f82501d4c8cb7] Former-commit-id: 9918e0afb39a950438a9c77b0891e7922160d458 --- tods/detection_algorithm/PyodAE.py | 2 +- tods/detection_algorithm/PyodVAE.py | 2 +- .../test/detection_algorithm/AutoEncoder_skitest.py | 6 ++++-- .../test/feature_analysis/NonNegativeMatrixFactorization_skitest.py | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/tods/detection_algorithm/PyodAE.py b/tods/detection_algorithm/PyodAE.py index 322fa41..f34411c 100644 --- a/tods/detection_algorithm/PyodAE.py +++ b/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'] diff --git a/tods/detection_algorithm/PyodVAE.py b/tods/detection_algorithm/PyodVAE.py index 34dd5e8..62ae781 100644 --- a/tods/detection_algorithm/PyodVAE.py +++ b/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'] diff --git a/tods/tods_skinterface/test/detection_algorithm/AutoEncoder_skitest.py b/tods/tods_skinterface/test/detection_algorithm/AutoEncoder_skitest.py index eb55a2b..fcb26a4 100644 --- a/tods/tods_skinterface/test/detection_algorithm/AutoEncoder_skitest.py +++ b/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) diff --git a/tods/tods_skinterface/test/feature_analysis/NonNegativeMatrixFactorization_skitest.py b/tods/tods_skinterface/test/feature_analysis/NonNegativeMatrixFactorization_skitest.py index ecabc49..96ec1b1 100644 --- a/tods/tods_skinterface/test/feature_analysis/NonNegativeMatrixFactorization_skitest.py +++ b/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)