Skip to content

Commit

Permalink
Merge pull request #66 from ArtesiaWater/dev
Browse files Browse the repository at this point in the history 
Minor update v0.4.2
  • Loading branch information
@ArtesiaWater
ArtesiaWater authored Oct 6, 2021
2 parents 5644a3a + 84bbbf8 commit fa00ea0
Show file tree
Hide file tree
Showing 16 changed files with 12,860 additions and 1,086 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
pip install dask[dataframe] --upgrade
pip install pystore
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
pip install pandas==1.1.5
pip install codecov
pip install pytest-cov
pip install pytest-dependency
Expand Down
634 changes: 124 additions & 510 deletions examples/01_groundwater_observations.ipynb
View file

Large diffs are not rendered by default.

693 changes: 174 additions & 519 deletions examples/02_knmi_observations.ipynb
View file

Large diffs are not rendered by default.

51 changes: 29 additions & 22 deletions examples/03_pastastore_from_observations.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,10 @@
"name": "stderr",
"output_type": "stream",
"text": [
"WARNING:hydropandas.io.io_dino:could not read metadata -> C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\Grondwaterstanden_Put\\B27D0260001_1.csv\n",
"WARNING:hydropandas.io.io_dino:no NAP measurements available -> C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\Grondwaterstanden_Put\\B27D0260001_1.csv\n",
"WARNING:hydropandas.io.io_dino:could not read metadata -> C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\Grondwaterstanden_Put\\B37A0112001_1.csv\n",
"WARNING:hydropandas.io.io_dino:could not read measurements -> C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\Grondwaterstanden_Put\\B37A0112001_1.csv\n"
"WARNING:hydropandas.io.io_dino:could not read metadata -> C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\Grondwaterstanden_Put\\B27D0260001_1.csv\n",
"WARNING:hydropandas.io.io_dino:no NAP measurements available -> C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\Grondwaterstanden_Put\\B27D0260001_1.csv\n",
"WARNING:hydropandas.io.io_dino:could not read metadata -> C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\Grondwaterstanden_Put\\B37A0112001_1.csv\n",
"WARNING:hydropandas.io.io_dino:could not read measurements -> C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\Grondwaterstanden_Put\\B37A0112001_1.csv\n"
]
},
{
Expand Down Expand Up @@ -121,7 +121,7 @@
" <th>B58A0092-004</th>\n",
" <td>186924.0</td>\n",
" <td>372026.0</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\...</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\...</td>\n",
" <td>B58A0092</td>\n",
" <td>4.0</td>\n",
" <td>-115.23</td>\n",
Expand All @@ -137,7 +137,7 @@
" <th>B58A0092-005</th>\n",
" <td>186924.0</td>\n",
" <td>372026.0</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\...</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\...</td>\n",
" <td>B58A0092</td>\n",
" <td>5.0</td>\n",
" <td>-134.23</td>\n",
Expand All @@ -153,7 +153,7 @@
" <th>B58A0102-001</th>\n",
" <td>187900.0</td>\n",
" <td>373025.0</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\...</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\...</td>\n",
" <td>B58A0102</td>\n",
" <td>1.0</td>\n",
" <td>-3.35</td>\n",
Expand All @@ -169,7 +169,7 @@
" <th>B58A0167-001</th>\n",
" <td>185745.0</td>\n",
" <td>371095.0</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\...</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\...</td>\n",
" <td>B58A0167</td>\n",
" <td>1.0</td>\n",
" <td>23.33</td>\n",
Expand All @@ -185,7 +185,7 @@
" <th>B58A0212-001</th>\n",
" <td>183600.0</td>\n",
" <td>373020.0</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\...</td>\n",
" <td>C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\...</td>\n",
" <td>B58A0212</td>\n",
" <td>1.0</td>\n",
" <td>26.03</td>\n",
Expand All @@ -212,11 +212,11 @@
"\n",
" filename locatie \\\n",
"name \n",
"B58A0092-004 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\... B58A0092 \n",
"B58A0092-005 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\... B58A0092 \n",
"B58A0102-001 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\... B58A0102 \n",
"B58A0167-001 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\... B58A0167 \n",
"B58A0212-001 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpsdkqa83i\\... B58A0212 \n",
"B58A0092-004 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\... B58A0092 \n",
"B58A0092-005 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\... B58A0092 \n",
"B58A0102-001 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\... B58A0102 \n",
"B58A0167-001 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\... B58A0167 \n",
"B58A0212-001 C:\\Users\\oebbe\\AppData\\Local\\Temp\\tmpyqay_031\\... B58A0212 \n",
"\n",
" filternr bovenkant_filter onderkant_filter maaiveld \\\n",
"name \n",
Expand Down Expand Up @@ -260,7 +260,7 @@
],
"source": [
"extent = [117850, 117980, 439550, 439700] # Schoonhoven zuid-west\n",
"dinozip = '../tests/data/2019-Dino-test/dino.zip'\n",
"dinozip = 'data/dino.zip'\n",
"oc_dino = ObsCollection.from_dino(dirname=dinozip, keep_all_obs=False)\n",
"oc_dino = oc_dino.loc[['B58A0092-004', 'B58A0092-005', 'B58A0102-001', 'B58A0167-001', 'B58A0212-001']]\n",
"oc_dino"
Expand Down Expand Up @@ -541,17 +541,17 @@
"INFO:pastas.timeseries:Time Series B58A0092-005: 3 nan-value(s) was/were found and filled with: drop.\n",
"INFO:pastas.timeseries:Inferred frequency for time series RD_HEIBLOEM-L: freq=D\n",
"INFO:pastas.timeseries:Inferred frequency for time series EV24_ELL: freq=D\n",
"Bulk creation models: 40%|████████████████████████▊ | 2/5 [00:00<00:00, 10.89it/s]INFO:pastas.timeseries:Cannot determine frequency of series B58A0102-001: freq=None. The time series is irregular.\n",
"Bulk creation models: 40%|████████████████████████▊ | 2/5 [00:00<00:00, 10.90it/s]INFO:pastas.timeseries:Cannot determine frequency of series B58A0102-001: freq=None. The time series is irregular.\n",
"INFO:pastas.timeseries:Inferred frequency for time series RD_HEIBLOEM-L: freq=D\n",
"INFO:pastas.timeseries:Inferred frequency for time series EV24_ELL: freq=D\n",
"INFO:pastas.timeseries:Cannot determine frequency of series B58A0167-001: freq=None. The time series is irregular.\n",
"INFO:pastas.timeseries:Inferred frequency for time series RD_HEIBLOEM-L: freq=D\n",
"INFO:pastas.timeseries:Inferred frequency for time series EV24_ELL: freq=D\n",
"Bulk creation models: 80%|█████████████████████████████████████████████████▌ | 4/5 [00:00<00:00, 11.53it/s]INFO:pastas.timeseries:Cannot determine frequency of series B58A0212-001: freq=None. The time series is irregular.\n",
"Bulk creation models: 80%|█████████████████████████████████████████████████▌ | 4/5 [00:00<00:00, 11.47it/s]INFO:pastas.timeseries:Cannot determine frequency of series B58A0212-001: freq=None. The time series is irregular.\n",
"INFO:pastas.timeseries:Time Series B58A0212-001: 16 nan-value(s) was/were found and filled with: drop.\n",
"INFO:pastas.timeseries:Inferred frequency for time series RD_SOMEREN: freq=D\n",
"INFO:pastas.timeseries:Inferred frequency for time series EV24_ELL: freq=D\n",
"Bulk creation models: 100%|██████████████████████████████████████████████████████████████| 5/5 [00:00<00:00, 11.48it/s]\n"
"Bulk creation models: 100%|██████████████████████████████████████████████████████████████| 5/5 [00:00<00:00, 11.46it/s]\n"
]
}
],
Expand All @@ -573,14 +573,14 @@
"INFO:pastas.timeseries:Time Series B58A0092-004: 13 nan-value(s) was/were found and filled with: drop.\n",
"INFO:pastas.timeseries:User provided frequency for time series RD_HEIBLOEM-L: freq=D\n",
"INFO:pastas.timeseries:User provided frequency for time series EV24_ELL: freq=D\n",
"Solving models: 20%|█████████████▌ | 1/5 [00:01<00:04, 1.08s/it]INFO:pastas.timeseries:Cannot determine frequency of series B58A0092-005: freq=None. The time series is irregular.\n",
"Solving models: 20%|█████████████▌ | 1/5 [00:01<00:04, 1.14s/it]INFO:pastas.timeseries:Cannot determine frequency of series B58A0092-005: freq=None. The time series is irregular.\n",
"INFO:pastas.timeseries:Time Series B58A0092-005: 3 nan-value(s) was/were found and filled with: drop.\n",
"INFO:pastas.timeseries:User provided frequency for time series RD_HEIBLOEM-L: freq=D\n",
"INFO:pastas.timeseries:User provided frequency for time series EV24_ELL: freq=D\n",
"Solving models: 40%|███████████████████████████▏ | 2/5 [00:02<00:03, 1.28s/it]INFO:pastas.timeseries:Cannot determine frequency of series B58A0102-001: freq=None. The time series is irregular.\n",
"Solving models: 40%|███████████████████████████▏ | 2/5 [00:02<00:04, 1.34s/it]INFO:pastas.timeseries:Cannot determine frequency of series B58A0102-001: freq=None. The time series is irregular.\n",
"INFO:pastas.timeseries:User provided frequency for time series RD_HEIBLOEM-L: freq=D\n",
"INFO:pastas.timeseries:User provided frequency for time series EV24_ELL: freq=D\n",
"Solving models: 60%|████████████████████████████████████████▊ | 3/5 [00:03<00:02, 1.26s/it]INFO:pastas.timeseries:Cannot determine frequency of series B58A0167-001: freq=None. The time series is irregular.\n",
"Solving models: 60%|████████████████████████████████████████▊ | 3/5 [00:03<00:02, 1.30s/it]INFO:pastas.timeseries:Cannot determine frequency of series B58A0167-001: freq=None. The time series is irregular.\n",
"INFO:pastas.timeseries:User provided frequency for time series RD_HEIBLOEM-L: freq=D\n",
"INFO:pastas.timeseries:User provided frequency for time series EV24_ELL: freq=D\n",
"Solving models: 80%|██████████████████████████████████████████████████████▍ | 4/5 [00:05<00:01, 1.26s/it]INFO:pastas.timeseries:Cannot determine frequency of series B58A0212-001: freq=None. The time series is irregular.\n",
Expand All @@ -589,7 +589,7 @@
"INFO:pastas.timeseries:User provided frequency for time series EV24_ELL: freq=D\n",
"INFO:pastas.timeseries:Time Series RD_SOMEREN was extended to 1953-05-30 00:00:00 with the mean value of the time series.\n",
"INFO:pastas.timeseries:Time Series EV24_ELL was extended to 1953-05-30 00:00:00 with the mean value of the time series.\n",
"Solving models: 100%|████████████████████████████████████████████████████████████████████| 5/5 [00:06<00:00, 1.27s/it]\n"
"Solving models: 100%|████████████████████████████████████████████████████████████████████| 5/5 [00:06<00:00, 1.29s/it]\n"
]
}
],
Expand Down Expand Up @@ -688,6 +688,13 @@
"ml1 = pstore.get_models('B58A0167-001')\n",
"ml1.plots.results();"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
Loading

0 comments on commit fa00ea0

Please sign in to comment.