diff --git a/src/python/nimbusml.pyproj b/src/python/nimbusml.pyproj index 9c09758d..acd5a6c6 100644 --- a/src/python/nimbusml.pyproj +++ b/src/python/nimbusml.pyproj @@ -232,11 +232,11 @@ - - - - - + + + + + @@ -584,16 +584,16 @@ - - - - - - - - - - + + + + + + + + + + @@ -766,7 +766,7 @@ - + @@ -788,7 +788,7 @@ - + @@ -805,7 +805,7 @@ - + diff --git a/src/python/nimbusml/examples/IidChangePointDetector.py b/src/python/nimbusml/examples/IidChangePointDetector.py index d8f9f4d8..d9b4fdb1 100644 --- a/src/python/nimbusml/examples/IidChangePointDetector.py +++ b/src/python/nimbusml/examples/IidChangePointDetector.py @@ -2,7 +2,7 @@ # IidChangePointDetector from nimbusml import Pipeline, FileDataStream from nimbusml.datasets import get_dataset -from nimbusml.time_series import IidChangePointDetector +from nimbusml.timeseries import IidChangePointDetector # data input (as a FileDataStream) path = get_dataset('timeseries').as_filepath() diff --git a/src/python/nimbusml/examples/IidSpikeDetector.py b/src/python/nimbusml/examples/IidSpikeDetector.py index 6876375f..f21e138e 100644 --- a/src/python/nimbusml/examples/IidSpikeDetector.py +++ b/src/python/nimbusml/examples/IidSpikeDetector.py @@ -2,7 +2,7 @@ # IidSpikeDetector from nimbusml import Pipeline, FileDataStream from nimbusml.datasets import get_dataset -from nimbusml.time_series import IidSpikeDetector +from nimbusml.timeseries import IidSpikeDetector # data input (as a FileDataStream) path = get_dataset('timeseries').as_filepath() diff --git a/src/python/nimbusml/examples/SsaChangePointDetector.py b/src/python/nimbusml/examples/SsaChangePointDetector.py index e797bc30..2f002135 100644 --- a/src/python/nimbusml/examples/SsaChangePointDetector.py +++ b/src/python/nimbusml/examples/SsaChangePointDetector.py @@ -2,7 +2,7 @@ # SsaChangePointDetector from nimbusml import Pipeline, FileDataStream from nimbusml.datasets import get_dataset -from nimbusml.time_series import SsaChangePointDetector +from nimbusml.timeseries import SsaChangePointDetector # data input (as a FileDataStream) path = get_dataset('timeseries').as_filepath() diff --git a/src/python/nimbusml/examples/SsaSpikeDetector.py b/src/python/nimbusml/examples/SsaSpikeDetector.py index 819f8bc2..299c4475 100644 --- a/src/python/nimbusml/examples/SsaSpikeDetector.py +++ b/src/python/nimbusml/examples/SsaSpikeDetector.py @@ -2,7 +2,7 @@ # SsaSpikeDetector from nimbusml import Pipeline, FileDataStream from nimbusml.datasets import get_dataset -from nimbusml.time_series import SsaSpikeDetector +from nimbusml.timeseries import SsaSpikeDetector # data input (as a FileDataStream) path = get_dataset('timeseries').as_filepath() diff --git a/src/python/nimbusml/examples/examples_from_dataframe/IidChangePointDetector_df.py b/src/python/nimbusml/examples/examples_from_dataframe/IidChangePointDetector_df.py index 2401f118..00d19531 100644 --- a/src/python/nimbusml/examples/examples_from_dataframe/IidChangePointDetector_df.py +++ b/src/python/nimbusml/examples/examples_from_dataframe/IidChangePointDetector_df.py @@ -1,7 +1,7 @@ ############################################################################### # IidChangePointDetector import pandas as pd -from nimbusml.time_series import IidChangePointDetector +from nimbusml.timeseries import IidChangePointDetector # Create a sample series with a change input_data = [5, 5, 5, 5, 5, 5, 5, 5] diff --git a/src/python/nimbusml/examples/examples_from_dataframe/IidSpikeDetector_df.py b/src/python/nimbusml/examples/examples_from_dataframe/IidSpikeDetector_df.py index 4f6718e6..93ab346d 100644 --- a/src/python/nimbusml/examples/examples_from_dataframe/IidSpikeDetector_df.py +++ b/src/python/nimbusml/examples/examples_from_dataframe/IidSpikeDetector_df.py @@ -1,7 +1,7 @@ ############################################################################### # IidSpikeDetector import pandas as pd -from nimbusml.time_series import IidSpikeDetector +from nimbusml.timeseries import IidSpikeDetector X_train = pd.Series([5, 5, 5, 5, 5, 10, 5, 5, 5, 5, 5], name="ts") diff --git a/src/python/nimbusml/examples/examples_from_dataframe/SsaChangePointDetector_df.py b/src/python/nimbusml/examples/examples_from_dataframe/SsaChangePointDetector_df.py index 152bb7cf..9bea570e 100644 --- a/src/python/nimbusml/examples/examples_from_dataframe/SsaChangePointDetector_df.py +++ b/src/python/nimbusml/examples/examples_from_dataframe/SsaChangePointDetector_df.py @@ -2,7 +2,7 @@ # SsaChangePointDetector import numpy as np import pandas as pd -from nimbusml.time_series import SsaChangePointDetector +from nimbusml.timeseries import SsaChangePointDetector # This example creates a time series (list of data with the # i-th element corresponding to the i-th time slot). diff --git a/src/python/nimbusml/examples/examples_from_dataframe/SsaSpikeDetector_df.py b/src/python/nimbusml/examples/examples_from_dataframe/SsaSpikeDetector_df.py index 0e0196a0..d1297d09 100644 --- a/src/python/nimbusml/examples/examples_from_dataframe/SsaSpikeDetector_df.py +++ b/src/python/nimbusml/examples/examples_from_dataframe/SsaSpikeDetector_df.py @@ -2,7 +2,7 @@ # SsaSpikeDetector import numpy as np import pandas as pd -from nimbusml.time_series import SsaSpikeDetector +from nimbusml.timeseries import SsaSpikeDetector # This example creates a time series (list of data with the # i-th element corresponding to the i-th time slot). diff --git a/src/python/nimbusml/internal/core/time_series/__init__.py b/src/python/nimbusml/internal/core/timeseries/__init__.py similarity index 100% rename from src/python/nimbusml/internal/core/time_series/__init__.py rename to src/python/nimbusml/internal/core/timeseries/__init__.py diff --git a/src/python/nimbusml/internal/core/time_series/iidchangepointdetector.py b/src/python/nimbusml/internal/core/timeseries/iidchangepointdetector.py similarity index 100% rename from src/python/nimbusml/internal/core/time_series/iidchangepointdetector.py rename to src/python/nimbusml/internal/core/timeseries/iidchangepointdetector.py diff --git a/src/python/nimbusml/internal/core/time_series/iidspikedetector.py b/src/python/nimbusml/internal/core/timeseries/iidspikedetector.py similarity index 100% rename from src/python/nimbusml/internal/core/time_series/iidspikedetector.py rename to src/python/nimbusml/internal/core/timeseries/iidspikedetector.py diff --git a/src/python/nimbusml/internal/core/time_series/ssachangepointdetector.py b/src/python/nimbusml/internal/core/timeseries/ssachangepointdetector.py similarity index 100% rename from src/python/nimbusml/internal/core/time_series/ssachangepointdetector.py rename to src/python/nimbusml/internal/core/timeseries/ssachangepointdetector.py diff --git a/src/python/nimbusml/internal/core/time_series/ssaspikedetector.py b/src/python/nimbusml/internal/core/timeseries/ssaspikedetector.py similarity index 100% rename from src/python/nimbusml/internal/core/time_series/ssaspikedetector.py rename to src/python/nimbusml/internal/core/timeseries/ssaspikedetector.py diff --git a/src/python/nimbusml/tests/time_series/__init__.py b/src/python/nimbusml/tests/timeseries/__init__.py similarity index 100% rename from src/python/nimbusml/tests/time_series/__init__.py rename to src/python/nimbusml/tests/timeseries/__init__.py diff --git a/src/python/nimbusml/tests/time_series/test_iidchangepointdetector.py b/src/python/nimbusml/tests/timeseries/test_iidchangepointdetector.py similarity index 96% rename from src/python/nimbusml/tests/time_series/test_iidchangepointdetector.py rename to src/python/nimbusml/tests/timeseries/test_iidchangepointdetector.py index dd1dd45f..e15863d1 100644 --- a/src/python/nimbusml/tests/time_series/test_iidchangepointdetector.py +++ b/src/python/nimbusml/tests/timeseries/test_iidchangepointdetector.py @@ -8,7 +8,7 @@ import pandas as pd from nimbusml import Pipeline, FileDataStream from nimbusml.datasets import get_dataset -from nimbusml.time_series import IidChangePointDetector +from nimbusml.timeseries import IidChangePointDetector class TestIidChangePointDetector(unittest.TestCase): diff --git a/src/python/nimbusml/tests/time_series/test_iidspikedetector.py b/src/python/nimbusml/tests/timeseries/test_iidspikedetector.py similarity index 97% rename from src/python/nimbusml/tests/time_series/test_iidspikedetector.py rename to src/python/nimbusml/tests/timeseries/test_iidspikedetector.py index 5b54fc18..61a105f8 100644 --- a/src/python/nimbusml/tests/time_series/test_iidspikedetector.py +++ b/src/python/nimbusml/tests/timeseries/test_iidspikedetector.py @@ -8,7 +8,7 @@ import pandas as pd from nimbusml import Pipeline, FileDataStream from nimbusml.datasets import get_dataset -from nimbusml.time_series import IidSpikeDetector +from nimbusml.timeseries import IidSpikeDetector from nimbusml.preprocessing.schema import TypeConverter diff --git a/src/python/nimbusml/tests/time_series/test_ssachangepointdetector.py b/src/python/nimbusml/tests/timeseries/test_ssachangepointdetector.py similarity index 97% rename from src/python/nimbusml/tests/time_series/test_ssachangepointdetector.py rename to src/python/nimbusml/tests/timeseries/test_ssachangepointdetector.py index b115396a..d3ad27ef 100644 --- a/src/python/nimbusml/tests/time_series/test_ssachangepointdetector.py +++ b/src/python/nimbusml/tests/timeseries/test_ssachangepointdetector.py @@ -9,7 +9,7 @@ import pandas as pd from nimbusml import Pipeline, FileDataStream from nimbusml.datasets import get_dataset -from nimbusml.time_series import SsaChangePointDetector +from nimbusml.timeseries import SsaChangePointDetector class TestSsaChangePointDetector(unittest.TestCase): diff --git a/src/python/nimbusml/tests/time_series/test_ssaspikedetector.py b/src/python/nimbusml/tests/timeseries/test_ssaspikedetector.py similarity index 97% rename from src/python/nimbusml/tests/time_series/test_ssaspikedetector.py rename to src/python/nimbusml/tests/timeseries/test_ssaspikedetector.py index 3645860b..74610661 100644 --- a/src/python/nimbusml/tests/time_series/test_ssaspikedetector.py +++ b/src/python/nimbusml/tests/timeseries/test_ssaspikedetector.py @@ -9,7 +9,7 @@ import pandas as pd from nimbusml import Pipeline, FileDataStream from nimbusml.datasets import get_dataset -from nimbusml.time_series import SsaSpikeDetector +from nimbusml.timeseries import SsaSpikeDetector class TestSsaSpikeDetector(unittest.TestCase): diff --git a/src/python/nimbusml/time_series/__init__.py b/src/python/nimbusml/timeseries/__init__.py similarity index 100% rename from src/python/nimbusml/time_series/__init__.py rename to src/python/nimbusml/timeseries/__init__.py diff --git a/src/python/nimbusml/time_series/iidchangepointdetector.py b/src/python/nimbusml/timeseries/iidchangepointdetector.py similarity index 98% rename from src/python/nimbusml/time_series/iidchangepointdetector.py rename to src/python/nimbusml/timeseries/iidchangepointdetector.py index 24d6c101..4e59a134 100644 --- a/src/python/nimbusml/time_series/iidchangepointdetector.py +++ b/src/python/nimbusml/timeseries/iidchangepointdetector.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.time_series.iidchangepointdetector import \ +from ..internal.core.timeseries.iidchangepointdetector import \ IidChangePointDetector as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/time_series/iidspikedetector.py b/src/python/nimbusml/timeseries/iidspikedetector.py similarity index 98% rename from src/python/nimbusml/time_series/iidspikedetector.py rename to src/python/nimbusml/timeseries/iidspikedetector.py index 7f570003..5b9782c9 100644 --- a/src/python/nimbusml/time_series/iidspikedetector.py +++ b/src/python/nimbusml/timeseries/iidspikedetector.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.time_series.iidspikedetector import \ +from ..internal.core.timeseries.iidspikedetector import \ IidSpikeDetector as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/time_series/ssachangepointdetector.py b/src/python/nimbusml/timeseries/ssachangepointdetector.py similarity index 98% rename from src/python/nimbusml/time_series/ssachangepointdetector.py rename to src/python/nimbusml/timeseries/ssachangepointdetector.py index adf7f9a8..2ed43bc4 100644 --- a/src/python/nimbusml/time_series/ssachangepointdetector.py +++ b/src/python/nimbusml/timeseries/ssachangepointdetector.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.time_series.ssachangepointdetector import \ +from ..internal.core.timeseries.ssachangepointdetector import \ SsaChangePointDetector as core from ..internal.utils.utils import trace diff --git a/src/python/nimbusml/time_series/ssaspikedetector.py b/src/python/nimbusml/timeseries/ssaspikedetector.py similarity index 98% rename from src/python/nimbusml/time_series/ssaspikedetector.py rename to src/python/nimbusml/timeseries/ssaspikedetector.py index d57cc4ad..1e816bd1 100644 --- a/src/python/nimbusml/time_series/ssaspikedetector.py +++ b/src/python/nimbusml/timeseries/ssaspikedetector.py @@ -13,7 +13,7 @@ from sklearn.base import TransformerMixin from ..base_transform import BaseTransform -from ..internal.core.time_series.ssaspikedetector import \ +from ..internal.core.timeseries.ssaspikedetector import \ SsaSpikeDetector as core from ..internal.utils.utils import trace diff --git a/src/python/tests/test_estimator_checks.py b/src/python/tests/test_estimator_checks.py index cf1a358b..5dac16f5 100644 --- a/src/python/tests/test_estimator_checks.py +++ b/src/python/tests/test_estimator_checks.py @@ -16,8 +16,8 @@ from nimbusml.internal.entrypoints._ngramextractor_ngram import n_gram from nimbusml.preprocessing import TensorFlowScorer from nimbusml.preprocessing.filter import SkipFilter, TakeFilter -from nimbusml.time_series import (IidSpikeDetector, IidChangePointDetector, - SsaSpikeDetector, SsaChangePointDetector) +from nimbusml.timeseries import (IidSpikeDetector, IidChangePointDetector, + SsaSpikeDetector, SsaChangePointDetector) from sklearn.utils.estimator_checks import _yield_all_checks, MULTI_OUTPUT this = os.path.abspath(os.path.dirname(__file__)) diff --git a/src/python/tools/manifest_diff.json b/src/python/tools/manifest_diff.json index 6c96eb5c..25708e21 100644 --- a/src/python/tools/manifest_diff.json +++ b/src/python/tools/manifest_diff.json @@ -542,25 +542,25 @@ { "Name": "TimeSeriesProcessingEntryPoints.IidSpikeDetector", "NewName": "IidSpikeDetector", - "Module": "time_series", + "Module": "timeseries", "Type": "Transform" }, { "Name": "TimeSeriesProcessingEntryPoints.IidChangePointDetector", "NewName": "IidChangePointDetector", - "Module": "time_series", + "Module": "timeseries", "Type": "Transform" }, { "Name": "TimeSeriesProcessingEntryPoints.SsaSpikeDetector", "NewName": "SsaSpikeDetector", - "Module": "time_series", + "Module": "timeseries", "Type": "Transform" }, { "Name": "TimeSeriesProcessingEntryPoints.SsaChangePointDetector", "NewName": "SsaChangePointDetector", - "Module": "time_series", + "Module": "timeseries", "Type": "Transform" }, {