diff --git a/deps/evalhyd b/deps/evalhyd index 55a8aac4d8c36ebfd13a4163973b46cccf6905e7..017726c604595dbb87a0458d8190a52b2bf443af 160000 --- a/deps/evalhyd +++ b/deps/evalhyd @@ -1 +1 @@ -Subproject commit 55a8aac4d8c36ebfd13a4163973b46cccf6905e7 +Subproject commit 017726c604595dbb87a0458d8190a52b2bf443af diff --git a/tests/expected/evald/KGEPRIME_D.csv b/tests/expected/evald/KGEPRIME_D.csv new file mode 100644 index 0000000000000000000000000000000000000000..558a3361645bc094d86d5c9b20fc189c013d9873 --- /dev/null +++ b/tests/expected/evald/KGEPRIME_D.csv @@ -0,0 +1,51 @@ +0.9071248643948864,1.1477333530243923,1.0668239858924582 +0.9077537938998346,1.1478429758547268,1.0684568980300118 +0.9080496949392161,1.1484028026509738,1.0696675053044051 +0.9082556740306482,1.1484209022637022,1.0705581846521615 +0.9084737485198940,1.1486630576436567,1.0713951161082431 +0.9089321810875520,1.1489428726605424,1.0722704389155211 +0.9093310954815347,1.1488135780819770,1.0731457617227991 +0.9094546896430078,1.1488016399441205,1.0735373535050023 +0.9095397983553178,1.1487856134230323,1.0740517976110342 +0.9095735837396087,1.1491999363901180,1.0745611228702399 +0.9096311356178044,1.1494305824532358,1.0751830627596215 +0.9101044432964827,1.1495392868849328,1.0758920230450484 +0.9102441911392056,1.1494163423692945,1.0765318788983218 +0.9102574967893201,1.1495752574168396,1.0770053722297441 +0.9103829299622012,1.1496597741688170,1.0774558307504485 +0.9104389606151662,1.1498193287039202,1.0781263996846790 +0.9103708026184928,1.1501613638087465,1.0785359074307741 +0.9106545061768646,1.1501897035858120,1.0789198209427380 +0.9106680754546872,1.1503679937353128,1.0793037344547021 +0.9107871131080774,1.1504053916036157,1.0798002625968421 +0.9109331668775991,1.1504930666773272,1.0802711965048515 +0.9109503931900584,1.1506796793881644,1.0806474317465762 +0.9112916063517488,1.1507819870125124,1.0811465193121295 +0.9116384611328783,1.1508213892258903,1.0815841807157685 +0.9116240546641530,1.1508649226798111,1.0820474363535382 +0.9117728671872545,1.1507388089259101,1.0826002718107666 +0.9119101939393581,1.1506625843082945,1.0831019187997328 +0.9119150575215442,1.1507542944710545,1.0835088671224147 +0.9119108416265477,1.1509472994224532,1.0839593256431190 +0.9120349545371204,1.1508964568748929,1.0844277001277152 +0.9120974194539910,1.1508349399490534,1.0847834599821353 +0.9121099264543083,1.1508757330670814,1.0854130781417561 +0.9125099729643541,1.1509349546260605,1.0861169195803568 +0.9129864907072712,1.1511152707612748,1.0868719494872194 +0.9130727481787702,1.1511623991072226,1.0873224080079240 +0.9137178424599028,1.1513164779920453,1.0880697596445472 +0.9137419646569960,1.1514764306974452,1.0888222301279968 +0.9136897426066677,1.1518176713888661,1.0896156513860558 +0.9144254206019433,1.1517387012476892,1.0907520353814693 +0.9142984381688551,1.1522701343488451,1.0915224218288104 +0.9142709614317646,1.1523150149572656,1.0920496630519076 +0.9144137451984202,1.1523110423287639,1.0927842175714655 +0.9149046185657690,1.1525453982271228,1.0938489377113123 +0.9155452591872579,1.1527254670882050,1.0949674057428342 +0.9155186197874120,1.1532046716768467,1.0959246300993313 +0.9154368750377250,1.1532273515892346,1.0972017823824649 +0.9167750313811954,1.1532539657633949,1.0988244568263661 +0.9169078074034277,1.1533196303650488,1.1006314097560101 +0.9175076075676912,1.1535549186612073,1.1038434861394426 +0.9179463597643975,1.1527797412590994,1.1077849981956065 +0.9179618893753376,1.1523899554203556,1.1189773567810644 diff --git a/tests/expected/evald/KGE_D.csv b/tests/expected/evald/KGE_D.csv new file mode 100644 index 0000000000000000000000000000000000000000..7d65cb59f4074a5036b38bfead4a934248bdf974 --- /dev/null +++ b/tests/expected/evald/KGE_D.csv @@ -0,0 +1,51 @@ +0.9071248643948864,1.2244294704151979,1.0668239858924582 +0.9077537938998346,1.2264207454072791,1.0684568980300118 +0.9080496949392161,1.2284091609962542,1.0696675053044051 +0.9082556740306482,1.2294513963440263,1.0705581846521615 +0.9084737485198940,1.2306719900133749,1.0713951161082431 +0.9089321810875520,1.2319774783565793,1.0722704389155211 +0.9093310954815347,1.2328444223282775,1.0731457617227991 +0.9094546896430078,1.2332814722478178,1.0735373535050023 +0.9095397983553178,1.2338552531667024,1.0740517976110342 +0.9095735837396087,1.2348855740497733,1.0745611228702399 +0.9096311356178044,1.2358482940716458,1.0751830627596215 +0.9101044432964827,1.2367801489363925,1.0758920230450484 +0.9102441911392056,1.2373833346872534,1.0765318788983218 +0.9102574967893201,1.2380987280203271,1.0770053722297441 +0.9103829299622012,1.2387076270574358,1.0774558307504485 +0.9104389606151662,1.2396505731434120,1.0781263996846790 +0.9103708026184928,1.2404903302072829,1.0785359074307741 +0.9106545061768646,1.2409624690429850,1.0789198209427380 +0.9106680754546872,1.2415964716356864,1.0793037344547021 +0.9107871131080774,1.2422080439464072,1.0798002625968421 +0.9109331668775991,1.2428445217100519,1.0802711965048515 +0.9109503931900584,1.2434790402937934,1.0806474317465762 +0.9112916063517488,1.2441639397456739,1.0811465193121295 +0.9116384611328783,1.2447102094160669,1.0815841807157685 +0.9116240546641530,1.2452904391749027,1.0820474363535382 +0.9117728671872545,1.2457901473263877,1.0826002718107666 +0.9119101939393581,1.2462848529553729,1.0831019187997328 +0.9119150575215442,1.2468524819385858,1.0835088671224147 +0.9119108416265477,1.2475800585327315,1.0839593256431190 +0.9120349545371204,1.2480639978139763,1.0844277001277152 +0.9120974194539910,1.2484067080262666,1.0847834599821353 +0.9121099264543083,1.2491755719869908,1.0854130781417561 +0.9125099729643541,1.2500499275558148,1.0861169195803568 +0.9129864907072712,1.2511148984168152,1.0868719494872194 +0.9130727481787702,1.2516846718054440,1.0873224080079240 +0.9137178424599028,1.2527126434836113,1.0880697596445472 +0.9137419646569960,1.2537531352118179,1.0888222301279968 +0.9136897426066677,1.2550385622883493,1.0896156513860558 +0.9144254206019433,1.2562613326135268,1.0907520353814693 +0.9142984381688551,1.2577286876454601,1.0915224218288104 +0.9142709614317646,1.2583852238137356,1.0920496630519076 +0.9144137451984202,1.2592273207901978,1.0927842175714655 +0.9149046185657690,1.2607105595147998,1.0938489377113123 +0.9155452591872579,1.2621968142312687,1.0949674057428342 +0.9155186197874120,1.2638254032362688,1.0959246300993313 +0.9154368750377250,1.2653231056559175,1.0972017823824649 +0.9167750313811954,1.2672236625128150,1.0988244568263661 +0.9169078074034277,1.2693798106679639,1.1006314097560101 +0.9175076075676912,1.2733440828682880,1.1038434861394426 +0.9179463597643975,1.2770321035906431,1.1077849981956065 +0.9179618893753376,1.2894982662973180,1.1189773567810644 diff --git a/tests/expected/evald/MAE.csv b/tests/expected/evald/MAE.csv new file mode 100644 index 0000000000000000000000000000000000000000..ef9cf0e5aa19cebfd335aaaafd5f73f21178bff5 --- /dev/null +++ b/tests/expected/evald/MAE.csv @@ -0,0 +1,51 @@ +265.1929260450160655 +265.6816720257234579 +265.7041800643086731 +265.7041800643086731 +265.8360128617363216 +266.1318327974276485 +266.4019292604501743 +266.3729903536977304 +266.5048231511253789 +266.6816720257234579 +266.6977491961415012 +266.8360128617363216 +267.0482315112540164 +267.3215434083601281 +267.4758842443729918 +267.8617363344051228 +268.0160771704179865 +267.9389067524115831 +268.1511254019292778 +268.1382636655948772 +268.3311897106109427 +268.5144694533761935 +268.4726688102894059 +268.3344051446945286 +268.5369774919614088 +268.6527331189710708 +268.7556270096462754 +268.9260450160771825 +269.0739549839228175 +269.2443729903537246 +269.4147909967845749 +269.7491961414791035 +269.7909967845658912 +269.9099678456591391 +270.0643086816720029 +269.9421221864951690 +270.1864951768488936 +270.6623794212218854 +271.1061093247588474 +271.5852090032154251 +271.9067524115755532 +272.1286173633440626 +272.3279742765273568 +272.6784565916398719 +273.4501607717041907 +274.5530546623793953 +274.8617363344051228 +276.1286173633440626 +278.5176848874597795 +281.2700964630225258 +291.2990353697749129 diff --git a/tests/expected/evald/MARE.csv b/tests/expected/evald/MARE.csv new file mode 100644 index 0000000000000000000000000000000000000000..bb93762afc8ff3ed5f1bad0080f8eaf37ae81c78 --- /dev/null +++ b/tests/expected/evald/MARE.csv @@ -0,0 +1,51 @@ +0.2110884459948862 +0.2114774783536764 +0.2114953943175681 +0.2114953943175681 +0.2116003306775049 +0.2118357976315096 +0.2120507891982094 +0.2120277543874916 +0.2121326907474284 +0.2122734590351485 +0.2122862561522140 +0.2123963113589770 +0.2125652333042412 +0.2127827842943542 +0.2129056366181827 +0.2132127674277538 +0.2133356197515823 +0.2132741935896681 +0.2134431155349323 +0.2134328778412799 +0.2135864432460655 +0.2137323303806118 +0.2136990578762416 +0.2135890026694786 +0.2137502463445035 +0.2138423855873749 +0.2139242871365938 +0.2140599365774878 +0.2141776700544901 +0.2143133194953841 +0.2144489689362780 +0.2147151489712397 +0.2147484214756099 +0.2148431201418944 +0.2149659724657229 +0.2148687143760253 +0.2150632305554205 +0.2154420252205583 +0.2157952256515652 +0.2161765797401161 +0.2164325220814255 +0.2166091222969289 +0.2167678065485407 +0.2170467837005679 +0.2176610453197104 +0.2185389275504014 +0.2187846321980584 +0.2197930450228172 +0.2216946966187457 +0.2238855630603538 +0.2318684046857924 diff --git a/tests/expected/evald/MSE.csv b/tests/expected/evald/MSE.csv new file mode 100644 index 0000000000000000000000000000000000000000..53a1eb3781e0e67ab67632c05a929f6d1aff72f9 --- /dev/null +++ b/tests/expected/evald/MSE.csv @@ -0,0 +1,51 @@ +603782.2604501608293504 +603540.1704180064843968 +604973.1768488745437935 +605519.1061093247262761 +606241.1157556270482019 +605823.9710610932670534 +605116.8520900321891531 +605160.5144694533664733 +605628.1511254019569606 +607006.1800643086899072 +608195.0578778134658933 +607157.1061093247262761 +607415.4598070739302784 +608465.9453376205638051 +608766.6463022507959977 +609964.8456591640133411 +611618.5176848875125870 +610871.5080385851906613 +611795.5273311897180974 +612155.2250803858041763 +612401.4630225080763921 +613310.6237942122388631 +612593.7202572347596288 +611633.2090032154228538 +612660.8906752411276102 +612724.9549839228857309 +612831.2958199357381091 +613728.3408360128523782 +614918.0514469452900812 +615075.4372990353731439 +615330.4244372990215197 +616544.5594855305971578 +615854.5048231511609629 +615046.1800643086899072 +615534.5530546624213457 +613767.3826366559369490 +615365.1704180064843968 +617751.3633440514095128 +615900.7909967845771462 +618968.0353697749087587 +620238.9099678456550464 +620927.2025723472470418 +620784.1286173633998260 +619856.3247588424710557 +622720.4019292604643852 +625799.9421221865341067 +621881.5369774919236079 +624982.4630225080763921 +628774.5691318328026682 +633351.0771704179933295 +656835.5305466237477958 diff --git a/tests/test_determinist.py b/tests/test_determinist.py index e37b66a3dd22db2e68960d49326c7044b2bb1359..a2750e9d529de955970fa9ecd793e2ef108e3338 100644 --- a/tests/test_determinist.py +++ b/tests/test_determinist.py @@ -11,9 +11,9 @@ _obs = numpy.genfromtxt("./data/q_obs.csv", delimiter=',')[numpy.newaxis, :] # list all available deterministic metrics _all_metrics = ( # errors-based - 'RMSE', + 'MAE', 'MARE', 'MSE', 'RMSE', # efficiencies-based - 'NSE', 'KGE', 'KGEPRIME' + 'NSE', 'KGE', 'KGE_D', 'KGEPRIME', 'KGEPRIME_D', )