pass tests

Author: Rpan4853

tests/test_core.py

@@ -159,9 +159,8 @@ def setup_class(cls):
 
 
 
-    def setup_zephyr(self, producer_step_name):
+    def setup_zephyr(self, step_num):
         zephyr = Zephyr()
-        step_num = zephyr.producer_to_step_map[producer_step_name]
 
         for i, (setters, getters) in enumerate(zephyr.step_order):
             if i < step_num:
@@ -173,7 +172,7 @@ def setup_zephyr(self, producer_step_name):
         return zephyr
 
     def test_initialize_class(self):
-        zephyr = self.setup_zephyr(0)
+        zephyr = self.setup_zephyr(1)
 
     def test_create_entityset(self):
         zephyr = self.setup_zephyr(1)
@@ -200,11 +199,10 @@ def test_generate_train_test_split(self):
         train_test_split = zephyr.get_train_test_split()
         assert train_test_split is not None
 
-    def setup_zephyr_with_base_split(self, producer_step_name):
+    def setup_zephyr_with_base_split(self, step_num):
         zephyr = self.setup_zephyr(4)
-        zephyr.set_train_test_split(**self.base_train_test_split())
-        final_step_num = zephyr.producer_to_step_map[producer_step_name]
-        for i in range(4, final_step_num):
+        zephyr.set_train_test_split(*self.base_train_test_split())
+        for i in range(5, step_num):
             setters, getters = zephyr.step_order[i]
             setter = setters[0]
             kwargs = self.kwargs[setter.__name__]

tests/test_entityset.py

@@ -210,14 +210,14 @@ def test_missing_time_indices(pidata_dfs):
 def test_default_create_pidata_entityset(pidata_dfs):
     es = create_pidata_entityset(pidata_dfs)
 
-    assert es.id == 'PI data'
+    assert es.id == 'pidata'
     assert set(es.dataframe_dict.keys()) == set(
         ['alarms', 'turbines', 'stoppages', 'work_orders', 'notifications', 'pidata'])
 
 
 def test_default_create_scada_entityset(scada_dfs):
     es = create_scada_entityset(scada_dfs)
 
-    assert es.id == 'SCADA data'
+    assert es.id == 'scada'
     assert set(es.dataframe_dict.keys()) == set(
         ['alarms', 'turbines', 'stoppages', 'work_orders', 'notifications', 'scada'])

tests/test_feature_engineering.py

@@ -1,7 +1,7 @@
 import pandas as pd
 import pytest
 
-from zephyr_ml import create_pidata_entityset, create_scada_entityset
+from zephyr_ml import _create_entityset
 from zephyr_ml.feature_engineering import process_signals
 
 
@@ -122,12 +122,12 @@ def scada_dfs(base_dfs):
 
 @pytest.fixture
 def pidata_es(pidata_dfs):
-    return create_pidata_entityset(pidata_dfs)
+    return _create_entityset(pidata_dfs, "pidata")
 
 
 @pytest.fixture
 def scada_es(scada_dfs):
-    return create_scada_entityset(scada_dfs)
+    return _create_entityset(scada_dfs, "scada")
 
 
 @pytest.fixture

zephyr_ml/core.py

@@ -332,6 +332,9 @@ def set_and_fit_pipeline(
         if y is None:
             y = self.y_train
 
+        print(X)
+        print(y)
+
         if visual:
             outputs_spec, visual_names = self._get_outputs_spec(False)
         else:
@@ -359,7 +362,10 @@ def predict(self, X=None, visual=False, **kwargs):
         else:
             outputs_spec = "default"
 
+        print(X)
+
         outputs = self.pipeline.predict(X, output_=outputs_spec, **kwargs)
+        print(outputs)
 
         if visual and visual_names:
             prediction = outputs[0]