vanderpol

agosztolai · Nov 27, 2023 · 414e5ca · 414e5ca
1 parent 3bef285
commit 414e5ca
Show file tree

Hide file tree

Showing 26 changed files with 9 additions and 10 deletions.
diff --git a/examples/toy_examples/outputs/best_model_20231127-112433.pth b/examples/toy_examples/outputs/best_model_20231127-112433.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-112530.pth b/examples/toy_examples/outputs/best_model_20231127-112530.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-112638.pth b/examples/toy_examples/outputs/best_model_20231127-112638.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-112824.pth b/examples/toy_examples/outputs/best_model_20231127-112824.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-113924.pth b/examples/toy_examples/outputs/best_model_20231127-113924.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-114307.pth b/examples/toy_examples/outputs/best_model_20231127-114307.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-120421.pth b/examples/toy_examples/outputs/best_model_20231127-120421.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-121031.pth b/examples/toy_examples/outputs/best_model_20231127-121031.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-121448.pth b/examples/toy_examples/outputs/best_model_20231127-121448.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-123632.pth b/examples/toy_examples/outputs/best_model_20231127-123632.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-123834.pth b/examples/toy_examples/outputs/best_model_20231127-123834.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-124125.pth b/examples/toy_examples/outputs/best_model_20231127-124125.pth
diff --git a/examples/toy_examples/outputs/best_model_20231127-124225.pth b/examples/toy_examples/outputs/best_model_20231127-124225.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-112433.pth b/examples/toy_examples/outputs/last_model_20231127-112433.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-112530.pth b/examples/toy_examples/outputs/last_model_20231127-112530.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-112638.pth b/examples/toy_examples/outputs/last_model_20231127-112638.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-112824.pth b/examples/toy_examples/outputs/last_model_20231127-112824.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-113924.pth b/examples/toy_examples/outputs/last_model_20231127-113924.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-114307.pth b/examples/toy_examples/outputs/last_model_20231127-114307.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-120421.pth b/examples/toy_examples/outputs/last_model_20231127-120421.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-121448.pth b/examples/toy_examples/outputs/last_model_20231127-121448.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-123632.pth b/examples/toy_examples/outputs/last_model_20231127-123632.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-123834.pth b/examples/toy_examples/outputs/last_model_20231127-123834.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-124125.pth b/examples/toy_examples/outputs/last_model_20231127-124125.pth
diff --git a/examples/toy_examples/outputs/last_model_20231127-124225.pth b/examples/toy_examples/outputs/last_model_20231127-124225.pth
diff --git a/examples/toy_examples/vanderpol.ipynb b/examples/toy_examples/vanderpol.ipynb
@@ -184,7 +184,7 @@
     }
    ],
    "source": [
-    "data = MARBLE.construct_dataset(pos, features=vel, k=20, stop_crit=0.03)"
+    "data = MARBLE.construct_dataset(pos, features=vel, stop_crit=0.03)"
    ]
   },
   {
@@ -283,14 +283,13 @@
    ],
    "source": [
     "params = {'epochs': 50, #optimisation epochs\n",
-    "       'order': 2, #order of derivatives\n",
     "       'hidden_channels': 32, #number of internal dimensions in MLP\n",
     "       'out_channels': 5,\n",
     "       'inner_product_features': True,\n",
     "      }\n",
     "\n",
     "model = MARBLE.net(data, params=params)\n",
-    "model.run_training(data, outdir='model_large')"
+    "model.fit(data, outdir='model_large')"
    ]
   },
   {
@@ -375,7 +374,7 @@
     }
    ],
    "source": [
-    "data = model.evaluate(data)\n",
+    "data = model.transform(data)\n",
     "data = MARBLE.distribution_distances(data)\n",
     "data = MARBLE.embed_in_2D(data)\n",
     "\n",
@@ -516,7 +515,7 @@
     "\n",
     "data = MARBLE.construct_dataset(pos, features=vel, k=20, stop_crit=0.03)\n",
     "model = MARBLE.net(data, params=params)\n",
-    "model.run_training(data, outdir='model_zoom')"
+    "model.fit(data, outdir='model_zoom')"
    ]
   },
   {
@@ -596,7 +595,7 @@
     }
    ],
    "source": [
-    "data = model.evaluate(data)\n",
+    "data = model.transform(data)\n",
     "data = MARBLE.distribution_distances(data)\n",
     "data = MARBLE.embed_in_2D(data)\n",
     "\n",
@@ -764,7 +763,7 @@
     "\n",
     "params['inner_product_features'] = True\n",
     "model = MARBLE.net(data, params=params)\n",
-    "model.run_training(data, outdir='model_noise_inner')"
+    "model.fit(data, outdir='model_noise_inner')"
    ]
   },
   {
@@ -844,7 +843,7 @@
     }
    ],
    "source": [
-    "data = model.evaluate(data)\n",
+    "data = model.transform(data)\n",
     "data = MARBLE.distribution_distances(data)\n",
     "data = MARBLE.embed_in_2D(data)\n",
     "\n",
@@ -969,7 +968,7 @@
    "source": [
     "params['inner_product_features'] = False\n",
     "model = MARBLE.net(data, params=params)\n",
-    "model.run_training(data, outdir='model_noise_no_inner')"
+    "model.fit(data, outdir='model_noise_no_inner')"
    ]
   },
   {
@@ -1048,7 +1047,7 @@
     }
    ],
    "source": [
-    "data = model.evaluate(data)\n",
+    "data = model.transform(data)\n",
     "data = MARBLE.distribution_distances(data)\n",
     "data = MARBLE.embed_in_2D(data)\n",
     "\n",