Minor

DHI · Dec 16, 2023 · abfada2 · abfada2
1 parent 9590ec5
commit abfada2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 34 deletions.
diff --git a/mini_book/model_skill.ipynb b/mini_book/model_skill.ipynb
@@ -60,31 +60,22 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### compare()\n",
-    "The compare() method will return an object that can be used for scatter plots, skill assessment, time series plots etc."
+    "### Match observation to model\n",
+    "The `match()` method will return an object that can be used for scatter plots, skill assessment, time series plots etc."
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 32,
    "metadata": {},
-   "outputs": [
-    {
-     "name": "stderr",
-     "output_type": "stream",
-     "text": [
-      "/home/jan/src/book-learn-mikeio-fmskill/.venv/lib/python3.10/site-packages/modelskill/matching.py:243: FutureWarning: compare is deprecated. Use match instead.\n",
-      "  warnings.warn(\"compare is deprecated. Use match instead.\", FutureWarning)\n"
-     ]
-    }
-   ],
+   "outputs": [],
    "source": [
-    "c = ms.compare(fn_obs, df_mod)"
+    "cmp = ms.match(fn_obs, df_mod)"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 36,
    "metadata": {},
    "outputs": [
     {
@@ -99,7 +90,7 @@
     }
    ],
    "source": [
-    "c[0].plot.timeseries();"
+    "cmp.plot.timeseries();"
    ]
   },
   {
@@ -139,7 +130,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 34,
    "metadata": {},
    "outputs": [
     {
@@ -210,13 +201,13 @@
        "eur_Hm0      0.929005  "
       ]
      },
-     "execution_count": 6,
+     "execution_count": 34,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "c.skill()"
+    "cmp.skill()"
    ]
   },
   {
@@ -228,7 +219,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 35,
    "metadata": {},
    "outputs": [
     {
@@ -283,13 +274,13 @@
        "eur_Hm0      66  0.177321  0.970199   0.999428"
       ]
      },
-     "execution_count": 7,
+     "execution_count": 35,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "c.skill(metrics=[\"mae\",\"rho\",\"lin_slope\"])"
+    "cmp.skill(metrics=[\"mae\",\"rho\",\"lin_slope\"])"
    ]
   },
   {
@@ -318,7 +309,7 @@
     }
    ],
    "source": [
-    "c.plot.scatter();"
+    "cmp.plot.scatter();"
    ]
   },
   {
@@ -370,7 +361,7 @@
     }
    ],
    "source": [
-    "c.plot.taylor();"
+    "cmp.plot.taylor();"
    ]
   },
   {

diff --git a/mini_book/point_observations.ipynb b/mini_book/point_observations.ipynb
@@ -308,7 +308,9 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "o2 = ms.PointObservation(df, item=\"Hm0\", x=pos[0], y=pos[1], name='Hm0_from_csv', quantity=ms.Quantity('Significant wave height', 'm'))"
+    "o2 = ms.PointObservation(df, item=\"Hm0\", x=pos[0], y=pos[1],\n",
+    "                          name='Hm0_from_csv',\n",
+    "                          quantity=ms.Quantity('Significant wave height', 'm'))"
    ]
   },
   {

diff --git a/mini_book/track_observations.ipynb b/mini_book/track_observations.ipynb
@@ -236,15 +236,6 @@
     "repo = DHIAltimetryRepository(api_key)"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "repo.time_of_newest_data"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": null,