Dehankel debugged

Author: sichinaga

pydmd/havok.py

@@ -298,12 +298,10 @@ def hankel(self, X):
                 f"provide at least {self._delays * self._lag} snapshots."
             )
 
-        num_cols = m - ((self._delays - 1) * self._lag)
-        H = np.empty((n * self._delays, num_cols))
+        Hm = m - ((self._delays - 1) * self._lag)
+        H = np.empty((n * self._delays, Hm))
         for i in range(self._delays):
-            H[i * n : (i + 1) * n] = X[
-                :, i * self._lag : i * self._lag + num_cols
-            ]
+            H[i * n : (i + 1) * n] = X[:, i * self._lag : i * self._lag + Hm]
 
         return H
 
@@ -319,12 +317,12 @@ def dehankel(self, H):
         """
         if not isinstance(H, np.ndarray) or H.ndim != 2:
             raise ValueError("Please ensure that input data is a 2D array.")
-        n = int(H.shape[0] / self._delays)
-        # TODO: debug this!
-        m = 
-        X = np.empty(n, )
-        for 
-        X = np.hstack([H[:n], H[n:, -self._lag].reshape(n, -1, order="F")])
+        Hn, Hm = H.shape
+        n = int(Hn / self._delays)
+        m = int(Hm + ((self._delays - 1) * self._lag))
+        X = np.empty(n, m)
+        for i in range(self._delays):
+            X[:, i * self._lag : i * self._lag + Hm] = H[i * n : (i + 1) * n]
         return X
 
     # dummy_data = np.array([[1, 2, 3, 4, 5, 6]])

tutorials/tutorial19/tutorial-19-havok.ipynb

@@ -26,7 +26,20 @@
    "execution_count": 1,
    "id": "50f420c4",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "ename": "SyntaxError",
+     "evalue": "invalid syntax (havok.py, line 324)",
+     "output_type": "error",
+     "traceback": [
+      "Traceback \u001b[0;36m(most recent call last)\u001b[0m:\n",
+      "\u001b[0m  File \u001b[1;32m/Library/Frameworks/Python.framework/Versions/3.11/lib/python3.11/site-packages/IPython/core/interactiveshell.py:3526\u001b[0m in \u001b[1;35mrun_code\u001b[0m\n    exec(code_obj, self.user_global_ns, self.user_ns)\u001b[0m\n",
+      "\u001b[0m  Cell \u001b[1;32mIn[1], line 5\u001b[0m\n    from pydmd import HAVOK\u001b[0m\n",
+      "\u001b[0;36m  File \u001b[0;32m~/Desktop/PyDMD/PyDMD/pydmd/__init__.py:33\u001b[0;36m\n\u001b[0;31m    from .havok import HAVOK\u001b[0;36m\n",
+      "\u001b[0;36m  File \u001b[0;32m~/Desktop/PyDMD/PyDMD/pydmd/havok.py:324\u001b[0;36m\u001b[0m\n\u001b[0;31m    m =\u001b[0m\n\u001b[0m        ^\u001b[0m\n\u001b[0;31mSyntaxError\u001b[0m\u001b[0;31m:\u001b[0m invalid syntax\n"
+     ]
+    }
+   ],
    "source": [
     "import numpy as np\n",
     "import matplotlib.pyplot as plt\n",
@@ -37,7 +50,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": null,
    "id": "1567a968-7a03-4dda-ac6d-2dfbecbde882",
    "metadata": {},
    "outputs": [],