Skip to content
This repository was archived by the owner on Nov 16, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions src/python/nimbusml.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -232,11 +232,11 @@
<Compile Include="nimbusml\internal\core\preprocessing\schema\columnduplicator.py" />
<Compile Include="nimbusml\internal\core\preprocessing\schema\columndropper.py" />
<Compile Include="nimbusml\internal\core\preprocessing\tensorflowscorer.py" />
<Compile Include="nimbusml\internal\core\time_series\iidchangepointdetector.py" />
<Compile Include="nimbusml\internal\core\time_series\iidspikedetector.py" />
<Compile Include="nimbusml\internal\core\time_series\ssachangepointdetector.py" />
<Compile Include="nimbusml\internal\core\time_series\ssaspikedetector.py" />
<Compile Include="nimbusml\internal\core\time_series\__init__.py" />
<Compile Include="nimbusml\internal\core\timeseries\iidchangepointdetector.py" />
<Compile Include="nimbusml\internal\core\timeseries\iidspikedetector.py" />
<Compile Include="nimbusml\internal\core\timeseries\ssachangepointdetector.py" />
<Compile Include="nimbusml\internal\core\timeseries\ssaspikedetector.py" />
<Compile Include="nimbusml\internal\core\timeseries\__init__.py" />
<Compile Include="nimbusml\internal\entrypoints\data_customtextloader.py" />
<Compile Include="nimbusml\internal\entrypoints\data_dataviewreference.py" />
<Compile Include="nimbusml\internal\entrypoints\data_idataviewarrayconverter.py" />
Expand Down Expand Up @@ -584,16 +584,16 @@
<Compile Include="nimbusml\tests\feature_extraction\text\test_sentiment.py" />
<Compile Include="nimbusml\tests\idv\__init__.py" />
<Compile Include="nimbusml\tests\preprocessing\normalization\test_meanvariancescaler.py" />
<Compile Include="nimbusml\tests\time_series\test_iidchangepointdetector.py" />
<Compile Include="nimbusml\tests\time_series\test_ssachangepointdetector.py" />
<Compile Include="nimbusml\tests\time_series\test_ssaspikedetector.py" />
<Compile Include="nimbusml\tests\time_series\test_iidspikedetector.py" />
<Compile Include="nimbusml\tests\time_series\__init__.py" />
<Compile Include="nimbusml\time_series\iidchangepointdetector.py" />
<Compile Include="nimbusml\time_series\iidspikedetector.py" />
<Compile Include="nimbusml\time_series\ssachangepointdetector.py" />
<Compile Include="nimbusml\time_series\ssaspikedetector.py" />
<Compile Include="nimbusml\time_series\__init__.py" />
<Compile Include="nimbusml\tests\timeseries\test_iidchangepointdetector.py" />
<Compile Include="nimbusml\tests\timeseries\test_ssachangepointdetector.py" />
<Compile Include="nimbusml\tests\timeseries\test_ssaspikedetector.py" />
<Compile Include="nimbusml\tests\timeseries\test_iidspikedetector.py" />
<Compile Include="nimbusml\tests\timeseries\__init__.py" />
<Compile Include="nimbusml\timeseries\iidchangepointdetector.py" />
<Compile Include="nimbusml\timeseries\iidspikedetector.py" />
<Compile Include="nimbusml\timeseries\ssachangepointdetector.py" />
<Compile Include="nimbusml\timeseries\ssaspikedetector.py" />
<Compile Include="nimbusml\timeseries\__init__.py" />
<Compile Include="tests\test_estimator_checks.py" />
<Compile Include="nimbusml\tests\feature_extraction\text\test_lightlda.py" />
<Compile Include="nimbusml\tests\idv\test_idv.py" />
Expand Down Expand Up @@ -766,7 +766,7 @@
<Folder Include="nimbusml\internal\core\preprocessing\normalization\" />
<Folder Include="nimbusml\internal\core\preprocessing\schema\" />
<Folder Include="nimbusml\internal\core\preprocessing\text\" />
<Folder Include="nimbusml\internal\core\time_series\" />
<Folder Include="nimbusml\internal\core\timeseries\" />
<Folder Include="nimbusml\internal\entrypoints\" />
<Folder Include="nimbusml\internal\utils\" />
<Folder Include="nimbusml\linear_model\" />
Expand All @@ -788,7 +788,7 @@
<Folder Include="nimbusml\tests\multiclass\" />
<Folder Include="nimbusml\tests\model_summary\" />
<Folder Include="nimbusml\tests\idv\" />
<Folder Include="nimbusml\tests\time_series\" />
<Folder Include="nimbusml\tests\timeseries\" />
<Folder Include="nimbusml\tests\pipeline\" />
<Folder Include="nimbusml\tests\feature_extraction\" />
<Folder Include="nimbusml\tests\feature_extraction\categorical\" />
Expand All @@ -805,7 +805,7 @@
<Folder Include="nimbusml\tests\preprocessing\text\" />
<Folder Include="nimbusml\tests\scikit\" />
<Folder Include="nimbusml\tests\utils\" />
<Folder Include="nimbusml\time_series\" />
<Folder Include="nimbusml\timeseries\" />
<Folder Include="nimbusml\utils\" />
<Folder Include="tests\" />
<Folder Include="tools\" />
Expand Down
2 changes: 1 addition & 1 deletion src/python/nimbusml/examples/IidChangePointDetector.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/python/nimbusml/examples/IidSpikeDetector.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/python/nimbusml/examples/SsaChangePointDetector.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/python/nimbusml/examples/SsaSpikeDetector.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/python/tests/test_estimator_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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__))
Expand Down
8 changes: 4 additions & 4 deletions src/python/tools/manifest_diff.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand Down