wavetrainer 0.0.16__tar.gz → 0.0.18__tar.gz

{wavetrainer-0.0.16/wavetrainer.egg-info → wavetrainer-0.0.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavetrainer
-Version: 0.0.16
+Version: 0.0.18
 Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
 Home-page: https://github.com/8W9aG/wavetrainer
 Author: Will Sackfield

{wavetrainer-0.0.16 → wavetrainer-0.0.18}/setup.py

@@ -23,7 +23,7 @@ def install_requires() -> typing.List[str]:
 
 setup(
     name='wavetrainer',
-    version='0.0.16',
+    version='0.0.18',
     description='A library for automatically finding the optimal model within feature and hyperparameter space.',
     long_description=long_description,
     long_description_content_type='text/markdown',

{wavetrainer-0.0.16 → wavetrainer-0.0.18}/wavetrainer/__init__.py

@@ -2,5 +2,5 @@
 
 from .create import create
 
-__VERSION__ = "0.0.16"
+__VERSION__ = "0.0.18"
 __all__ = ("create",)

{wavetrainer-0.0.16 → wavetrainer-0.0.18}/wavetrainer/reducer/unseen_reducer.py

@@ -19,7 +19,7 @@ class UnseenReducer(Reducer):
 
     def __init__(self):
         super().__init__()
-        self._seen_features = set()
+        self._seen_features = []
 
     @classmethod
     def name(cls) -> str:
@@ -32,14 +32,14 @@ class UnseenReducer(Reducer):
         with open(
             os.path.join(folder, _UNSEEN_REDUCER_FILE), encoding="utf8"
         ) as handle:
-            self._seen_features = set(json.load(handle))
+            self._seen_features = json.load(handle)
 
     def save(self, folder: str) -> None:
         with open(
             os.path.join(folder, _UNSEEN_REDUCER_FILE), "w", encoding="utf8"
         ) as handle:
             json.dump(
-                list(self._seen_features),
+                self._seen_features,
                 handle,
             )
 
@@ -55,4 +55,4 @@ class UnseenReducer(Reducer):
         return self
 
     def transform(self, df: pd.DataFrame) -> pd.DataFrame:
-        return df[list(self._seen_features)]
+        return df[self._seen_features]

{wavetrainer-0.0.16 → wavetrainer-0.0.18}/wavetrainer/trainer.py

@@ -171,6 +171,8 @@ class Trainer(Fit):
         if y is None:
             return self
 
+        df = df.reindex(sorted(df.columns), axis=1)
+
         dt_index = (
             df.index
             if self._dt_column is None
@@ -370,6 +372,7 @@ class Trainer(Fit):
 
     def transform(self, df: pd.DataFrame) -> pd.DataFrame:
         """Predict the expected values of the data."""
+        df = df.reindex(sorted(df.columns), axis=1)
         feature_columns = df.columns.values
         dt_index = (
             df.index

{wavetrainer-0.0.16 → wavetrainer-0.0.18/wavetrainer.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wavetrainer
-Version: 0.0.16
+Version: 0.0.18
 Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
 Home-page: https://github.com/8W9aG/wavetrainer
 Author: Will Sackfield