From bfff12480ddce09cd21c2c7899487e75e775ac5c Mon Sep 17 00:00:00 2001 From: lhenry15 Date: Sun, 20 Sep 2020 22:58:37 -0500 Subject: [PATCH] revise path for some unittests Former-commit-id: 3400d9c02e90ee918abd5a57a454dda31fa5e997 [formerly 19098f66f94e2eb5219116bb57d7c2834b1bde4e] [formerly b8251014ec392c66d775c4c22e3acb33329935b8 [formerly 02d16093ce4d56217c18b8a6f3b032744e4df071]] [formerly 0b252fd53566d69467723bb119287b86910c6377 [formerly 8f3ed67cef4bb20b063b6e37fcb065912b657bd0] [formerly 6f70bb4d13cfcebec58145e633380d207d6a2722 [formerly a30c587c9332fa5dee859e451107ba5b30c7c9c3]]] [formerly 2404c8ed5124cae36aa57dc52834635c0239dbd2 [formerly 91190d3633990207218d076d139832c5b1bc6115] [formerly 2e7ba30b33d29836997a476860bd7b6e00eaf69b [formerly 0ce712bda69431e2f01c004da389764cde60a0f3]] [formerly d7c0b515f6f0ddcc48bf522ae937d7fbd7034396 [formerly 3661ed9b65436ff59b425ff43529d0986b0ca391] [formerly 905600ec7a1ad6c52a5df99d0db33130c956ff5d [formerly 774a9216488b5c0625c130ef316914bdb99fbfce]]]] [formerly df6a89deeb481ac2b3cafccdce0ec528392c3728 [formerly 83ed0e5da5b64192e46ae8561acbea279071f6f7] [formerly ffb22a18b5894b15da6dd3e598893380172d111a [formerly 47fbf33225e8141364f7b0cddb5befd63ed448c8]] [formerly c9cc728e80dce86577b26bd0e3daaa5f4bed89c1 [formerly 11329d5dde4f9529fed71bdd613d0337f7056d64] [formerly fb9e44b506f32691c4bc3b0c1271c4d6cbdcfcd9 [formerly 8baff6be8478ace9fb22139b90c3829d1df9d009]]] [formerly 2e1d6c4a46b7f60dfca02a55013d5f95e10a1889 [formerly 98f75b94fa27cedaae0b543166e2e77b9a8011fc] [formerly b3673ac35a314f84dd64aa90869c6d29c08c8c20 [formerly e462deb3ab3c40566fbad8724422f96cc781a80a]] [formerly 8fd0cd57f31ed2b75fbfa389c0959e59a53fc3a6 [formerly cdbcd9c3ada6e1c632e1481c327dc452d14f4687] [formerly 2ba7d3d02200f02aca5394f9d5106a5df0453791 [formerly a507b513fec28d8eaf1f072891562c0f4d8850cb]]]]] [formerly 71c47ab06b05035ae516bdc65652bdf272cfacfc [formerly 640adb3f565aa754cc117527c9e7b5c2648619f5] [formerly c9bbaba428db4acadb49a4bdbc6a0fc98af50839 [formerly 3d41f2219b4c8d2074d2f29c4c4c4242cf04122b]] [formerly e69aec9a45792811f7be79afc9bec4f9986ead63 [formerly 7268f837af1311f1d3c7d3686f5e02b075de7ea4] [formerly 911c56ac5f80870125a0ae5a4b1fca94da6a76d4 [formerly 83dcb440a837b95036bc3b02ef262e04e8bd3d88]]] [formerly 219b339643e08895e5ee9024b6069c34b31da363 [formerly 9311559a5989e52d461cefdc035d1004c046dbcb] [formerly 16d4836e18df47496054d9ddd38c96fa4749e872 [formerly 8b2be6636ee93a837e6194c922bc03973fdc2a9c]] [formerly 4db2c0d4c16b663dfb81b90b087b3a60f42ea51f [formerly 25c913b7465f7873a55909b8395f106f0ac893fb] [formerly dcac4bcfdb8f653061925c676f478100aa03b283 [formerly 750938ee92a218b1ac6e37c7e102602d5f98eb85]]]] [formerly 468d8b4a785d41f2ba44874f64dbe0597d7f565e [formerly 72e20a4f731cbc6b36dfffaacedcfe9db6598b36] [formerly 7bfe137392e5eb13953f8f4b100d9f80376e5377 [formerly 87e7633d1281e948f2466d7ac859414e056f5b45]] [formerly 96bfada6c4fa13793b087dcbbe250a51b9f04ba2 [formerly 43cb364f74f502f0f3dcf851243dc4ec1ee7d97d] [formerly 139f141cd7da7bb9496e91e6085fb4505546fd59 [formerly ee93a260b36ab07788befcc185e58bf31f3b3235]]] [formerly 79a0bbb9af3eb065e39623acd6476c94c6d53f44 [formerly e29caa02470960b56c4c58f5675ff8167ff292f3] [formerly c90f7664c689fead14a9a0ccef18ad4f5e475c9c [formerly f1472e1f6d88e24b3c6c714ce6c7de5d19d6c385]] [formerly 8a981cdf64db30459bb0ead572128a0f6ad716aa [formerly a1cab46ff3b722f92384cc0e736a528a98b644db] [formerly b87a31e9274a8481b5411fd3a6cbd111466f0417 [formerly 2e6068d5f9188b2f29b7e29173759063438ee7aa]]]]]] Former-commit-id: 9f31223e369ee33541dbe267a38cb427077e5f09 [formerly ba6653cc6eef480f4282949ba1706674c781059c] [formerly 854d7f841346a53042dfee6b6552f0c672e0a4ed [formerly df04da03031b43f322832c451cc44c1ecaa8d053]] [formerly 4a180be0ff866aecf32dbccb4f986f83a381841b [formerly 4b6089934b0ad7ec7584bd0401412ee22ce33235] [formerly f346f93f92fd7cf59275ab916ede864ba6c54f79 [formerly d36fe596458d23631db8e2e17a3a54c130adb3cb]]] [formerly 9f6239366f3d5ad51b2d956a6c61a5fdef977f42 [formerly caff8e1b260090aa207b0fea80456a5fd2155af4] [formerly f14dcd84bbfdc3ee38d2075f2c32342ae466b693 [formerly 53da40dc289108f8f4317dc22b4a791f7c80b8a9]] [formerly 2fefbe8402e82919550af4f5b9e4fc110ecece0b [formerly fc1eb10ebc899f6e906aae4c46e4bdf221a9f993] [formerly e59b28a9b5874603f4b7a049c22231e2748900d0 [formerly e6d65df4fc5649f4d0650b91e4e0dd5925f690b4]]]] [formerly 881169f558351a828cdc2904083dce29c0f66bcd [formerly 677a6a7f02020d5f849427c21dd17d43b4537499] [formerly f654f0ee9975842cbead276d7724a3931ac66e41 [formerly c0423444c61120e1801ae1da91559c57cc3294ae]] [formerly 6d1c46ef97c9d10c2cb87fae30f973613af07681 [formerly e6be398235289a64153a97394ed34fd5170d6bdb] [formerly 6d8324ecc16820d0ddde43aa282e9ddaaa0b221a [formerly 7c75bd54d4251a6879da728a69643973c76287c6]]] [formerly 0a3d3a8ef143bab0891d7254078b7120515a9a66 [formerly 41b04e0062aa486be6b784a9669887813bca9045] [formerly 361c44bec7d0100adb9e51b3f7255074de08ac03 [formerly fd3c47690942ffe12bafc84a3871b607240ca98e]] [formerly 6ae319414d947828520deb48da4f6c299625d781 [formerly 4319d3ecc9b4b963bdd4ea6793b6bd26857319dc] [formerly 76e342cf386297fca9fda6fb70b69e800a69bcb2 [formerly b87a31e9274a8481b5411fd3a6cbd111466f0417]]]]] Former-commit-id: 0ddedc5e85e81f857db12b7388018d15ffba2beb [formerly e71aadcd6a6c64d3fab0e0b0a5b3865dc72de2f4] [formerly 612d7803f890cf67eb8258df4ee141ccb9591afc [formerly d373312c8220b8be6e1107844050c6f440c4f97d]] [formerly 2cd40e62a51c4cce6dc8ddd2e0c2a04353f1880a [formerly 28f39791772ae6f9a43d64576f45d3b926215dd9] [formerly 5f0cab5a312895ed17d3a3ce9b3dee3c61d44f87 [formerly 4fb69e635f2ea8bf6f39148e26d93e350a593879]]] [formerly 09c5e3e68806c7f944c7f016f1c6b62572c1afcf [formerly f7e231fdf9f119eae0680826233a7aa68c57db3c] [formerly 6edf47ad04b766241306c8b3daa2d85994cef3b3 [formerly 4e80a0bfcb4f1e2747f780bb7712c0c3997b57d4]] [formerly 57b1865629e59cc89bbe4f9298d93a28a393ffdc [formerly 9410eac0b5bee06e7bc1c75c040dfe77d649ccd0] [formerly d25be8c329dd996b8bd863504a9a650c7d879cdc [formerly 4c5116deda1ec55b6cc2b967292ff319c7e4a831]]]] Former-commit-id: 7283d18eb0e303b9b986ac438633532d0e3c5d50 [formerly cfcc4e54a6404d65850b92f4afa524d158409b4c] [formerly b72f110944758aab67b1255670bd3f17e90a8c23 [formerly 7667eb6b4195cfa3f1a50cbed2efd57e83580477]] [formerly bb976793ea2e1b21d3414f750319839ffa63758d [formerly 7b3c0755c01527c772177083fce48c723ec0c09b] [formerly d21e3fdd91353d95eacb7312e57d9087308de2f8 [formerly 24c99f2769471cb011a8f5a1437e658e51cd6aeb]]] Former-commit-id: 2a93882734037d0f990c3a7df9aab41d64de8444 [formerly 8319f6514a8ead357d64a659fde37537ec7f225b] [formerly 679fd063ce064d6cc1a0177a28437b63233619c2 [formerly 8df4021d659e119cbdf587ad49b8bba046c0c943]] Former-commit-id: 3be2997cf5b570e032f95c5a261f24a212ba452b [formerly a488f47e93f8578fb7a5fb6c219773ce413bb253] Former-commit-id: 5f49103a4a14d7f9caf892126ae31e94d70699eb --- tods/tests/test_AutoRegODetect.py | 2 +- tods/tests/test_BKFilter.py | 2 +- tods/tests/test_CategoricalBinary.py | 2 +- tods/tests/test_ColumnFilter.py | 2 +- tods/tests/test_ContinuityValidation.py | 2 +- tods/tests/test_DeepLog.py | 2 +- tods/tests/test_DiscreteCosineTransform.py | 3 +-- tods/tests/test_DuplicationValidation.py | 2 +- tods/tests/test_FastFourierTransform.py | 3 +-- tods/tests/test_HPFilter.py | 2 +- 10 files changed, 10 insertions(+), 12 deletions(-) diff --git a/tods/tests/test_AutoRegODetect.py b/tods/tests/test_AutoRegODetect.py index 8381bfe..a4ca5b8 100644 --- a/tods/tests/test_AutoRegODetect.py +++ b/tods/tests/test_AutoRegODetect.py @@ -7,7 +7,7 @@ from d3m.container import DataFrame as d3m_dataframe from detection_algorithm.AutoRegODetect import AutoRegODetector from pyod.utils.data import generate_data -from detection_algorithm.core.CollectiveCommonTest import CollectiveCommonTest +from tods.detection_algorithm.core.CollectiveCommonTest import CollectiveCommonTest import numpy as np diff --git a/tods/tests/test_BKFilter.py b/tods/tests/test_BKFilter.py index b167aea..3e62eec 100755 --- a/tods/tests/test_BKFilter.py +++ b/tods/tests/test_BKFilter.py @@ -2,7 +2,7 @@ import unittest from d3m import container, utils from d3m.metadata import base as metadata_base -from feature_analysis import BKFilter +from tods.feature_analysis import BKFilter class BKFilterTest(unittest.TestCase): diff --git a/tods/tests/test_CategoricalBinary.py b/tods/tests/test_CategoricalBinary.py index 40fb003..a574ae1 100644 --- a/tods/tests/test_CategoricalBinary.py +++ b/tods/tests/test_CategoricalBinary.py @@ -3,7 +3,7 @@ import unittest from d3m import container, utils from d3m.metadata import base as metadata_base -from data_processing import CategoricalToBinary +from tods.data_processing import CategoricalToBinary import numpy as np import pandas as pd import utils as test_utils diff --git a/tods/tests/test_ColumnFilter.py b/tods/tests/test_ColumnFilter.py index 843b3be..1c04c97 100644 --- a/tods/tests/test_ColumnFilter.py +++ b/tods/tests/test_ColumnFilter.py @@ -2,7 +2,7 @@ import unittest from d3m import container, utils from d3m.metadata import base as metadata_base -from data_processing import ColumnFilter +from tods.data_processing import ColumnFilter class ColumnFilterTest(unittest.TestCase): diff --git a/tods/tests/test_ContinuityValidation.py b/tods/tests/test_ContinuityValidation.py index 6169f79..185bd4c 100644 --- a/tods/tests/test_ContinuityValidation.py +++ b/tods/tests/test_ContinuityValidation.py @@ -2,7 +2,7 @@ import unittest from d3m import container, utils from d3m.metadata import base as metadata_base -from data_processing import ContinuityValidation +from tods.data_processing import ContinuityValidation class ContinuityValidationTest(unittest.TestCase): diff --git a/tods/tests/test_DeepLog.py b/tods/tests/test_DeepLog.py index 01e549a..7845ad4 100644 --- a/tods/tests/test_DeepLog.py +++ b/tods/tests/test_DeepLog.py @@ -2,7 +2,7 @@ import unittest from d3m import container, utils from d3m.metadata import base as metadata_base -from detection_algorithm.DeepLog import DeepLogPrimitive +from tods.detection_algorithm.DeepLog import DeepLogPrimitive diff --git a/tods/tests/test_DiscreteCosineTransform.py b/tods/tests/test_DiscreteCosineTransform.py index 1443bc8..7400550 100644 --- a/tods/tests/test_DiscreteCosineTransform.py +++ b/tods/tests/test_DiscreteCosineTransform.py @@ -1,8 +1,7 @@ from d3m import container,utils from d3m.metadata import base as metadata_base import unittest -from feature_analysis import DiscreteCosineTransform -from common_primitives import dataset_to_dataframe +from tods.feature_analysis import DiscreteCosineTransform import utils as test_utils import os diff --git a/tods/tests/test_DuplicationValidation.py b/tods/tests/test_DuplicationValidation.py index b9a9bcb..6c85cfb 100644 --- a/tods/tests/test_DuplicationValidation.py +++ b/tods/tests/test_DuplicationValidation.py @@ -2,7 +2,7 @@ import unittest from d3m import container, utils from d3m.metadata import base as metadata_base -from data_processing import DuplicationValidation +from tods.data_processing import DuplicationValidation class DuplicationValidationTest(unittest.TestCase): diff --git a/tods/tests/test_FastFourierTransform.py b/tods/tests/test_FastFourierTransform.py index 76e3846..6af4b18 100644 --- a/tods/tests/test_FastFourierTransform.py +++ b/tods/tests/test_FastFourierTransform.py @@ -1,8 +1,7 @@ from d3m import container,utils from d3m.metadata import base as metadata_base import unittest -from feature_analysis import FastFourierTransform -from common_primitives import dataset_to_dataframe +from tods.feature_analysis import FastFourierTransform import utils as test_utils import os diff --git a/tods/tests/test_HPFilter.py b/tods/tests/test_HPFilter.py index 07945d9..ea97999 100644 --- a/tods/tests/test_HPFilter.py +++ b/tods/tests/test_HPFilter.py @@ -2,7 +2,7 @@ import unittest from d3m import container, utils from d3m.metadata import base as metadata_base -from feature_analysis import HPFilter +from tods.feature_analysis import HPFilter class HPFilterTest(unittest.TestCase):