Merge pull request #465 from WenjieDu/dev

Update docs and conda env dependencies
WenjieDu · Jul 19, 2024 · 6953864 · 6953864
2 parents afe2692 + 38fa5a6
commit 6953864
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -145,6 +145,7 @@ The paper references and links are all listed at the bottom of this file.
 | Neural Net    | BRITS[^3]                   |    ✅     |          |    ✅     |          |          | `2018 - NeurIPS`   |
 | Neural Net    | GRU-D[^4]                   |    ✅     |          |    ✅     |          |          | `2018 - Sci. Rep.` |
 | Neural Net    | Transformer🧑‍🔧[^2]        |    ✅     |          |          |          |          | `2017 - NeurIPS`   |
+| Naive         | Lerp                        |    ✅     |          |          |          |          |                    |
 | Naive         | LOCF/NOCB                   |    ✅     |          |          |          |          |                    |
 | Naive         | Mean                        |    ✅     |          |          |          |          |                    |
 | Naive         | Median                      |    ✅     |          |          |          |          |                    |

diff --git a/README_zh.md b/README_zh.md
@@ -131,6 +131,7 @@ PyPOTS当前支持多变量POTS数据的插补，预测，分类，聚类以及
 | Neural Net    | BRITS[^3]                   |    ✅     |          |    ✅     |          |          | `2018 - NeurIPS`   |
 | Neural Net    | GRU-D[^4]                   |    ✅     |          |    ✅     |          |          | `2018 - Sci. Rep.` |
 | Neural Net    | Transformer🧑‍🔧[^2]        |    ✅     |          |          |          |          | `2017 - NeurIPS`   |
+| Naive         | Lerp                        |    ✅     |          |          |          |          |                    |
 | Naive         | LOCF/NOCB                   |    ✅     |          |          |          |          |                    |
 | Naive         | Mean                        |    ✅     |          |          |          |          |                    |
 | Naive         | Median                      |    ✅     |          |          |          |          |                    |

diff --git a/docs/index.rst b/docs/index.rst
@@ -197,6 +197,8 @@ The paper references are all listed at the bottom of this readme file.
 +----------------+-----------------------------------------------------------+------+------+------+------+------+-----------------------+
 | Neural Net     | Transformer🧑‍🔧 :cite:`vaswani2017Transformer`           |  ✅  |      |      |      |      | ``2017 - NeurIPS``    |
 +----------------+-----------------------------------------------------------+------+------+------+------+------+-----------------------+
+| Naive          | Lerp (Linear Interpolation)                               |  ✅  |      |      |      |      |                       |
++----------------+-----------------------------------------------------------+------+------+------+------+------+-----------------------+
 | Naive          | LOCF/NOCB                                                 |  ✅  |      |      |      |      |                       |
 +----------------+-----------------------------------------------------------+------+------+------+------+------+-----------------------+
 | Naive          | Median                                                    |  ✅  |      |      |      |      |                       |

diff --git a/docs/pypots.imputation.rst b/docs/pypots.imputation.rst
@@ -19,6 +19,15 @@ pypots.imputation.transformer
    :show-inheritance:
    :inherited-members:
 
+pypots.imputation.imputeformer
+------------------------------------
+
+.. automodule:: pypots.imputation.imputeformer
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   :inherited-members:
+
 pypots.imputation.itransformer
 ------------------------------------
 
@@ -252,6 +261,15 @@ pypots.imputation.grud
    :show-inheritance:
    :inherited-members:
 
+pypots.imputation.lerp
+-----------------------------
+
+.. automodule:: pypots.imputation.lerp
+   :members:
+   :undoc-members:
+   :show-inheritance:
+   :inherited-members:
+
 pypots.imputation.locf
 -----------------------------
 

diff --git a/environment-dev.yml b/environment-dev.yml
@@ -19,8 +19,9 @@ dependencies:
     - conda-forge::matplotlib
     - conda-forge::tensorboard
     - conda-forge::scikit-learn
-    - conda-forge::pygrinder >=0.4
-    - conda-forge::tsdb >=0.2
+    - conda-forge::tsdb >=0.4
+    - conda-forge::pygrinder >=0.6
+    - conda-forge::benchpots >=0.2
     - pytorch::pytorch >=1.10.0
     ## Below we install the latest pypots because we need pypots-cli in it for development.
     - conda-forge::pypots

diff --git a/tests/environment_for_conda_test.yml b/tests/environment_for_conda_test.yml
@@ -19,8 +19,9 @@ dependencies:
     - conda-forge::matplotlib
     - conda-forge::tensorboard
     - conda-forge::scikit-learn
-    - conda-forge::pygrinder >=0.4
-    - conda-forge::tsdb >=0.2
+    - conda-forge::tsdb >=0.4
+    - conda-forge::pygrinder >=0.6
+    - conda-forge::benchpots >=0.2
     - conda-forge::protobuf <=4.21.12
     - pytorch::pytorch >=1.10.0