Merge pull request #470 from WenjieDu/dev

Fix failed saving strategy "better", update docs, and release v0.7

.readthedocs.yaml

@@ -26,9 +26,10 @@ build:
  - pip install -r requirements.txt
  - pip install pypots
  - pip install sphinx==6.2.1 docutils==0.19 sphinxcontrib-bibtex==2.1.4 sphinxcontrib-gtagjs sphinx-autodoc-typehints furo==2023.07.26
- - git clone https://github.com/WenjieDu/TSDB TSDB_repo --depth 1
- - git clone https://github.com/WenjieDu/PyGrinder PyGrinder_repo --depth 1
- - pip install ./TSDB_repo && pip install ./PyGrinder_repo && pip install .
+ - git clone https://github.com/WenjieDu/TSDB TSDB_repo --depth 1 && pip install ./TSDB_repo
+ - git clone https://github.com/WenjieDu/PyGrinder PyGrinder_repo --depth 1 && pip install ./PyGrinder_repo
+ - git clone https://github.com/WenjieDu/BenchPOTS BenchPOTS_repo --depth 1 && pip install ./BenchPOTS_repo
+ - pip install .
 
  post_install:
  # To fix the exception: This documentation is not using `furo.css` as the stylesheet.

docs/conf.py

@@ -92,6 +92,9 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = "sphinx"
 
+# -- Options for PDF output -------------------------------------------------
+latex_engine = "xelatex"
+
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages. See the documentation for a list of builtin themes.

pypots/__init__.py

@@ -22,7 +22,7 @@
 #
 # Dev branch marker is: 'X.Y.dev' or 'X.Y.devN' where N is an integer.
 # 'X.Y.dev0' is the canonical version of 'X.Y.dev'
-__version__ = "0.6"
+__version__ = "0.7"
 
 
 from . import imputation, classification, clustering, forecasting, optim, data, utils

pypots/classification/base.py

@@ -353,7 +353,7 @@ def _train_model(
 
  # save the model if necessary
  self._auto_save_model_if_necessary(
- confirm_saving=mean_loss < self.best_loss,
+ confirm_saving=self.best_epoch == epoch,
  saving_name=f"{self.__class__.__name__}_epoch{epoch}_loss{mean_loss}",
  )
 

pypots/clustering/crli/model.py

@@ -309,7 +309,7 @@ def _train_model(
 
  # save the model if necessary
  self._auto_save_model_if_necessary(
- confirm_saving=mean_loss < self.best_loss,
+ confirm_saving=self.best_epoch == epoch,
  saving_name=f"{self.__class__.__name__}_epoch{epoch}_loss{mean_loss:.4f}",
  )
 

pypots/clustering/vader/model.py

@@ -317,7 +317,7 @@ def _train_model(
 
  # save the model if necessary
  self._auto_save_model_if_necessary(
- confirm_saving=mean_loss < self.best_loss,
+ confirm_saving=self.best_epoch == epoch,
  saving_name=f"{self.__class__.__name__}_epoch{epoch}_loss{mean_loss}",
  )
 

pypots/forecasting/base.py

@@ -350,7 +350,7 @@ def _train_model(
 
  # save the model if necessary
  self._auto_save_model_if_necessary(
- confirm_saving=mean_loss < self.best_loss,
+ confirm_saving=self.best_epoch == epoch,
  saving_name=f"{self.__class__.__name__}_epoch{epoch}_loss{mean_loss}",
  )
 

pypots/forecasting/csdi/model.py

@@ -313,7 +313,7 @@ def _train_model(
 
  # save the model if necessary
  self._auto_save_model_if_necessary(
- confirm_saving=mean_loss < self.best_loss,
+ confirm_saving=self.best_epoch == epoch,
  saving_name=f"{self.__class__.__name__}_epoch{epoch}_loss{mean_loss}",
  )
 

pypots/imputation/base.py

@@ -350,7 +350,7 @@ def _train_model(
 
  # save the model if necessary
  self._auto_save_model_if_necessary(
- confirm_saving=mean_loss < self.best_loss,
+ confirm_saving=self.best_epoch == epoch,
  saving_name=f"{self.__class__.__name__}_epoch{epoch}_loss{mean_loss}",
  )
 

pypots/imputation/csdi/model.py

@@ -293,7 +293,7 @@ def _train_model(
 
  # save the model if necessary
  self._auto_save_model_if_necessary(
- confirm_saving=mean_loss < self.best_loss,
+ confirm_saving=self.best_epoch == epoch,
  saving_name=f"{self.__class__.__name__}_epoch{epoch}_loss{mean_loss}",
  )
 

pypots/imputation/gpvae/model.py

@@ -320,7 +320,7 @@ def _train_model(
 
  # save the model if necessary
  self._auto_save_model_if_necessary(
- confirm_saving=mean_loss < self.best_loss,
+ confirm_saving=self.best_epoch == epoch,
  saving_name=f"{self.__class__.__name__}_epoch{epoch}_loss{mean_loss}",
  )
 

pypots/imputation/usgan/model.py

@@ -334,7 +334,7 @@ def _train_model(
 
  # save the model if necessary
  self._auto_save_model_if_necessary(
- confirm_saving=mean_loss < self.best_loss,
+ confirm_saving=self.best_epoch == epoch,
  saving_name=f"{self.__class__.__name__}_epoch{epoch}_loss{mean_loss}",
  )