wavetrainer 0.0.18__tar.gz → 0.0.20__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. {wavetrainer-0.0.18/wavetrainer.egg-info → wavetrainer-0.0.20}/PKG-INFO +1 -1
  2. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/setup.py +1 -1
  3. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/__init__.py +1 -1
  4. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/model/catboost_model.py +3 -0
  5. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/selector/selector.py +0 -8
  6. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/trainer.py +3 -1
  7. {wavetrainer-0.0.18 → wavetrainer-0.0.20/wavetrainer.egg-info}/PKG-INFO +1 -1
  8. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/LICENSE +0 -0
  9. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/MANIFEST.in +0 -0
  10. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/README.md +0 -0
  11. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/requirements.txt +0 -0
  12. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/setup.cfg +0 -0
  13. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/tests/__init__.py +0 -0
  14. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/tests/model/__init__.py +0 -0
  15. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/tests/model/catboost_kwargs_test.py +0 -0
  16. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/tests/trainer_test.py +0 -0
  17. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/calibrator/__init__.py +0 -0
  18. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/calibrator/calibrator.py +0 -0
  19. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/calibrator/calibrator_router.py +0 -0
  20. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/calibrator/mapie_calibrator.py +0 -0
  21. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/calibrator/vennabers_calibrator.py +0 -0
  22. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/create.py +0 -0
  23. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/exceptions.py +0 -0
  24. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/fit.py +0 -0
  25. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/model/__init__.py +0 -0
  26. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/model/catboost_classifier_wrap.py +0 -0
  27. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/model/catboost_kwargs.py +0 -0
  28. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/model/catboost_regressor_wrap.py +0 -0
  29. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/model/model.py +0 -0
  30. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/model/model_router.py +0 -0
  31. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/model_type.py +0 -0
  32. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/params.py +0 -0
  33. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/reducer/__init__.py +0 -0
  34. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/reducer/base_selector_reducer.py +0 -0
  35. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/reducer/combined_reducer.py +0 -0
  36. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/reducer/constant_reducer.py +0 -0
  37. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/reducer/correlation_reducer.py +0 -0
  38. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/reducer/duplicate_reducer.py +0 -0
  39. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/reducer/nonnumeric_reducer.py +0 -0
  40. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/reducer/reducer.py +0 -0
  41. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/reducer/unseen_reducer.py +0 -0
  42. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/selector/__init__.py +0 -0
  43. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/weights/__init__.py +0 -0
  44. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/weights/class_weights.py +0 -0
  45. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/weights/combined_weights.py +0 -0
  46. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/weights/exponential_weights.py +0 -0
  47. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/weights/linear_weights.py +0 -0
  48. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/weights/noop_weights.py +0 -0
  49. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/weights/sigmoid_weights.py +0 -0
  50. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/weights/weights.py +0 -0
  51. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/weights/weights_router.py +0 -0
  52. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/windower/__init__.py +0 -0
  53. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer/windower/windower.py +0 -0
  54. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer.egg-info/SOURCES.txt +0 -0
  55. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer.egg-info/dependency_links.txt +0 -0
  56. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer.egg-info/not-zip-safe +0 -0
  57. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer.egg-info/requires.txt +0 -0
  58. {wavetrainer-0.0.18 → wavetrainer-0.0.20}/wavetrainer.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: wavetrainer
3
- Version: 0.0.18
3
+ Version: 0.0.20
4
4
  Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
5
5
  Home-page: https://github.com/8W9aG/wavetrainer
6
6
  Author: Will Sackfield
@@ -23,7 +23,7 @@ def install_requires() -> typing.List[str]:
23
23
 
24
24
  setup(
25
25
  name='wavetrainer',
26
- version='0.0.18',
26
+ version='0.0.20',
27
27
  description='A library for automatically finding the optimal model within feature and hyperparameter space.',
28
28
  long_description=long_description,
29
29
  long_description_content_type='text/markdown',
@@ -2,5 +2,5 @@
2
2
 
3
3
  from .create import create
4
4
 
5
- __VERSION__ = "0.0.18"
5
+ __VERSION__ = "0.0.20"
6
6
  __all__ = ("create",)
@@ -1,6 +1,7 @@
1
1
  """A model that wraps catboost."""
2
2
 
3
3
  import json
4
+ import logging
4
5
  import os
5
6
  from typing import Any, Self
6
7
 
@@ -152,6 +153,8 @@ class CatboostModel(Model):
152
153
  metric_period=100,
153
154
  eval_set=eval_pool,
154
155
  )
156
+ importances = catboost.get_feature_importance(prettified=True)
157
+ logging.info("Importances:\n%s", importances)
155
158
  return self
156
159
 
157
160
  def transform(self, df: pd.DataFrame) -> pd.DataFrame:
@@ -66,14 +66,6 @@ class Selector(Params, Fit):
66
66
  )
67
67
  try:
68
68
  self._selector.fit(df, y=y, sample_weight=w, **model_kwargs)
69
- importances = self._model.estimator.feature_importances_
70
- try:
71
- importances_len = len(importances)
72
- columns = self._selector.get_feature_names_out()
73
- for i in range(importances_len):
74
- logging.info("Feature %s: %f", columns[i], importances[i])
75
- except TypeError:
76
- pass
77
69
  except ValueError as exc:
78
70
  # Catch issues with 1 feature as a reduction target.
79
71
  logging.warning(str(exc))
@@ -284,7 +284,9 @@ class Trainer(Fit):
284
284
  start_test_index = (
285
285
  test_dt_index.to_list()[-int(len(test_dt_index) * self._test_size)]
286
286
  if isinstance(self._test_size, float)
287
- else test_dt_index[test_dt_index >= self._test_size][0]
287
+ else test_dt_index[
288
+ test_dt_index >= (start_validation_index - self._test_size) # type: ignore
289
+ ].to_list()[0]
288
290
  )
289
291
 
290
292
  def test_objective(trial: optuna.Trial) -> float:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: wavetrainer
3
- Version: 0.0.18
3
+ Version: 0.0.20
4
4
  Summary: A library for automatically finding the optimal model within feature and hyperparameter space.
5
5
  Home-page: https://github.com/8W9aG/wavetrainer
6
6
  Author: Will Sackfield
File without changes
File without changes
File without changes
File without changes