fix tica transform bug

williamgilpin · Mar 29, 2021 · 9248711 · 9248711
1 parent 80c349e
commit 9248711
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 103 deletions.
diff --git a/demos.ipynb b/demos.ipynb
diff --git a/exploratory.ipynb b/exploratory.ipynb
@@ -9,18 +9,9 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 1,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stdout",
-     "output_type": "stream",
-     "text": [
-      "The autoreload extension is already loaded. To reload it, use:\n",
-      "  %reload_ext autoreload\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
     "import numpy as np\n",
     "import warnings\n",

diff --git a/fnn/models.py b/fnn/models.py
@@ -352,7 +352,7 @@ def fit(self, X, y=None, subsample=None):
             self.model.fit(np.reshape(X_train, (X_train.shape[0], -1)))
 
     def transform(self, X, y=None):
-        X_test = hankel_matrix(standardize_ts(X), len(X) - self.time_window, q = self.time_window)
+        X_test = hankel_matrix(standardize_ts(X), self.time_window)
         X_test = np.reshape(X_test, (X_test.shape[0], -1))
         if self.time_lag > 0:
             X_new = self.model.transform([X_test])[0]

diff --git a/fnn/regularizers.py b/fnn/regularizers.py
@@ -109,8 +109,7 @@ def loss_false(code_batch, k=1):
 
     # Eq. 4 of Kennel et al.
     scaled_dist = tf.sqrt(
-        (tf.square(neighbor_new_dists) - tf.square(neighbor_dists_d[:-1]))
-        / tf.square(neighbor_dists_d[:-1])
+        (neighbor_new_dists - neighbor_dists_d[:-1]) / neighbor_dists_d[:-1]
     )
 
     # Kennel condition #1