From 2ecf5a7da79b80630aae91f073b737389e2efca1 Mon Sep 17 00:00:00 2001 From: Peter Powers <pmpowers@usgs.gov> Date: Fri, 3 May 2024 18:15:41 -0600 Subject: [PATCH] updated conus and alaska tests --- nshms.yml | 2 +- .../earthquake/nshmp/model/NshmTests.java | 2 +- .../e2e/nshm-alaska-2023/ANCHORAGE_AK.json | 160 +++++++++--------- .../e2e/nshm-alaska-2023/FAIRBANKS_AK.json | 132 +++++++-------- .../e2e/nshm-alaska-2023/JUNEAU_AK.json | 124 +++++++------- .../e2e/nshm-alaska-2023/KODIAK_AK.json | 160 +++++++++--------- .../e2e/nshm-alaska-2023/VALDEZ_AK.json | 158 ++++++++--------- .../e2e/nshm-conus-2023/BOSTON_MA.json | 98 +++++------ .../e2e/nshm-conus-2023/CHICAGO_IL.json | 114 ++++++------- .../e2e/nshm-conus-2023/NEW_MADRID_MO.json | 126 +++++++------- .../e2e/nshm-conus-2023/NEW_YORK_NY.json | 116 ++++++------- .../e2e/nshm-conus-2023/RENO_NV.json | 8 +- .../nshm-conus-2023/SALT_LAKE_CITY_UT.json | 2 +- .../e2e/nshm-conus-2023/SEATTLE_WA.json | 30 ++-- 14 files changed, 616 insertions(+), 616 deletions(-) diff --git a/nshms.yml b/nshms.yml index d53f85e5..e8d2c2c2 100644 --- a/nshms.yml +++ b/nshms.yml @@ -27,7 +27,7 @@ nshms: # Alaska 2023 NSHM - repo: nshm-alaska - tag: 3.b.7 + tag: 3.b.9 year: 2023 deployment: baseHref: /ws/nshmp/alaska-2023/dynamic diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java index d9c9eb67..1a886f34 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java @@ -101,7 +101,7 @@ class NshmTests { // run single model NshmModel nshmModel = - NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023")); + NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023")); NshmTestUtils.writeExpecteds(nshmModel, Optional.empty()); nshmModel.exec.shutdown(); diff --git a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json index e38d1eb0..8b326a5c 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json @@ -15,34 +15,34 @@ -1.5994875815809322, -1.1973282616072674, -0.789658080940789, - -0.3856624808119846, + -0.38566248081198456, 0.01980262729617973, 0.4252677354043441, - 0.8329091229351039, + 0.832909122935104, 1.235471471385307, 1.6428726885203377 ], "ys": [ - 1.8297909582134704, - 1.4337178927371284, - 1.0946980156253328, - 0.8105495598814934, - 0.5812261955021413, - 0.4036188393819223, - 0.27161746492757066, - 0.17636338078479044, - 0.1111894248048286, - 0.06799513162548057, - 0.04041481406288187, - 0.0227606660549217, - 0.012209922620639357, - 0.0059571098121739986, - 0.002600622449782677, - 9.69057515663366E-4, - 2.9608762521794794E-4, - 6.917492394806519E-5, + 1.8705720787448923, + 1.4693007131669655, + 1.125049272734369, + 0.8355877902487033, + 0.600897527295964, + 0.41809959123337714, + 0.28147440165354026, + 0.18247291997213066, + 0.1146321457368578, + 0.06974604464886365, + 0.0412193345364642, + 0.0230832410334528, + 0.012325240034643236, + 0.005991702350122454, + 0.0026091602423358577, + 9.706495394890241E-4, + 2.9628733345530965E-4, + 6.918535190630059E-5, 1.13631932099536E-5, - 1.1051926173257162E-6 + 1.1051926173257164E-6 ] }, "SA0P2": { @@ -69,78 +69,78 @@ 1.998773638612381 ], "ys": [ - 2.290245953349451, - 1.8562487179246965, - 1.462044594599009, - 1.1231069777122165, - 0.833279409275935, - 0.6037201153557546, - 0.4240655360884087, - 0.28809224354518304, - 0.1899234849375237, - 0.1212718976471451, - 0.07512658375536861, - 0.04502801474526734, - 0.025930961945939055, - 0.014168084156366959, - 0.00720613901443358, - 0.0033191600647459094, - 0.0013521476531708257, - 4.7254775344228445E-4, - 1.3471540423378944E-4, - 2.9396669346552432E-5 + 2.3212622501475533, + 1.883797224536734, + 1.4859437242963538, + 1.143344527750667, + 0.8496973700362391, + 0.6163672294847234, + 0.43313038136973386, + 0.29405681312261595, + 0.19351790322377654, + 0.12324530113867646, + 0.07611322220864682, + 0.04547555409017356, + 0.026114204051183542, + 0.014235244388960107, + 0.007227768813406812, + 0.0033250868968394084, + 0.0013534810474718712, + 4.727646093869442E-4, + 1.3473536443700385E-4, + 2.9396669346552435E-5 ] }, "SA1P0": { "xs": [ -5.991464547107982, -5.585999438999818, - -5.181423615076537, + -5.181423615076538, -4.775958506968373, -4.374058465024705, -3.9633162998156966, -3.5613661338149765, - -3.1535563587475584, + -3.153556358747558, -2.7488721956224653, -2.3434070875143007, -1.9379419794061366, - -1.5324768712979722, + -1.532476871297972, -1.1270117631898076, -0.7215466550816433, - -0.31608154697347896, - 0.08617769624105241, + -0.3160815469734789, + 0.0861776962410524, 0.494696241836107, 0.9001613499442714, 1.3056264580524357, - 1.7119945007591924 + 1.7119945007591926 ], "ys": [ - 1.3537468328928346, - 1.0103154427598815, - 0.7323786350946773, - 0.5150449703517822, - 0.35345412134723325, - 0.2344910294085141, - 0.15334907120509234, - 0.09727623638180859, - 0.060176238499631794, - 0.03585826525074532, - 0.020380445279889404, - 0.010900794198883759, - 0.005388442426619103, - 0.002404954255789383, - 9.441273563210114E-4, - 3.193844266082103E-4, - 8.673259516301395E-5, - 1.8036535042472592E-5, + 1.4217924848762236, + 1.0661096930571168, + 0.7752489683278124, + 0.5456235249053838, + 0.37368716842107064, + 0.24671771572790188, + 0.16024384554439344, + 0.10082166505252219, + 0.06184777396021051, + 0.03656611628717803, + 0.020644281357099715, + 0.010984803444777032, + 0.005410292031544486, + 0.002409261284003777, + 9.447115945534841E-4, + 3.1943280531448147E-4, + 8.673260376905151E-5, + 1.803653504247259E-5, 2.799179550215747E-6, - 3.013028621585243E-7 + 3.0130286215852437E-7 ] }, "SA5P0": { "xs": [ -6.908755779315721, - -6.502290170873972, + -6.502290170873973, -6.0968250627658085, -5.692842534617867, -5.286388795682763, @@ -161,23 +161,23 @@ 0.7929925155296614 ], "ys": [ - 0.36205511025623816, - 0.2608473736299835, - 0.18255336992687307, - 0.1236219050947805, - 0.08037702914959681, - 0.05023327554359663, - 0.029818329911675604, - 0.016864452690360004, - 0.009021333844345322, - 0.004475360983021283, - 0.002019621949196018, - 8.047408485465233E-4, + 0.3743563237012538, + 0.2683070239187083, + 0.18680146590712338, + 0.125867025047675, + 0.08144980480785237, + 0.050689251986068336, + 0.029983268557567968, + 0.016914064347652132, + 0.009033002036013477, + 0.004477239141872161, + 0.0020197895020143894, + 8.047433977280893E-4, 2.7109083388956843E-4, 7.577409257805477E-5, 1.5204642255166092E-5, 2.0834669490803287E-6, - 1.21794529978192E-7, + 1.2179452997819203E-7, 1.6583407068056797E-9, 0.0, 0.0 diff --git a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json index 7ea91e7c..d42e2848 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json @@ -15,29 +15,29 @@ -1.5994875815809322, -1.1973282616072674, -0.789658080940789, - -0.3856624808119846, + -0.38566248081198456, 0.01980262729617973, 0.4252677354043441, - 0.8329091229351039, + 0.832909122935104, 1.235471471385307, 1.6428726885203377 ], "ys": [ - 0.7771093771249222, - 0.6002622796228388, - 0.45049103650760136, - 0.3262263923965367, - 0.22695112574017573, - 0.15114697194216073, - 0.09610056494729681, - 0.05775216058438478, - 0.032801449887918034, - 0.017448944179652554, - 0.008686801248760416, - 0.003918192057826304, - 0.0016202106347294343, + 0.7773363477181338, + 0.6003840325958942, + 0.45055098032683905, + 0.3262528937674043, + 0.2269614347990729, + 0.15115041754251668, + 0.09610152313700995, + 0.05775237099873535, + 0.03280148544350099, + 0.0174489484607918, + 0.008686801575601803, + 0.00391819205935686, + 0.0016202106347294348, 5.761432215081969E-4, - 1.7147886181828983E-4, + 1.7147886181828977E-4, 3.930733643504221E-5, 6.153671546077199E-6, 4.937329485744405E-7, @@ -69,67 +69,67 @@ 1.998773638612381 ], "ys": [ - 0.9548373989440899, - 0.7605831164307072, - 0.5874522995804776, - 0.44141417348581813, - 0.3187644983344743, - 0.22334349118273011, - 0.15023585080791185, - 0.09647652022229786, - 0.05914079795329683, - 0.034331430563204625, - 0.01878340585111988, - 0.009610357278076796, + 0.9550587948539366, + 0.7607079626104937, + 0.5875165087949122, + 0.4414444268506858, + 0.3187770396058406, + 0.2233481340289824, + 0.15023731621676764, + 0.09647689993888293, + 0.059140877570135766, + 0.03433144364079493, + 0.01878340744994322, + 0.009610357374287415, 0.004554898432719949, 0.0019696598942599585, - 7.574636690845083E-4, - 2.4860916339040456E-4, + 7.574636690845085E-4, + 2.486091633904046E-4, 6.665082282288701E-5, - 1.3516522756392187E-5, - 1.7145090353998691E-6, - 1.0436138874114594E-7 + 1.3516522756392186E-5, + 1.714509035399869E-6, + 1.0436138874114598E-7 ] }, "SA1P0": { "xs": [ -5.991464547107982, -5.585999438999818, - -5.181423615076537, + -5.181423615076538, -4.775958506968373, -4.374058465024705, -3.9633162998156966, -3.5613661338149765, - -3.1535563587475584, + -3.153556358747558, -2.7488721956224653, -2.3434070875143007, -1.9379419794061366, - -1.5324768712979722, + -1.532476871297972, -1.1270117631898076, -0.7215466550816433, - -0.31608154697347896, - 0.08617769624105241, + -0.3160815469734789, + 0.0861776962410524, 0.494696241836107, 0.9001613499442714, 1.3056264580524357, - 1.7119945007591924 + 1.7119945007591926 ], "ys": [ - 0.6299367955268628, - 0.4711801260493742, - 0.339436874554311, - 0.23353578076485115, - 0.15305109663302438, - 0.09365616265742083, - 0.05444830506157231, - 0.029426073427048553, - 0.014939814203279814, - 0.007063912287836687, - 0.003099249875967003, + 0.6303279044484461, + 0.47140253760135636, + 0.33955312733256793, + 0.23359028528589149, + 0.15307360339790496, + 0.09366384250667532, + 0.05445046109508423, + 0.029426507354198585, + 0.01493987060379095, + 0.007063915898809767, + 0.0030992499446853075, 0.0012486794584624082, 4.545983491944361E-4, - 1.4563774971743148E-4, - 3.95373614100591E-5, + 1.456377497174315E-4, + 3.9537361410059104E-5, 8.687897425612776E-6, 1.3269042742265163E-6, 1.2619367548125488E-7, @@ -140,7 +140,7 @@ "SA5P0": { "xs": [ -6.908755779315721, - -6.502290170873972, + -6.502290170873973, -6.0968250627658085, -5.692842534617867, -5.286388795682763, @@ -161,23 +161,23 @@ 0.7929925155296614 ], "ys": [ - 0.2022966925066381, - 0.1402983162089764, - 0.09209092515325219, - 0.05699685255584053, - 0.03301574073541317, - 0.017962434745860262, - 0.009036387258834747, - 0.004206626660247896, - 0.0017874421618739116, + 0.20234497756882108, + 0.14032012807885652, + 0.09209924841527953, + 0.05699943985922447, + 0.03301634712166945, + 0.017962534116277122, + 0.009036396321927025, + 0.004206626817847342, + 0.0017874421618739114, 6.752575716348747E-4, 2.230424682608342E-4, - 6.266782923990366E-5, + 6.266782923990367E-5, 1.4393259611992817E-5, 2.7373717183159915E-6, - 3.7249956647577337E-7, - 3.492872689157643E-8, - 1.1854844117945035E-9, + 3.724995664757733E-7, + 3.4928726891576425E-8, + 1.1854844117945037E-9, 7.721291928710127E-12, 0.0, 0.0 diff --git a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json index 1cf09e55..f58979a0 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json @@ -15,34 +15,34 @@ -1.5994875815809322, -1.1973282616072674, -0.789658080940789, - -0.3856624808119846, + -0.38566248081198456, 0.01980262729617973, 0.4252677354043441, - 0.8329091229351039, + 0.832909122935104, 1.235471471385307, 1.6428726885203377 ], "ys": [ - 0.4473576589583555, - 0.3319414840731348, - 0.233337690092073, - 0.15385889807867265, - 0.09423792817208838, - 0.05314439544620711, - 0.02752094080049907, - 0.012999588477776046, - 0.0056913281039095605, - 0.002362076122997531, - 9.77363876778997E-4, - 4.036685942156494E-4, + 0.44739800710395544, + 0.33196185479930534, + 0.23334698129423287, + 0.1538626212119859, + 0.0942391995250784, + 0.05314474945373546, + 0.027521014724691668, + 0.012999598323445903, + 0.005691328688626938, + 0.002362076124921025, + 9.773638767789973E-4, + 4.0366859421564943E-4, 1.694791920725093E-4, 6.539278295747254E-5, - 2.1894897377050023E-5, - 5.854897732511006E-6, + 2.1894897377050026E-5, + 5.854897732511005E-6, 1.1481806468811457E-6, 1.3857130577662447E-7, 7.674264133978933E-9, - 4.082286883282842E-12 + 4.082286883282843E-12 ] }, "SA0P2": { @@ -69,25 +69,25 @@ 1.998773638612381 ], "ys": [ - 0.5412517195676526, - 0.4217318032045643, - 0.3113997587131707, - 0.21815987846762244, - 0.14229246749847635, - 0.08707093734280127, - 0.04911544382366964, - 0.025376652973143607, - 0.01214402192018589, - 0.005447150778162354, + 0.5412927190961767, + 0.4217538249311484, + 0.31141040387934493, + 0.218164511697433, + 0.14229419101956967, + 0.08707148594959255, + 0.04911558084188856, + 0.02537667663849169, + 0.01214402410589105, + 0.005447150825642762, 0.0023673368054522, - 0.0010308518070662688, + 0.001030851807066269, 4.542778712691582E-4, 1.9831822940340378E-4, 8.14475060518514E-5, - 2.95140213198727E-5, - 8.988357941346193E-6, + 2.9514021319872702E-5, + 8.988357941346196E-6, 2.163646785544322E-6, - 3.662141469275799E-7, + 3.6621414692757996E-7, 3.63015145137678E-8 ] }, @@ -95,52 +95,52 @@ "xs": [ -5.991464547107982, -5.585999438999818, - -5.181423615076537, + -5.181423615076538, -4.775958506968373, -4.374058465024705, -3.9633162998156966, -3.5613661338149765, - -3.1535563587475584, + -3.153556358747558, -2.7488721956224653, -2.3434070875143007, -1.9379419794061366, - -1.5324768712979722, + -1.532476871297972, -1.1270117631898076, -0.7215466550816433, - -0.31608154697347896, - 0.08617769624105241, + -0.3160815469734789, + 0.0861776962410524, 0.494696241836107, 0.9001613499442714, 1.3056264580524357, - 1.7119945007591924 + 1.7119945007591926 ], "ys": [ - 0.3775735254287933, - 0.27744207723652275, - 0.19477057661509148, - 0.12875113340888142, - 0.07929674735656218, - 0.04411600602826025, - 0.02253219605451738, - 0.010286395011257915, - 0.004273800534436701, - 0.001620897165435973, - 5.776426623840872E-4, - 1.987286185713807E-4, - 6.823005284740018E-5, + 0.3776630573027078, + 0.27749246364092756, + 0.1947965629495508, + 0.1287631408254406, + 0.0793016390045022, + 0.04411765453022639, + 0.022532654125961622, + 0.010286487228242205, + 0.004273812500714076, + 0.0016208977866554034, + 5.776426645577924E-4, + 1.9872861857138076E-4, + 6.823005284740019E-5, 2.3251769378972825E-5, 7.514188693753363E-6, 2.1213215816591875E-6, - 4.554463808664307E-7, + 4.5544638086643076E-7, 6.616480177939729E-8, 4.838396012080842E-9, - 4.240103338446744E-11 + 4.240103338446734E-11 ] }, "SA5P0": { "xs": [ -6.908755779315721, - -6.502290170873972, + -6.502290170873973, -6.0968250627658085, -5.692842534617867, -5.286388795682763, @@ -161,16 +161,16 @@ 0.7929925155296614 ], "ys": [ - 0.13710145426410605, - 0.0942573295464636, - 0.060745301879708447, - 0.036565930620404447, - 0.02037832172090549, - 0.01050480119489072, - 0.004888034968610816, - 0.0020445061280406373, + 0.13711213933119312, + 0.09426214514784478, + 0.060747150151760035, + 0.03656651350761967, + 0.020378463613699962, + 0.010504825437473313, + 0.004888037130827023, + 0.002044506147590009, 7.562728552245487E-4, - 2.4308078953655867E-4, + 2.4308078953655876E-4, 6.901714663477101E-5, 1.8223732019732375E-5, 4.897967342053475E-6, diff --git a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json index 799c2e19..48b3e0f5 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json @@ -15,34 +15,34 @@ -1.5994875815809322, -1.1973282616072674, -0.789658080940789, - -0.3856624808119846, + -0.38566248081198456, 0.01980262729617973, 0.4252677354043441, - 0.8329091229351039, + 0.832909122935104, 1.235471471385307, 1.6428726885203377 ], "ys": [ - 1.651364017483675, - 1.1995492063224438, - 0.8459518618087022, - 0.5807057599129567, - 0.39117564227330504, - 0.2607755860643602, - 0.17320193903794523, - 0.11443940344793398, - 0.07550825349941157, - 0.04923189432609969, - 0.0313336552430301, - 0.01885529919291059, - 0.010792486917849752, - 0.005679342885137587, - 0.002721633715268657, - 0.0011434876645678273, - 4.070575019856634E-4, - 1.1671064027613724E-4, + 1.7539168552957063, + 1.2771547077611043, + 0.9006011391115294, + 0.6166399166916504, + 0.4133923857372829, + 0.2737719087729423, + 0.18041675013452887, + 0.11820337873805294, + 0.0773569158534343, + 0.05007822693923032, + 0.0316944941484999, + 0.018992940190418403, + 0.010840370957037467, + 0.005693614175017112, + 0.002725215870003345, + 0.0011441794011480383, + 4.071493331280477E-4, + 1.1671697539151646E-4, 2.5475347189104065E-5, - 3.6126001839969183E-6 + 3.6126001839969187E-6 ] }, "SA0P2": { @@ -69,69 +69,69 @@ 1.998773638612381 ], "ys": [ - 2.1945453671087045, - 1.6714742853154736, - 1.2244863125579937, - 0.8710475267768221, - 0.5987684192334757, - 0.4067300889546944, - 0.27268111027440695, - 0.1810809549595913, - 0.11992496227823618, - 0.07892810108147554, - 0.05127424193939008, - 0.03235673446335903, - 0.019485725174993907, - 0.011045317098441546, - 0.005829821423190788, - 0.00281679985279871, - 0.0012277959633121675, - 4.721268578670907E-4, - 1.5373567516193523E-4, - 4.070985240786104E-5 + 2.2773638630816997, + 1.7376099749687057, + 1.2731754122119532, + 0.90450442422708, + 0.6201089089233712, + 0.41967953242493283, + 0.2801155148896824, + 0.18510978758895058, + 0.12199243087631684, + 0.07992511075084574, + 0.051724936367726564, + 0.03254620926247212, + 0.01955908099515115, + 0.01107114916033017, + 0.005837932622178771, + 0.0028189959542069777, + 0.0012282929657390807, + 4.722118276095392E-4, + 1.5374544872757655E-4, + 4.070995698337155E-5 ] }, "SA1P0": { "xs": [ -5.991464547107982, -5.585999438999818, - -5.181423615076537, + -5.181423615076538, -4.775958506968373, -4.374058465024705, -3.9633162998156966, -3.5613661338149765, - -3.1535563587475584, + -3.153556358747558, -2.7488721956224653, -2.3434070875143007, -1.9379419794061366, - -1.5324768712979722, + -1.532476871297972, -1.1270117631898076, -0.7215466550816433, - -0.31608154697347896, - 0.08617769624105241, + -0.3160815469734789, + 0.0861776962410524, 0.494696241836107, 0.9001613499442714, 1.3056264580524357, - 1.7119945007591924 + 1.7119945007591926 ], "ys": [ - 1.2212066080842208, - 0.8598707411309544, - 0.5934279769186845, - 0.40330700684824355, - 0.2725851554279007, - 0.1816932763562211, - 0.1215099716825198, - 0.0797912998230498, - 0.05122460878813123, - 0.03150369852592356, - 0.018314408386513464, - 0.009953011317713843, - 0.0049968365580898315, - 0.002277051745675493, - 9.21374067242452E-4, - 3.251186475050686E-4, - 9.39427218693006E-5, + 1.3701794674919505, + 0.9670615239471806, + 0.6650128923278658, + 0.4477538795980312, + 0.29836104135764735, + 0.19533325315683017, + 0.1282368428974874, + 0.08278943009244252, + 0.0524463276587141, + 0.03195289571139475, + 0.018462683424597212, + 0.009996352479757975, + 0.005007730845776507, + 0.0022792779297490895, + 9.217133523627738E-4, + 3.2515464946741715E-4, + 9.394380975728929E-5, 2.1190014820001016E-5, 3.484520277155361E-6, 4.559925657574019E-7 @@ -140,7 +140,7 @@ "SA5P0": { "xs": [ -6.908755779315721, - -6.502290170873972, + -6.502290170873973, -6.0968250627658085, -5.692842534617867, -5.286388795682763, @@ -161,21 +161,21 @@ 0.7929925155296614 ], "ys": [ - 0.3199527704875783, - 0.2293876786217369, - 0.16195682824630434, - 0.11213720631502762, - 0.07517404938243484, - 0.048373252517777826, - 0.02926392103092542, - 0.0166252702545217, - 0.008829742348953057, - 0.004321460254724308, - 0.0019175421844803125, - 7.502088947592418E-4, - 2.463028185638767E-4, - 6.601152839690208E-5, - 1.190827934208269E-5, + 0.33966773124927746, + 0.24059339208417826, + 0.16776744586534828, + 0.11484372092101569, + 0.07627968876475939, + 0.04876729901156463, + 0.02938239018929548, + 0.016655276358749364, + 0.008835955948880297, + 0.0043224268250552905, + 0.0019176398520676346, + 7.50212379187797E-4, + 2.463028185638768E-4, + 6.60115283969021E-5, + 1.1908279342082692E-5, 1.2870098414063422E-6, 3.103489305140823E-8, 1.6551032765075596E-12, diff --git a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json index 8c01f9a3..853e1dde 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json @@ -15,33 +15,33 @@ -1.5994875815809322, -1.1973282616072674, -0.789658080940789, - -0.3856624808119846, + -0.38566248081198456, 0.01980262729617973, 0.4252677354043441, - 0.8329091229351039, + 0.832909122935104, 1.235471471385307, 1.6428726885203377 ], "ys": [ - 1.0884606849808087, - 0.8226090134805084, - 0.60320977982489, - 0.4269846229672716, - 0.2927736109328347, - 0.1960350442150399, - 0.12942123825411703, - 0.08446281815083542, - 0.054980222369216666, - 0.03561252176026163, - 0.02289629139010969, - 0.014203147185911199, - 0.008475170049458625, - 0.004661487242243586, - 0.002333789628006449, - 0.0010277319311107137, - 3.87678227442563E-4, - 1.2028053627471E-4, - 2.9730195737164675E-5, + 1.13612812490378, + 0.8634258320708791, + 0.6364698895061537, + 0.45277092437546257, + 0.3117934619567573, + 0.2093567313279522, + 0.13823886758497494, + 0.08990014681820703, + 0.05808763086710577, + 0.03723828601027987, + 0.023672902384353846, + 0.014530124098875444, + 0.00859871498492178, + 0.004701227460019762, + 0.0023445722791201992, + 0.001030009314187364, + 3.880155039964674E-4, + 1.2030800910213905E-4, + 2.9730431311127667E-5, 4.964851901415382E-6 ] }, @@ -69,70 +69,70 @@ 1.998773638612381 ], "ys": [ - 1.380326557353147, - 1.0714730267815589, - 0.8056674323202142, - 0.5889659276488419, - 0.4147631076554337, - 0.2865007651665381, - 0.19372468159638923, - 0.12868276451688443, - 0.08461848794600606, - 0.05505179766503515, - 0.03545037295484652, - 0.022464931565726712, - 0.013851316691061107, - 0.008172290245353086, - 0.004525067922560694, - 0.002299106142866939, - 0.0010553170863459296, - 4.292425672287436E-4, - 1.500874173984748E-4, - 4.367787680902291E-5 + 1.4165029012967847, + 1.103623895860091, + 0.8327337626254228, + 0.6106818097356347, + 0.43125464886569254, + 0.2984691201333978, + 0.20194133640489634, + 0.13396951775896548, + 0.08779204712814682, + 0.05681028045414311, + 0.03634547715991093, + 0.022880433521435452, + 0.014025753870832307, + 0.008237909470217934, + 0.0045469031945372445, + 0.0023053508790117144, + 0.0010568061417254037, + 4.295210459453282E-4, + 1.5012263320190344E-4, + 4.367914305900831E-5 ] }, "SA1P0": { "xs": [ -5.991464547107982, -5.585999438999818, - -5.181423615076537, + -5.181423615076538, -4.775958506968373, -4.374058465024705, -3.9633162998156966, -3.5613661338149765, - -3.1535563587475584, + -3.153556358747558, -2.7488721956224653, -2.3434070875143007, -1.9379419794061366, - -1.5324768712979722, + -1.532476871297972, -1.1270117631898076, -0.7215466550816433, - -0.31608154697347896, - 0.08617769624105241, + -0.3160815469734789, + 0.0861776962410524, 0.494696241836107, 0.9001613499442714, 1.3056264580524357, - 1.7119945007591924 + 1.7119945007591926 ], "ys": [ - 0.9325100071452752, - 0.6954852673807081, - 0.5015347246401772, - 0.34699112675366706, - 0.23109903974440474, - 0.14726413169910962, - 0.09275498067615105, - 0.057510240251391405, - 0.03561986618241648, - 0.021767159064577258, - 0.012914752382063832, - 0.00729818627623514, - 0.003850977745017842, - 0.0018566143796475624, - 7.980148609168511E-4, - 3.005088996697045E-4, - 9.404583654655203E-5, - 2.3919112611967835E-5, + 1.006534481140087, + 0.7550451246273431, + 0.5462617606792711, + 0.37828738937983447, + 0.25155705026574776, + 0.15954786002686006, + 0.099663904439175, + 0.061065439499448516, + 0.03730622208949512, + 0.022492325168624996, + 0.013193730639039976, + 0.0073921974541036745, + 0.003877912545537198, + 0.0018628826394743332, + 7.991185330105418E-4, + 3.0064756442050184E-4, + 9.405414536145298E-5, + 2.3919112611967832E-5, 4.347770805088602E-6, 6.504792547924437E-7 ] @@ -140,7 +140,7 @@ "SA5P0": { "xs": [ -6.908755779315721, - -6.502290170873972, + -6.502290170873973, -6.0968250627658085, -5.692842534617867, -5.286388795682763, @@ -161,24 +161,24 @@ 0.7929925155296614 ], "ys": [ - 0.3180631054709156, - 0.22754832272154957, - 0.1559815130802516, - 0.10254761825442882, - 0.06442660473012998, - 0.03891099020654898, - 0.02242826992039175, - 0.01244756305418766, - 0.006635648542112594, - 0.0033434928688918465, - 0.0015591950868602612, - 6.494478379314242E-4, + 0.33076083180119564, + 0.2352499440080847, + 0.1603465698610067, + 0.10483469308040093, + 0.06551041453631141, + 0.03937101794461602, + 0.022596837072806887, + 0.012500145909930111, + 0.006649031652235888, + 0.0033460293439095054, + 0.0015595102576016848, + 6.49465712841082E-4, 2.2955602096397197E-4, 6.743345969174902E-5, 1.4107940103572502E-5, 1.7831017390912254E-6, 6.069083084964396E-8, - 2.6456223770550034E-12, + 2.645622377055003E-12, 0.0, 0.0 ] diff --git a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json index ad4d16b5..b5fce91a 100644 --- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json +++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json @@ -24,25 +24,25 @@ ], "ys": [ 0.06706337553572043, - 0.05037806220344932, + 0.050378062203449314, 0.03719922471978215, - 0.026794031005342306, - 0.018746970969508933, - 0.012712151938191115, + 0.026794031005342302, + 0.01874697096950893, + 0.012712151938191113, 0.008353518506198363, 0.005296022471057729, - 0.003261606563947749, - 0.0019507198835891889, - 0.0011397558430489242, + 0.0032616065639477485, + 0.001950719883589189, + 0.001139755843048924, 6.393989099305387E-4, - 3.5100181124471906E-4, - 1.8327718036308208E-4, - 9.104313620576904E-5, - 4.1759071272016925E-5, - 1.7230241489243224E-5, - 6.140324663542108E-6, - 1.8481763641310853E-6, - 4.3186526226158E-7 + 3.510018112447191E-4, + 1.8327718036308205E-4, + 9.104313620576902E-5, + 4.175907127201692E-5, + 1.723024148924322E-5, + 6.1403246635421075E-6, + 1.8481763641310855E-6, + 4.3186526226157995E-7 ] }, "SA0P2": { @@ -69,23 +69,23 @@ 1.998773638612381 ], "ys": [ - 0.09488865686264786, + 0.09488865686264787, 0.07142935250259928, - 0.052144185778740734, - 0.0370104672048492, - 0.025161632635322485, - 0.016590529356261954, + 0.05214418577874073, + 0.037010467204849205, + 0.02516163263532249, + 0.016590529356261957, 0.010507901994347405, - 0.006379903621824479, - 0.003734773088754799, + 0.00637990362182448, + 0.003734773088754801, 0.0021048943620218287, - 0.0011455970237778136, + 0.0011455970237778139, 6.017031825734271E-4, - 3.043321945906516E-4, - 1.4742940893514811E-4, - 6.766736286448892E-5, + 3.0433219459065163E-4, + 1.474294089351481E-4, + 6.76673628644889E-5, 2.8822974741051487E-5, - 1.116847458720587E-5, + 1.1168474587205872E-5, 3.814864821186904E-6, 1.0955557115062982E-6, 2.521940203023574E-7 @@ -115,24 +115,24 @@ 1.7119945007591926 ], "ys": [ - 0.03724997679517307, - 0.025197627761164278, + 0.037249976795173084, + 0.025197627761164267, 0.016545166170479467, - 0.010478422473657784, - 0.006398719582310336, - 0.0036861943861440233, + 0.010478422473657783, + 0.006398719582310339, + 0.0036861943861440237, 0.0020428880891593454, 0.0010653000266227072, - 5.314802064582866E-4, - 2.5381175612992706E-4, - 1.1714840690502359E-4, - 5.249395547853695E-5, - 2.273902767444702E-5, + 5.314802064582867E-4, + 2.53811756129927E-4, + 1.1714840690502358E-4, + 5.2493955478536955E-5, + 2.2739027674447024E-5, 9.374040708161311E-6, - 3.584560686521532E-6, + 3.5845606865215333E-6, 1.245165127664063E-6, - 3.7009993388320097E-7, - 9.256392869200053E-8, + 3.7009993388320086E-7, + 9.256392869200052E-8, 1.8220182946108243E-8, 2.526951046843772E-9 ] @@ -162,16 +162,16 @@ ], "ys": [ 0.009105078248816451, - 0.00604713375485931, - 0.0038771392247031102, - 0.002382048087328629, - 0.0013854782283202484, - 7.639938794505865E-4, - 3.9469367415850983E-4, - 1.930848390146869E-4, + 0.006047133754859309, + 0.00387713922470311, + 0.0023820480873286286, + 0.0013854782283202482, + 7.639938794505864E-4, + 3.9469367415850994E-4, + 1.9308483901468685E-4, 8.967757468941447E-5, 3.944469705635338E-5, - 1.6579054588941997E-5, + 1.6579054588942E-5, 6.670431797815306E-6, 2.536241886577357E-6, 9.223947621517243E-7, @@ -179,7 +179,7 @@ 8.786184748774277E-8, 2.1686268097025456E-8, 4.335031954742629E-9, - 6.400005604787822E-10, + 6.400005604787821E-10, 6.29609898785406E-11 ] } diff --git a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json index df915870..45e8e552 100644 --- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json +++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json @@ -24,25 +24,25 @@ ], "ys": [ 0.041702878297629246, - 0.027999860664381163, + 0.027999860664381166, 0.018622016732886736, - 0.012216722657771654, - 0.00786104694416582, - 0.004902453843084027, - 0.002919744759981199, + 0.012216722657771652, + 0.007861046944165817, + 0.004902453843084026, + 0.0029197447599812, 0.0016346979956226896, - 8.710545446937529E-4, - 4.487312974921965E-4, + 8.71054544693753E-4, + 4.487312974921966E-4, 2.301053069150744E-4, - 1.1703475253037314E-4, - 6.0492081166323563E-5, - 3.0514422161491338E-5, + 1.1703475253037317E-4, + 6.049208116632358E-5, + 3.0514422161491335E-5, 1.4862010414055522E-5, 6.722743846396304E-6, - 2.740388825777928E-6, - 9.647166387976836E-7, - 2.8674117989622415E-7, - 6.608213293182679E-8 + 2.7403888257779274E-6, + 9.647166387976834E-7, + 2.867411798962241E-7, + 6.608213293182678E-8 ] }, "SA0P2": { @@ -69,26 +69,26 @@ 1.998773638612381 ], "ys": [ - 0.07035356097178067, - 0.04784399223358503, + 0.07035356097178065, + 0.047843992233585014, 0.031564298032944, - 0.020422965686821833, + 0.02042296568682184, 0.012798852440293428, 0.00787582769497913, 0.004651164686084313, 0.002588321710034833, - 0.0013489774476404775, - 6.548664433959994E-4, - 3.002385565734163E-4, - 1.32922630389979E-4, - 5.8220410314644466E-5, + 0.0013489774476404778, + 6.548664433959995E-4, + 3.0023855657341635E-4, + 1.3292263038997899E-4, + 5.822041031464445E-5, 2.5427216214895894E-5, 1.0908346345709488E-5, - 4.43835533259965E-6, - 1.6581550859325243E-6, - 5.472258576326105E-7, - 1.513136711217236E-7, - 3.323374066279564E-8 + 4.438355332599649E-6, + 1.6581550859325247E-6, + 5.472258576326106E-7, + 1.5131367112172358E-7, + 3.323374066279563E-8 ] }, "SA1P0": { @@ -116,21 +116,21 @@ ], "ys": [ 0.03255566645612381, - 0.02151020212944229, - 0.0139741017768922, - 0.008934005761347489, - 0.0056438236141667115, - 0.003431543440533277, - 0.0020051982646740315, - 0.0010731609305547017, - 5.171878948352438E-4, - 2.1716595316340057E-4, - 7.803988578521575E-5, - 2.3836210001930447E-5, + 0.021510202129442286, + 0.013974101776892199, + 0.008934005761347485, + 0.005643823614166712, + 0.0034315434405332774, + 0.002005198264674031, + 0.0010731609305547015, + 5.171878948352435E-4, + 2.1716595316340062E-4, + 7.803988578521573E-5, + 2.3836210001930444E-5, 6.352238357086237E-6, - 1.660401132012716E-6, - 4.705809136669604E-7, - 1.500191512453607E-7, + 1.6604011320127162E-6, + 4.7058091366696036E-7, + 1.5001915124536073E-7, 4.201119543219848E-8, 9.902698671396539E-9, 1.8284586509267848E-9, @@ -161,25 +161,25 @@ 0.7929925155296614 ], "ys": [ - 0.009807501481254085, + 0.009807501481254092, 0.006889606681525521, - 0.004864903738452631, - 0.003433817315555269, - 0.002368295991671235, - 0.0015587274702055865, - 9.426488331454825E-4, - 5.113133411337292E-4, - 2.4144672265999435E-4, - 9.600757053230157E-5, - 3.150008817845505E-5, - 8.282410529013183E-6, - 1.6817086235264384E-6, - 2.844566409412868E-7, + 0.00486490373845263, + 0.003433817315555268, + 0.002368295991671236, + 0.0015587274702055867, + 9.426488331454828E-4, + 5.113133411337293E-4, + 2.4144672265999446E-4, + 9.600757053230156E-5, + 3.1500088178455037E-5, + 8.282410529013187E-6, + 1.6817086235264381E-6, + 2.8445664094128684E-7, 4.2675750552406073E-8, 9.221309076283525E-9, - 2.2369977645348808E-9, - 4.6221963975729506E-10, - 7.421426153661487E-11, + 2.2369977645348804E-9, + 4.622196397572951E-10, + 7.42142615366149E-11, 8.501642510409975E-12 ] } diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json index 6dfda58c..0897778e 100644 --- a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json +++ b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json @@ -23,26 +23,26 @@ 1.6428726885203377 ], "ys": [ - 0.2006503738451669, - 0.17285537650655405, - 0.1457654538416142, - 0.11970493734951379, - 0.09559546868503915, - 0.07431105108583717, + 0.20065037384516696, + 0.17285537650655408, + 0.14576545384161418, + 0.1197049373495138, + 0.09559546868503914, + 0.07431105108583719, 0.05637516914066104, - 0.04170492687443072, + 0.041704926874430726, 0.03026024480656411, 0.021542917739092143, - 0.015118630486935571, + 0.015118630486935573, 0.01037144636466253, - 0.007087040937276325, - 0.00477936932637762, - 0.00319704838542429, - 0.0020655066039083165, + 0.007087040937276326, + 0.004779369326377619, + 0.0031970483854242902, + 0.002065506603908317, 0.0012334191212818094, 6.376596603888939E-4, 2.721137279990724E-4, - 8.87953578895489E-5 + 8.879535788954887E-5 ] }, "SA0P2": { @@ -69,26 +69,26 @@ 1.998773638612381 ], "ys": [ - 0.23218634433928192, - 0.2008615226729532, - 0.16932701256342775, - 0.13880118413487627, - 0.10954239712160338, - 0.08399889699793918, + 0.23218634433928198, + 0.20086152267295324, + 0.1693270125634278, + 0.13880118413487624, + 0.10954239712160337, + 0.08399889699793917, 0.062403831811478426, - 0.04498824304182709, + 0.04498824304182708, 0.031656814692440735, - 0.021750482043563533, + 0.021750482043563536, 0.014656504287886748, - 0.009747666241417543, - 0.006474381891500175, - 0.004350676075363791, - 0.0029619701046860658, - 0.001989807980551752, - 0.0012516569654339147, - 6.879341074423705E-4, - 3.0909617771927395E-4, - 1.0865839278701972E-4 + 0.00974766624141754, + 0.006474381891500176, + 0.0043506760753637885, + 0.002961970104686066, + 0.0019898079805517515, + 0.0012516569654339145, + 6.879341074423706E-4, + 3.090961777192741E-4, + 1.0865839278701978E-4 ] }, "SA1P0": { @@ -116,24 +116,24 @@ ], "ys": [ 0.11507181130182526, - 0.08671239044320493, + 0.08671239044320496, 0.0638047438548466, - 0.04583571789858301, + 0.045835717898583005, 0.032317843931113206, - 0.0221834868474096, + 0.022183486847409596, 0.015153193599852392, - 0.010261839081528164, - 0.007049903467049767, - 0.004977854045652164, - 0.0036543232616935784, - 0.0027656175291817064, - 0.002084668071994431, - 0.0014867464168478108, - 9.528119444413634E-4, + 0.010261839081528161, + 0.007049903467049766, + 0.004977854045652163, + 0.0036543232616935797, + 0.002765617529181706, + 0.00208466807199443, + 0.00148674641684781, + 9.528119444413632E-4, 5.304336113939782E-4, - 2.460779365675649E-4, - 9.448830400960893E-5, - 2.8867573307658098E-5, + 2.4607793656756486E-4, + 9.4488304009609E-5, + 2.88675733076581E-5, 6.7118167162917875E-6 ] }, @@ -162,25 +162,25 @@ ], "ys": [ 0.026315550077531773, - 0.018867827514008645, - 0.013462119866627412, - 0.009642188406180622, - 0.00698239339787513, - 0.0051897246111023984, - 0.0039817478361289585, - 0.0031799603781654416, - 0.0026135132170558993, - 0.0021426822813898996, - 0.0016867025169578099, - 0.001232128599609327, - 8.109480307289334E-4, - 4.7598798014628974E-4, - 2.3765962163560097E-4, - 1.0098613813945212E-4, - 3.50449016147373E-5, - 9.649118548509898E-6, - 1.969875750114485E-6, - 2.796733808344793E-7 + 0.01886782751400864, + 0.013462119866627414, + 0.009642188406180623, + 0.006982393397875128, + 0.005189724611102401, + 0.003981747836128958, + 0.003179960378165442, + 0.002613513217055899, + 0.0021426822813899013, + 0.00168670251695781, + 0.0012321285996093276, + 8.109480307289339E-4, + 4.759879801462898E-4, + 2.376596216356011E-4, + 1.0098613813945205E-4, + 3.5044901614737295E-5, + 9.649118548509896E-6, + 1.9698757501144844E-6, + 2.7967338083447933E-7 ] } } diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json index 7fdd7b08..a05b2749 100644 --- a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json +++ b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json @@ -23,26 +23,26 @@ 1.6428726885203377 ], "ys": [ - 0.06387385985841773, + 0.06387385985841774, 0.04878791170303394, - 0.03678543653898289, - 0.02719066798635275, + 0.0367854365389829, + 0.027190667986352758, 0.019636473198452138, - 0.013824775177858298, + 0.013824775177858295, 0.009478117307065536, - 0.00629095891722651, + 0.006290958917226509, 0.0040581532820187045, - 0.00253809916246455, - 0.0015449094160849203, - 8.995071698584922E-4, - 5.094077397915329E-4, - 2.7290947201117537E-4, - 1.382549156359038E-4, - 6.435096166114985E-5, - 2.684185151109541E-5, - 9.64642499646556E-6, + 0.0025380991624645494, + 0.0015449094160849201, + 8.995071698584924E-4, + 5.09407739791533E-4, + 2.729094720111754E-4, + 1.3825491563590375E-4, + 6.435096166114982E-5, + 2.6841851511095405E-5, + 9.646424996465562E-6, 2.9238846727448723E-6, - 6.877293996647995E-7 + 6.877293996647997E-7 ] }, "SA0P2": { @@ -69,26 +69,26 @@ 1.998773638612381 ], "ys": [ - 0.088973598361865, - 0.06757489032917961, + 0.08897359836186498, + 0.0675748903291796, 0.05000915421337383, - 0.03614151511983438, + 0.036141515119834385, 0.025154436608518314, 0.01706642902100955, - 0.011187217503172989, - 0.007068293069418349, + 0.01118721750317299, + 0.00706829306941835, 0.004321986639291746, - 0.002549194097731731, - 0.0014512879973572024, + 0.0025491940977317305, + 0.0014512879973572021, 7.955316758709134E-4, - 4.1834792018397775E-4, - 2.096649923516656E-4, + 4.183479201839777E-4, + 2.0966499235166555E-4, 9.898790045528424E-5, - 4.31113758495844E-5, + 4.311137584958441E-5, 1.6982402990994617E-5, 5.8698986859737056E-6, - 1.6999975885559915E-6, - 3.936420513636225E-7 + 1.699997588555992E-6, + 3.9364205136362245E-7 ] }, "SA1P0": { @@ -115,25 +115,25 @@ 1.7119945007591926 ], "ys": [ - 0.03767594095997617, - 0.025591509027051387, + 0.037675940959976166, + 0.025591509027051384, 0.01683872594726036, - 0.01066750275022048, + 0.010667502750220484, 0.006517520841055036, - 0.00377083886880126, - 0.0021152217262377596, - 0.0011300616573363708, - 5.858085901632641E-4, - 2.945282830553312E-4, - 1.4422010705798024E-4, - 6.853405664262613E-5, + 0.0037708388688012595, + 0.00211522172623776, + 0.0011300616573363706, + 5.858085901632643E-4, + 2.9452828305533125E-4, + 1.442201070579802E-4, + 6.853405664262614E-5, 3.1233127747528394E-5, - 1.3384657228636078E-5, - 5.263428989283832E-6, - 1.8642310318497476E-6, - 5.61631488856486E-7, + 1.3384657228636076E-5, + 5.263428989283831E-6, + 1.8642310318497474E-6, + 5.616314888564858E-7, 1.4169285173256064E-7, - 2.804795495077893E-8, + 2.8047954950778922E-8, 3.907069142607005E-9 ] }, @@ -162,24 +162,24 @@ ], "ys": [ 0.009471251328278642, - 0.006230820167790688, - 0.003938830466205204, - 0.0023829513072574655, - 0.001369093740576247, - 7.517310490805636E-4, - 3.914766016814823E-4, - 1.960391575075167E-4, - 9.4731533251493E-5, - 4.39801966900067E-5, - 1.9664700998704484E-5, + 0.006230820167790689, + 0.003938830466205205, + 0.002382951307257465, + 0.0013690937405762466, + 7.517310490805637E-4, + 3.9147660168148223E-4, + 1.9603915750751672E-4, + 9.473153325149301E-5, + 4.398019669000669E-5, + 1.966470099870448E-5, 8.413591229100446E-6, - 3.3757400573966482E-6, - 1.2792076376049025E-6, - 4.2870969867204753E-7, - 1.2819192077167398E-7, - 3.2137086588691815E-8, + 3.3757400573966487E-6, + 1.2792076376049023E-6, + 4.287096986720477E-7, + 1.2819192077167395E-7, + 3.213708658869183E-8, 6.497316746166965E-9, - 9.68926200208012E-10, + 9.689262002080116E-10, 9.608222097414862E-11 ] } diff --git a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json index 750495f7..68f57887 100644 --- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json +++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json @@ -121,7 +121,7 @@ 0.16518580611097067, 0.1048360169373159, 0.06322753117018583, - 0.03725731865189016, + 0.037257318651890164, 0.021195009656910922, 0.011846580279059597, 0.00646045788500985, @@ -163,16 +163,16 @@ "ys": [ 0.13217805298960006, 0.08963133100288148, - 0.05871322685852016, + 0.058713226858520165, 0.0371772372980239, 0.022673057835178038, - 0.013415003374422129, + 0.01341500337442213, 0.007619300962341073, 0.004144845979685093, 0.0021164811090285227, 9.827543889002197E-4, 4.041253014060403E-4, - 1.4229181689961567E-4, + 1.4229181689961562E-4, 4.0769986977574425E-5, 9.35193520330931E-6, 1.4048022505578046E-6, diff --git a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json index c29be333..efb39a13 100644 --- a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json +++ b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json @@ -23,7 +23,7 @@ 1.6428726885203377 ], "ys": [ - 0.17913734230734824, + 0.17913734230734826, 0.1357684181236626, 0.09990651881134907, 0.07130329144132078, diff --git a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json index 34c37208..84460a8c 100644 --- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json +++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json @@ -38,7 +38,7 @@ 0.0028729783810932594, 0.001236469287164289, 4.6079610718895874E-4, - 1.416167623453195E-4, + 1.4161676234531953E-4, 3.4670125479440184E-5, 6.4536118509542435E-6, 9.530449289578381E-7, @@ -76,7 +76,7 @@ 0.17579854693610053, 0.13811960066778456, 0.10414965265317788, - 0.07500154545047684, + 0.07500154545047683, 0.051580708007596364, 0.033727178511579844, 0.02094401529606365, @@ -85,7 +85,7 @@ 0.003472227178204358, 0.0016204772852677842, 6.708768822540561E-4, - 2.4196318167460428E-4, + 2.4196318167460433E-4, 7.459811256015455E-5, 1.911411101271039E-5, 4.1007022968721435E-6 @@ -124,14 +124,14 @@ 0.050097384327453795, 0.03304182675492651, 0.021073825668589168, - 0.01291452691757292, - 0.007554719328322312, - 0.004157152149866735, + 0.012914526917572916, + 0.007554719328322313, + 0.004157152149866734, 0.002105437800927276, 9.55353260170581E-4, - 3.7662159367333385E-4, + 3.7662159367333396E-4, 1.256055968956394E-4, - 3.2666235548366675E-5, + 3.266623554836667E-5, 6.178368401470126E-6, 6.708301323030964E-7, 2.236707262114731E-8 @@ -167,18 +167,18 @@ 0.03844117387366226, 0.026205285620643677, 0.01736442988634108, - 0.01114407007500165, + 0.011144070075001651, 0.0070048493817140445, 0.004313240054052287, 0.00256370077748051, - 0.0014387545485157426, - 7.365499477329721E-4, + 0.0014387545485157428, + 7.365499477329723E-4, 3.2961351437766544E-4, - 1.2767266449166014E-4, + 1.2767266449166022E-4, 3.943160472022289E-5, - 9.541232715611518E-6, - 1.5452131454874696E-6, - 1.1322120338908268E-7, + 9.54123271561152E-6, + 1.5452131454874693E-6, + 1.1322120338908269E-7, 2.9610242527464E-10, 4.37902639628605E-12 ] -- GitLab