From c184e0aacb85e331a9452f0edcce9d0f054b0a7f Mon Sep 17 00:00:00 2001 From: Daochen Zha Date: Fri, 11 Sep 2020 11:30:36 -0500 Subject: [PATCH] Add contamination in search space Former-commit-id: 3f139897fb114d5242e23d42f0ae8bd7d4e2c549 [formerly 04d7e27734c0c801808a5f04b062d9486c5a306d] [formerly e618da4e70bfa65dc69b2169c1e7b44b51750958 [formerly 2fd75c30491cafbdaf245bbaa7a2eb9ea49b8d64]] [formerly be4cdeb1ee9bf4c45120f2bb9f74709151cea385 [formerly bba38975a316550f86cf2535eeac2d05a533ba94] [formerly a5dcb7ab0748b4c7543f1c9c20d8304c2a6e6e6d [formerly f945aa4364a7f187848b0f1c93be006fa82ea9e4]]] [formerly 82ae2da087121a5ddf60b1434d6979491059d8ca [formerly bb11a4532c965210674603198d820e169b76ce31] [formerly 63451e4b70d6956ee9939e83daba525a60860f9b [formerly 5035bf6322f569d044e28c5138fd05486cb1e117]] [formerly 7b791a30e16e545fe2f7c3482f5d783851782881 [formerly 00e00dd70f4f5f1284d6b63b24527248d9d3f77e] [formerly f66efd0a1030512bf16db7714651cf86023f1c4e [formerly d7af1ef50738f1679f28fb51f928881f5f4bb84e]]]] [formerly d2a0264fc202ed685c34854495c10034681f5cbe [formerly c55d4b16b42f68d000d13397b87701b1fd90fcbb] [formerly 2d7715e3d3f9cd4d8a1ce8846a1c87d4cca09f5b [formerly 24307eed11d69a90691e41aea199ae8ed019586c]] [formerly ab2b1446d9829a5a92b202cf669438c9ed5ebc5e [formerly c0571337108b5ba38e7266ada89fef8d6c967139] [formerly e22102eb84c9ef897df4d8a86cd5b1220715f737 [formerly 2c55b6d1aa877daddc03d8d0d4cb2b637bc35c8c]]] [formerly d32a102292b904286058900687ab43aa9189fb5c [formerly b1caa653f52a646ac46f8d02a11f6d4bc9c2533e] [formerly a92a468a179f144d9c72c47f77d97cbf8f12081e [formerly 4de123d446da40b9e218e24ab6bc36b82638381b]] [formerly e48763f90bd8a069d73538f5be94768bd1929fbd [formerly c90c8f7f0ebf7130131a307ff1f460c764a5b2df] [formerly 80a9d94529fd8a5af6bc26616dae7fed5c0ff68b [formerly add1537efb00ab10ed0c999f81a3a2b967e886ae]]]]] [formerly 37efaab596c2e0cff974c5c583f18ec71893781a [formerly 90f814268c76b08afe0d0a90bdd230538cab6201] [formerly d7be7d5679a8af568f076b7abd36a4aadc6f3317 [formerly e3528a572a596f5c451d13bd09cd7d8556e564f3]] [formerly 8e1cff593997302a996154ceee428551ebd41735 [formerly 9f458320a329d824282915b0cd2a7c96d492dfdf] [formerly 93f778acb149499f8627826e4bb5b37c3717ebb1 [formerly b0e5c762757e9b5c9aa9192eb3cadb6e93ee9b25]]] [formerly 6e3d0e73b5c54267e6699a48ba688f8f8b633ac0 [formerly 126851f1610844e152996d59ce11f0793365ac55] [formerly 79c90d2002b90ccbf21cd02947a8c2ced7f4bbdb [formerly 988f625a20021d3449950b7ae7d98b46e38e86f4]] [formerly 648efa8778329c21b0e059dd161134f85165a0b5 [formerly aa10ee488e33a793ac25aceade826ac23ed54a52] [formerly 5be6e6d7b8aa9c9478c84908d61e6fdd73e03d58 [formerly 4b102142c0a02c80c19620acf83820319dc9b5c7]]]] [formerly 36ad409dccc895660eecfcd1988ffd098d7c85ad [formerly 886dc8c7f4204a0dee1bcdc3644ce76051abfdfd] [formerly 7e08e9f12081779685ca247b91f98f47db37b36c [formerly c0ba3a46fc6162a8d55461afba6959871b9c3bb2]] [formerly d2ebd67acca1d0e48b2ddcfbf97683798071ca03 [formerly cbff2254362d81438a5a36cf66d0136723fb6bb6] [formerly 1328112d6b8033100bfad97ecedee948d2e30505 [formerly f2421d2131299845025be277209e5fa94dc998f7]]] [formerly 50b979e6559fb7f21fcfec53496cabb4488fa147 [formerly 6796c342fa81f84c2de85365eaea0518f89d96a8] [formerly 7f272a3b6f57f2fd9115cad5edeb1a76a8405aed [formerly 922fcbdc0c9a1d0c057503e5ed5a9a179df1a8b2]] [formerly d916177935dfb8b29ec9f430a0638cf5bfe7633d [formerly 5ad31a4f5303a590d62d53a9bdffa415ff47e128] [formerly eb1ce127ee9bdc04c7f8dec2f9790653311e6020 [formerly 9c3372f82a00416264fb14c0ca0a85ed07637012]]]]]] Former-commit-id: 9c1285f45355a8cc9ee729f07a476650a1c2fa1d [formerly 21fdc9fdf0b0c7fb25daa53e1710b8c4d21828e5] [formerly 4f763c4d4c9d01f6162337e7e9c6422f37591b4a [formerly 5623ded1f90b4415a440963190d1daf71f9fc33c]] [formerly 07e1e9a446fb2189f7c63d46860df89e3b17247b [formerly febe242f80128a370152f874ba4daefaa1ba112c] [formerly 7e6c2ba8d316ccb366b3ecdf816381c56f2bd8cf [formerly 22172b003f3e9b2053976982fe92f839315cbc84]]] [formerly f00294c5aa0466b35d47e65e074e47f79b5b5371 [formerly 2f6b5bf3414a750bf3e3023cd95ed2971a78f503] [formerly b893578a6d34e4a540008c3fb5a0d9db48966e51 [formerly 0f30b578c46fccea4a158bdcd555b8fe56b9992e]] [formerly dbda257930347aa953e7283428a0e33c1faae40e [formerly 3195dd4d1b73f1392fe7cd4aa02b7b3f9fd7fa15] [formerly 588f4a1274069c8183a60b2a833a573b780ea7e5 [formerly 42517b31b7b9e1872c80098d3083c384a7ea050f]]]] [formerly ea2c11d3c2d8cff68dfd668827544d96f3caf0c1 [formerly bb37d1e8b5b6082c4693d23a055dda9d96b136a2] [formerly 8407f2ed5ca79bc89e9bb043e295273afaa54de1 [formerly b319e8fb7435a8a8406803e6de284f633ed1c4be]] [formerly 4741fc5b10cca9edad245c046f925a79d2bb5854 [formerly 8701b6ebfb242bf4415dac9638f19c7d6f298127] [formerly 2c1e0cd26843ed6ed680abfb77672a8adc5a96a1 [formerly 23d8ae15f22dd371af73e26262b39948b4abbb0e]]] [formerly 0c9ecc8d4ee616d42801883c5e00b8d667186646 [formerly dc002a700f5271c4d867753d723867373ec26f02] [formerly 7147d97cbb19b3c75f4ba3a94bea69aa97a661c7 [formerly c47ff75a02648430e03347b766a85c5729d07be0]] [formerly bf6a097ff3ab462efe62f87c8d23ac6ee81dd713 [formerly 81b04b4f4b4c7f7f06787a10a8fbc34a573a649d] [formerly eb1ce127ee9bdc04c7f8dec2f9790653311e6020]]]] Former-commit-id: 4053f550f34537260285d0667ec11a33df0bcdb5 [formerly ce1c6ed88b00dd8ae4b5f6f98f3bf681105ab57e] [formerly 8ccd6a1e2ce2c47dd1ae0937439ea584348231c4 [formerly 0a551d048dc1b5f7b0673e72490de62b221dd05b]] [formerly 57dba6d093da3d54b1e6a1f8ed98d45c54fe1b0e [formerly d7fb5c06b6275e7c2685d7b1532b2d1f9f8b8892] [formerly 410bf93baeb6e2e2da592e63c8bd0256adb7bf27 [formerly feb3a1cf8e9293621accb878bce7c26cb0b23866]]] [formerly f283cd96213241ec4dd3d9744209aabf6dbfbf6d [formerly 796b8d0fcdc979824cdd6c1efab7f7d4635fce9e] [formerly 9e57aad65de16f57a6da663f63b2e09a3ee27931 [formerly 6460b71277be65f6883840a2c5ae45739011512a]] [formerly e3b6d69e00fbfb2da3dcc06cb49f425c6d6176d2 [formerly a9086944fd4e47cef794b0775b57b7087e793934] [formerly 3e49257f0befd771631c3b64b45a94ce8b97f9c4 [formerly f420b0c0f42dc633da6cbef1fd2bdf16a676964e]]]] Former-commit-id: 75f2277b9cef6b2f935e0c94ac1a212be770abab [formerly 3347ba66322d49f2a3eb52521ec533e0a6e77220] [formerly 1b7191daf153fe920e8abe87feadb80dff06d6e5 [formerly a31cda40e21b02b4cbc71a8326ca26510e42de22]] [formerly edb6e56cbf3a6f6cce7b23b6e4bfa40a1bc5f7c4 [formerly 935752d70542f88eaa27d1996c7e158224313ef1] [formerly 55033c663d3d8ae320b0fac656f24fe90e086220 [formerly 4d4d57a6a72aa79c5316a4fe15e021ba4cb34e95]]] Former-commit-id: 872be1c05892b9c0c72a67e85d15229ad60d7d75 [formerly a6b17cdd101266e8559935d73f0e74df811755c5] [formerly f406d843b575e9a2a6b7d0d9fada84988f322017 [formerly f0a48f8ceb57ff873dd84ad48ac71c88b73c10f2]] Former-commit-id: 3a4ff971b360d32e465ed56e6b6ca7a7a198a7e0 [formerly 1fee01220f8bff3a8457ab460e5b26a2b417de26] Former-commit-id: 386e07f20a9125c458ee3d44e1d6218646525169 --- examples/run_automl.py | 3 ++- tods/searcher/search/brute_force_search.py | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/run_automl.py b/examples/run_automl.py index a144f31..dd54b7c 100644 --- a/examples/run_automl.py +++ b/examples/run_automl.py @@ -13,6 +13,7 @@ table_path = 'datasets/yahoo_sub_5.csv' target_index = 6 # what column is the target #table_path = 'datasets/NAB/realTweets/labeled_Twitter_volume_IBM.csv' # The path of the dataset time_limit = 30 # How many seconds you wanna search + #metric = 'F1' # F1 on label 1 metric = 'F1_MACRO' # F1 on both label 0 and 1 @@ -21,7 +22,7 @@ df = pd.read_csv(table_path) dataset, problem_description = generate_dataset_problem(df, target_index=target_index, metric=metric) # Start backend -backend = SimpleRunner(random_seed=0) +backend = SimpleRunner(random_seed=42) # Start search algorithm search = BruteForceSearch(problem_description=problem_description, backend=backend) diff --git a/tods/searcher/search/brute_force_search.py b/tods/searcher/search/brute_force_search.py index ac875e1..b5db6ec 100644 --- a/tods/searcher/search/brute_force_search.py +++ b/tods/searcher/search/brute_force_search.py @@ -148,7 +148,8 @@ primitive_python_paths = { #'d3m.primitives.tods.detection_algorithm.KDiscordODetector', #'d3m.primitives.tods.detection_algorithm.deeplog', #'d3m.primitives.tods.detection_algorithm.telemanom', - ] + ], + 'contamination': [0.01, 0.02, 0.05, 0.07, 0.1, 0.15, 0.2], } @@ -233,6 +234,7 @@ def _generate_pipline(combinations): tods_step_6= PrimitiveStep(primitive=index.get_primitive(combination[2])) tods_step_6.add_argument(name='inputs', argument_type=ArgumentType.CONTAINER, data_reference='steps.5.produce') tods_step_6.add_output('produce') + tods_step_6.add_hyperparameter(name='contamination', argument_type=ArgumentType.VALUE, data=combination[3]) pipeline_description.add_step(tods_step_6) #tods_step_7 = PrimitiveStep(primitive=index.get_primitive(combination[3])) @@ -267,7 +269,7 @@ def _generate_pipelines(primitive_python_paths, cpu_count=40): import multiprocessing as mp #components = ['data_processing', 'timeseries_processing', 'feature_analysis', 'detection_algorithm'] - components = ['timeseries_processing', 'feature_analysis', 'detection_algorithm'] + components = ['timeseries_processing', 'feature_analysis', 'detection_algorithm', 'contamination'] combinations = itertools.product(*(primitive_python_paths[k] for k in components))