Merge branch 'devel'

Morisset · Sep 25, 2019 · 3fb5a7d · 3fb5a7d
2 parents c975880 + fdf521f
commit 3fb5a7d
Show file tree

Hide file tree

Showing 5 changed files with 95 additions and 82 deletions.
diff --git a/docs/ComparePolynom.ipynb b/docs/ComparePolynom.ipynb
@@ -240,7 +240,7 @@
     }
    ],
    "source": [
-    "RM = mwinai.manage_RM(RM_type='ANN', X_train=X_train, y_train=y_train_true, scaling=True,\n",
+    "RM = mwinai.manage_RM(RM_type='SK_ANN', X_train=X_train, y_train=y_train_true, scaling=True,\n",
     "                  verbose=False, random_seed=10)\n",
     "RM.init_RM(hidden_layer_sizes=(4), \n",
     "           tol=1e-6, max_iter=1000, \n",
@@ -320,7 +320,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 12,
    "metadata": {},
    "outputs": [
     {
@@ -368,7 +368,7 @@
     "hidden_layer_sizes_strs = ('3', '10', '100-100')\n",
     "for i in range(len(hidden_layer_sizes_set)):\n",
     "    scaleit=True\n",
-    "    RM = mwinai.manage_RM(RM_type='ANN', X_train=X_train, y_train=y_train_true, scaling=scaleit,\n",
+    "    RM = mwinai.manage_RM(RM_type='SK_ANN', X_train=X_train, y_train=y_train_true, scaling=scaleit,\n",
     "                      verbose=False, random_seed=10)\n",
     "    RM.init_RM(hidden_layer_sizes=hidden_layer_sizes_set[i], \n",
     "               tol=1e-6, max_iter=10000, \n",

diff --git a/docs/OxygenDiags.ipynb b/docs/OxygenDiags.ipynb