Merge pull request #20 from pastas/dev

Release 0.3.0
pastas · Jul 31, 2020 · 0200d9e · 0200d9e
2 parents 356cd65 + 713d21f
commit 0200d9e
Show file tree

Hide file tree

Showing 9 changed files with 343 additions and 277 deletions.
diff --git a/examples/notebooks/ex01_intro+guide_for_pastas-Project_users.ipynb b/examples/notebooks/ex01_intro+guide_for_pastas-Project_users.ipynb
@@ -85,7 +85,7 @@
     {
      "data": {
       "text/plain": [
-       "<pastas.project.project.Project at 0x7f6685cab950>"
+       "<pastas.project.project.Project at 0x7f961bc40b10>"
       ]
      },
      "execution_count": 2,
@@ -113,7 +113,7 @@
     {
      "data": {
       "text/plain": [
-       "<PastasProject> pastastore: \n",
+       "<PastaStore> pastastore: \n",
        " - <DictConnector object> 'pastastore': 0 oseries, 0 stresses, 0 models"
       ]
      },
@@ -277,10 +277,12 @@
    "source": [
     "# prec \n",
     "p = pd.read_csv(os.path.join(datadir, \"rain_nb1.csv\"), index_col=0, parse_dates=True)\n",
+    "p.columns = ['value']\n",
     "pmeta = {\"x\": 100300, \"y\": 400400}\n",
     "\n",
     "# evap \n",
     "e = pd.read_csv(os.path.join(datadir, \"evap_nb1.csv\"), index_col=0, parse_dates=True)\n",
+    "e.columns = [\"value\"]\n",
     "emeta = {\"x\": 100300, \"y\": 400400}"
    ]
   },
@@ -380,7 +382,7 @@
        "  <thead>\n",
        "    <tr style=\"text-align: right;\">\n",
        "      <th></th>\n",
-       "      <th>head</th>\n",
+       "      <th>oseries1</th>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>date</th>\n",
@@ -438,19 +440,19 @@
        "</div>"
       ],
       "text/plain": [
-       "             head\n",
-       "date             \n",
-       "1985-11-14  27.61\n",
-       "1985-11-28  27.73\n",
-       "1985-12-14  27.91\n",
-       "1985-12-28  28.13\n",
-       "1986-01-13  28.32\n",
-       "...           ...\n",
-       "2015-04-28  28.23\n",
-       "2015-05-14  28.08\n",
-       "2015-05-28  27.82\n",
-       "2015-06-14  27.75\n",
-       "2015-06-28  27.57\n",
+       "            oseries1\n",
+       "date                \n",
+       "1985-11-14     27.61\n",
+       "1985-11-28     27.73\n",
+       "1985-12-14     27.91\n",
+       "1985-12-28     28.13\n",
+       "1986-01-13     28.32\n",
+       "...              ...\n",
+       "2015-04-28     28.23\n",
+       "2015-05-14     28.08\n",
+       "2015-05-28     27.82\n",
+       "2015-06-14     27.75\n",
+       "2015-06-28     27.57\n",
        "\n",
        "[644 rows x 1 columns]"
       ]
@@ -1058,7 +1060,7 @@
     {
      "data": {
       "text/plain": [
-       "<PastasProject> pastastore: \n",
+       "<PastaStore> pastastore: \n",
        " - <DictConnector object> 'pastastore': 2 oseries, 4 stresses, 0 models"
       ]
      },
@@ -1239,14 +1241,14 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "100%|██████████| 2/2 [00:00<00:00,  8.74it/s]\n",
-      "100%|██████████| 2/2 [00:01<00:00,  1.04it/s]\n"
+      "Bulk creation models: 100%|██████████| 2/2 [00:00<00:00,  8.06it/s]\n",
+      "Solving models: 100%|██████████| 2/2 [00:03<00:00,  1.64s/it]\n"
      ]
     },
     {
      "data": {
       "text/plain": [
-       "<PastasProject> pastastore: \n",
+       "<PastaStore> pastastore: \n",
        " - <DictConnector object> 'pastastore': 2 oseries, 4 stresses, 2 models"
       ]
      },
@@ -1257,7 +1259,7 @@
    ],
    "source": [
     "# pastastore\n",
-    "store.create_models(add_recharge=True, store=True)\n",
+    "store.create_models_bulk(add_recharge=True, store=True)\n",
     "store.solve_models()\n",
     "\n",
     "# This can also be done in one command:\n",
@@ -1473,13 +1475,13 @@
        "    <tr>\n",
        "      <th>oseries1</th>\n",
        "      <td>92.914217</td>\n",
-       "      <td>7.735928</td>\n",
+       "      <td>9.223266</td>\n",
        "      <td>0.114426</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>oseries2</th>\n",
        "      <td>88.289792</td>\n",
-       "      <td>10.586819</td>\n",
+       "      <td>12.641372</td>\n",
        "      <td>0.126838</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
@@ -1488,8 +1490,8 @@
       ],
       "text/plain": [
        "                evp        aic      rmse\n",
-       "oseries1  92.914217   7.735928  0.114426\n",
-       "oseries2  88.289792  10.586819  0.126838"
+       "oseries1  92.914217   9.223266  0.114426\n",
+       "oseries2  88.289792  12.641372  0.126838"
       ]
      },
      "execution_count": 34,
@@ -1537,13 +1539,13 @@
        "    <tr>\n",
        "      <th>oseries1</th>\n",
        "      <td>92.914217</td>\n",
-       "      <td>7.735928</td>\n",
+       "      <td>9.223266</td>\n",
        "      <td>0.114426</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>oseries2</th>\n",
        "      <td>88.289792</td>\n",
-       "      <td>10.586819</td>\n",
+       "      <td>12.641372</td>\n",
        "      <td>0.126838</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
@@ -1552,8 +1554,8 @@
       ],
       "text/plain": [
        "                evp        aic      rmse\n",
-       "oseries1  92.914217   7.735928  0.114426\n",
-       "oseries2  88.289792  10.586819  0.126838"
+       "oseries1  92.914217   9.223266  0.114426\n",
+       "oseries2  88.289792  12.641372  0.126838"
       ]
      },
      "execution_count": 35,