diff --git a/sdmetrics/column_pairs/__init__.py b/sdmetrics/column_pairs/__init__.py index e44e35de..38f1aebe 100644 --- a/sdmetrics/column_pairs/__init__.py +++ b/sdmetrics/column_pairs/__init__.py @@ -11,6 +11,8 @@ DiscreteKLDivergence, ) from sdmetrics.column_pairs.statistical.referential_integrity import ReferentialIntegrity +from sdmetrics.column_pairs.statistical.inter_row_msas import InterRowMSAS +from sdmetrics.column_pairs.statistical.statistic_msas import StatisticMSAS __all__ = [ 'CardinalityBoundaryAdherence', @@ -20,4 +22,6 @@ 'CorrelationSimilarity', 'DiscreteKLDivergence', 'ReferentialIntegrity', + 'InterRowMSAS', + 'StatisticMSAS', ] diff --git a/sdmetrics/column_pairs/statistical/__init__.py b/sdmetrics/column_pairs/statistical/__init__.py index 7f921df6..7198944e 100644 --- a/sdmetrics/column_pairs/statistical/__init__.py +++ b/sdmetrics/column_pairs/statistical/__init__.py @@ -10,6 +10,8 @@ DiscreteKLDivergence, ) from sdmetrics.column_pairs.statistical.referential_integrity import ReferentialIntegrity +from sdmetrics.column_pairs.statistical.inter_row_msas import InterRowMSAS +from sdmetrics.column_pairs.statistical.statistic_msas import StatisticMSAS __all__ = [ 'CardinalityBoundaryAdherence', @@ -18,4 +20,6 @@ 'CorrelationSimilarity', 'DiscreteKLDivergence', 'ReferentialIntegrity', + 'InterRowMSAS', + 'StatisticMSAS', ] diff --git a/sdmetrics/timeseries/inter_row_msas.py b/sdmetrics/column_pairs/statistical/inter_row_msas.py similarity index 100% rename from sdmetrics/timeseries/inter_row_msas.py rename to sdmetrics/column_pairs/statistical/inter_row_msas.py diff --git a/sdmetrics/timeseries/statistic_msas.py b/sdmetrics/column_pairs/statistical/statistic_msas.py similarity index 100% rename from sdmetrics/timeseries/statistic_msas.py rename to sdmetrics/column_pairs/statistical/statistic_msas.py diff --git a/sdmetrics/single_column/__init__.py b/sdmetrics/single_column/__init__.py index 563ea574..fdd9d9f1 100644 --- a/sdmetrics/single_column/__init__.py +++ b/sdmetrics/single_column/__init__.py @@ -12,6 +12,7 @@ from sdmetrics.single_column.statistical.range_coverage import RangeCoverage from sdmetrics.single_column.statistical.statistic_similarity import StatisticSimilarity from sdmetrics.single_column.statistical.tv_complement import TVComplement +from sdmetrics.single_column.statistical.sequence_length_similarity import SequenceLengthSimilarity __all__ = [ 'base', @@ -26,4 +27,5 @@ 'RangeCoverage', 'StatisticSimilarity', 'TVComplement', + 'SequenceLengthSimilarity', ] diff --git a/sdmetrics/single_column/statistical/__init__.py b/sdmetrics/single_column/statistical/__init__.py index 252cd6ac..228a456b 100644 --- a/sdmetrics/single_column/statistical/__init__.py +++ b/sdmetrics/single_column/statistical/__init__.py @@ -10,6 +10,7 @@ from sdmetrics.single_column.statistical.range_coverage import RangeCoverage from sdmetrics.single_column.statistical.statistic_similarity import StatisticSimilarity from sdmetrics.single_column.statistical.tv_complement import TVComplement +from sdmetrics.single_column.statistical.sequence_length_similarity import SequenceLengthSimilarity __all__ = [ 'BoundaryAdherence', @@ -22,4 +23,5 @@ 'RangeCoverage', 'StatisticSimilarity', 'TVComplement', + 'SequenceLengthSimilarity', ] diff --git a/sdmetrics/timeseries/sequence_length_similarity.py b/sdmetrics/single_column/statistical/sequence_length_similarity.py similarity index 100% rename from sdmetrics/timeseries/sequence_length_similarity.py rename to sdmetrics/single_column/statistical/sequence_length_similarity.py diff --git a/sdmetrics/timeseries/__init__.py b/sdmetrics/timeseries/__init__.py index 06f5e4c8..6a09b529 100644 --- a/sdmetrics/timeseries/__init__.py +++ b/sdmetrics/timeseries/__init__.py @@ -5,9 +5,6 @@ from sdmetrics.timeseries.detection import LSTMDetection, TimeSeriesDetectionMetric from sdmetrics.timeseries.efficacy import TimeSeriesEfficacyMetric from sdmetrics.timeseries.efficacy.classification import LSTMClassifierEfficacy -from sdmetrics.timeseries.inter_row_msas import InterRowMSAS -from sdmetrics.timeseries.sequence_length_similarity import SequenceLengthSimilarity -from sdmetrics.timeseries.statistic_msas import StatisticMSAS __all__ = [ 'base', @@ -19,7 +16,4 @@ 'LSTMDetection', 'TimeSeriesEfficacyMetric', 'LSTMClassifierEfficacy', - 'InterRowMSAS', - 'SequenceLengthSimilarity', - 'StatisticMSAS', ] diff --git a/tests/unit/timeseries/test_inter_row_msas.py b/tests/unit/column_pairs/statistical/test_inter_row_msas.py similarity index 99% rename from tests/unit/timeseries/test_inter_row_msas.py rename to tests/unit/column_pairs/statistical/test_inter_row_msas.py index 14101079..9a3552db 100644 --- a/tests/unit/timeseries/test_inter_row_msas.py +++ b/tests/unit/column_pairs/statistical/test_inter_row_msas.py @@ -1,7 +1,7 @@ import pandas as pd import pytest -from sdmetrics.timeseries.inter_row_msas import InterRowMSAS +from sdmetrics.column_pairs import InterRowMSAS class TestInterRowMSAS: diff --git a/tests/unit/timeseries/test_statistic_msas.py b/tests/unit/column_pairs/statistical/test_statistic_msas.py similarity index 98% rename from tests/unit/timeseries/test_statistic_msas.py rename to tests/unit/column_pairs/statistical/test_statistic_msas.py index f44812ec..9e8813eb 100644 --- a/tests/unit/timeseries/test_statistic_msas.py +++ b/tests/unit/column_pairs/statistical/test_statistic_msas.py @@ -3,7 +3,7 @@ import pandas as pd import pytest -from sdmetrics.timeseries import StatisticMSAS +from sdmetrics.column_pairs import StatisticMSAS class TestStatisticMSAS: diff --git a/tests/unit/timeseries/test_sequence_length_similarity.py b/tests/unit/single_column/statistical/test_sequence_length_similarity.py similarity index 93% rename from tests/unit/timeseries/test_sequence_length_similarity.py rename to tests/unit/single_column/statistical/test_sequence_length_similarity.py index 903b3b91..4e27ab98 100644 --- a/tests/unit/timeseries/test_sequence_length_similarity.py +++ b/tests/unit/single_column/statistical/test_sequence_length_similarity.py @@ -1,6 +1,6 @@ import pandas as pd -from sdmetrics.timeseries.sequence_length_similarity import SequenceLengthSimilarity +from sdmetrics.single_column import SequenceLengthSimilarity class TestSequenceLengthSimilarity: