From c0c4fe581ae19769ac0ff103029cc93c6a3934d5 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 3 May 2024 17:30:01 -0600
Subject: [PATCH 1/5] updated lib and conus version
---
gradle.properties | 2 +-
nshms.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 5ba9822a..ec117eb3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ micronautVersion = 3.2.3
micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.4.16
+nshmpLibVersion = 1.4.22
nshmpUtilsJavaVersion = 0.4.0
openApiVersion = 4.0.0
shadowVersion = 7.1.2
diff --git a/nshms.yml b/nshms.yml
index 8aabcfcc..d53f85e5 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -71,7 +71,7 @@ nshms:
# CONUS 2023 NSHM
-
repo: nshm-conus
- tag: 6.b.3
+ tag: 6.0.0
year: 2023
deployment:
baseHref: /ws/nshmp/conus-2023/dynamic
--
GitLab
From b514a8ae8f0d6913cb1646ee1d0e70819bec0b4e Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 3 May 2024 17:40:04 -0600
Subject: [PATCH 2/5] updated conus test results
---
.../e2e/nshm-conus-2023/BOSTON_MA.json | 178 +++++++++---------
.../e2e/nshm-conus-2023/CHICAGO_IL.json | 178 +++++++++---------
.../e2e/nshm-conus-2023/LOS_ANGELES_CA.json | 178 +++++++++---------
.../e2e/nshm-conus-2023/NEW_MADRID_MO.json | 178 +++++++++---------
.../e2e/nshm-conus-2023/NEW_YORK_NY.json | 178 +++++++++---------
.../e2e/nshm-conus-2023/RENO_NV.json | 174 ++++++++---------
.../nshm-conus-2023/SALT_LAKE_CITY_UT.json | 176 ++++++++---------
.../e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json | 174 ++++++++---------
.../e2e/nshm-conus-2023/SEATTLE_WA.json | 178 +++++++++---------
9 files changed, 796 insertions(+), 796 deletions(-)
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 c89b0188..ad4d16b5 100644
--- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.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.06599397975220576,
- 0.0495160162425674,
- 0.036513738982136494,
- 0.026258583569526418,
- 0.018339162919634246,
- 0.012411914456006224,
- 0.008141006833289569,
- 0.005152225174879873,
- 0.0031678998704058083,
- 0.0018917261792269337,
- 0.0011035470885633657,
- 6.179966567302161E-4,
- 3.385611975149566E-4,
- 1.7630584453206911E-4,
- 8.726172285630186E-5,
- 3.982648113280291E-5,
- 1.6325079063764054E-5,
- 5.769066788130917E-6,
- 1.7184900721224076E-6,
- 3.963193550050803E-7
+ 0.06706337553572043,
+ 0.05037806220344932,
+ 0.03719922471978215,
+ 0.026794031005342306,
+ 0.018746970969508933,
+ 0.012712151938191115,
+ 0.008353518506198363,
+ 0.005296022471057729,
+ 0.003261606563947749,
+ 0.0019507198835891889,
+ 0.0011397558430489242,
+ 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
]
},
"SA0P2": {
@@ -69,78 +69,78 @@
1.998773638612381
],
"ys": [
- 0.09353115905390529,
- 0.0703016736669049,
- 0.05123931616345851,
- 0.036305811456412915,
- 0.02463598560501443,
- 0.01621307835968738,
- 0.010249801865790505,
- 0.0062122987954390104,
- 0.003630754390360235,
- 0.0020431384223740237,
- 0.001110331693237283,
- 5.822894133817992E-4,
- 2.9401954680419504E-4,
- 1.4214673052602837E-4,
- 6.507484914740442E-5,
- 2.7625833026584582E-5,
- 1.065899008792829E-5,
- 3.622386410973509E-6,
- 1.0342006360285488E-6,
- 2.3647467423869639E-7
+ 0.09488865686264786,
+ 0.07142935250259928,
+ 0.052144185778740734,
+ 0.0370104672048492,
+ 0.025161632635322485,
+ 0.016590529356261954,
+ 0.010507901994347405,
+ 0.006379903621824479,
+ 0.003734773088754799,
+ 0.0021048943620218287,
+ 0.0011455970237778136,
+ 6.017031825734271E-4,
+ 3.043321945906516E-4,
+ 1.4742940893514811E-4,
+ 6.766736286448892E-5,
+ 2.8822974741051487E-5,
+ 1.116847458720587E-5,
+ 3.814864821186904E-6,
+ 1.0955557115062982E-6,
+ 2.521940203023574E-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.03781690942134724,
- 0.02560998712695722,
- 0.016835178417561717,
- 0.0106753179003393,
- 0.006527977980738499,
- 0.0037666741939616066,
- 0.0020910571328798203,
- 0.00109235908996311,
- 5.458772566494525E-4,
- 2.610498573544113E-4,
- 1.2062939801655834E-4,
- 5.41136475501873E-5,
- 2.347538999109399E-5,
- 9.699580588310414E-6,
- 3.7213621990011277E-6,
- 1.2984686317975073E-6,
- 3.882066000228317E-7,
- 9.7850454717942E-8,
- 1.946037843483608E-8,
- 2.742272834535854E-9
+ 0.03724997679517307,
+ 0.025197627761164278,
+ 0.016545166170479467,
+ 0.010478422473657784,
+ 0.006398719582310336,
+ 0.0036861943861440233,
+ 0.0020428880891593454,
+ 0.0010653000266227072,
+ 5.314802064582866E-4,
+ 2.5381175612992706E-4,
+ 1.1714840690502359E-4,
+ 5.249395547853695E-5,
+ 2.273902767444702E-5,
+ 9.374040708161311E-6,
+ 3.584560686521532E-6,
+ 1.245165127664063E-6,
+ 3.7009993388320097E-7,
+ 9.256392869200053E-8,
+ 1.8220182946108243E-8,
+ 2.526951046843772E-9
]
},
"SA5P0": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.00921320730094861,
- 0.006121721172229913,
- 0.003927784889616462,
- 0.0024158433781355324,
- 0.0014072769298912615,
- 7.774423342976145E-4,
- 4.024693099758765E-4,
- 1.9730634218575704E-4,
- 9.182408947706067E-5,
- 4.0465849036854006E-5,
- 1.703760017497274E-5,
- 6.866482223986136E-6,
- 2.616062277136032E-6,
- 9.542403834324575E-7,
- 3.118560745323649E-7,
- 9.181884057053902E-8,
- 2.284823926814979E-8,
- 4.620311222721341E-9,
- 6.936412711209974E-10,
- 7.028579358099718E-11
+ 0.009105078248816451,
+ 0.00604713375485931,
+ 0.0038771392247031102,
+ 0.002382048087328629,
+ 0.0013854782283202484,
+ 7.639938794505865E-4,
+ 3.9469367415850983E-4,
+ 1.930848390146869E-4,
+ 8.967757468941447E-5,
+ 3.944469705635338E-5,
+ 1.6579054588941997E-5,
+ 6.670431797815306E-6,
+ 2.536241886577357E-6,
+ 9.223947621517243E-7,
+ 3.00166724331702E-7,
+ 8.786184748774277E-8,
+ 2.1686268097025456E-8,
+ 4.335031954742629E-9,
+ 6.400005604787822E-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 009aceda..df915870 100644
--- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.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.040886254085173906,
- 0.027424345917626186,
- 0.018219034045095474,
- 0.011934422965670086,
- 0.007663011513102012,
- 0.004765114308889277,
- 0.0028282312853084666,
- 0.0015783077414236475,
- 8.390693640246431E-4,
- 4.318004979848099E-4,
- 2.214413110168021E-4,
- 1.1266780710891706E-4,
- 5.821356278132561E-5,
- 2.9316226798325768E-5,
- 1.4233176969030009E-5,
- 6.4074677021284365E-6,
- 2.5948292983347617E-6,
- 9.058302958854361E-7,
- 2.664550977482878E-7,
- 6.060200630189976E-8
+ 0.041702878297629246,
+ 0.027999860664381163,
+ 0.018622016732886736,
+ 0.012216722657771654,
+ 0.00786104694416582,
+ 0.004902453843084027,
+ 0.002919744759981199,
+ 0.0016346979956226896,
+ 8.710545446937529E-4,
+ 4.487312974921965E-4,
+ 2.301053069150744E-4,
+ 1.1703475253037314E-4,
+ 6.0492081166323563E-5,
+ 3.0514422161491338E-5,
+ 1.4862010414055522E-5,
+ 6.722743846396304E-6,
+ 2.740388825777928E-6,
+ 9.647166387976836E-7,
+ 2.8674117989622415E-7,
+ 6.608213293182679E-8
]
},
"SA0P2": {
@@ -69,78 +69,78 @@
1.998773638612381
],
"ys": [
- 0.06915547672860357,
- 0.046972964934891955,
- 0.030953931061635506,
- 0.020002703636453695,
- 0.012514413169193666,
- 0.007683322438550792,
- 0.004524345762442764,
- 0.002509560963076411,
- 0.001303814344569991,
- 6.31314376762435E-4,
- 2.8898318737977964E-4,
- 1.2787451423137356E-4,
- 5.600901093144431E-5,
- 2.444851739501035E-5,
- 1.0472190893854825E-5,
- 4.248516889956776E-6,
- 1.58075707954425E-6,
- 5.190573795746768E-7,
- 1.426765106031372E-7,
- 3.1124228394497636E-8
+ 0.07035356097178067,
+ 0.04784399223358503,
+ 0.031564298032944,
+ 0.020422965686821833,
+ 0.012798852440293428,
+ 0.00787582769497913,
+ 0.004651164686084313,
+ 0.002588321710034833,
+ 0.0013489774476404775,
+ 6.548664433959994E-4,
+ 3.002385565734163E-4,
+ 1.32922630389979E-4,
+ 5.8220410314644466E-5,
+ 2.5427216214895894E-5,
+ 1.0908346345709488E-5,
+ 4.43835533259965E-6,
+ 1.6581550859325243E-6,
+ 5.472258576326105E-7,
+ 1.513136711217236E-7,
+ 3.323374066279564E-8
]
},
"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.033248933109024846,
- 0.022004431105884844,
- 0.01431014775274047,
- 0.009151239631673426,
- 0.005779616772275172,
- 0.00351403260771589,
- 0.0020552936759178297,
- 0.0011024828423755126,
- 5.332796764095535E-4,
- 2.2502078443087164E-4,
- 8.132456018629307E-5,
- 2.4983602810937415E-5,
- 6.682951495042383E-6,
- 1.7449632407250266E-6,
- 4.909788509372823E-7,
- 1.5684348441413014E-7,
- 4.4159912147687756E-8,
- 1.0492474877263184E-8,
- 1.957656771069103E-9,
- 2.5802146447004877E-10
+ 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,
+ 6.352238357086237E-6,
+ 1.660401132012716E-6,
+ 4.705809136669604E-7,
+ 1.500191512453607E-7,
+ 4.201119543219848E-8,
+ 9.902698671396539E-9,
+ 1.8284586509267848E-9,
+ 2.3719411718866346E-10
]
},
"SA5P0": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.010005966930455426,
- 0.007020138549279935,
- 0.004946069582032203,
- 0.0034831512155612545,
- 0.002399129097465582,
- 0.0015793614229230985,
- 9.569588656999186E-4,
- 5.209847415833339E-4,
- 2.4735052236108E-4,
- 9.904665205541754E-5,
- 3.277868452186687E-5,
- 8.712990693707894E-6,
- 1.790453986052243E-6,
- 3.0534530225080447E-7,
- 4.5864222733130684E-8,
- 9.670711470276267E-9,
- 2.3562950445765526E-9,
- 4.914029457128014E-10,
- 7.997984106407279E-11,
- 9.381018392075353E-12
+ 0.009807501481254085,
+ 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,
+ 4.2675750552406073E-8,
+ 9.221309076283525E-9,
+ 2.2369977645348808E-9,
+ 4.6221963975729506E-10,
+ 7.421426153661487E-11,
+ 8.501642510409975E-12
]
}
}
diff --git a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
index a4a1ee92..8c5dbe23 100644
--- a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.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.9024014286415121,
- 0.7152812115910017,
- 0.5546053703562474,
- 0.4202062611924988,
- 0.31052775644621844,
- 0.22250842652867092,
- 0.15333292793832914,
- 0.1002475619887438,
- 0.062021164229324854,
- 0.03600061579107137,
- 0.019590522804469185,
- 0.009779695748976101,
- 0.004621183104687814,
- 0.002010382689719318,
- 7.962597777072058E-4,
- 2.6879474235276584E-4,
- 7.171139765481873E-5,
- 1.3578410116556566E-5,
- 1.5629304265358868E-6,
- 5.830091651054837E-8
+ 0.9006423367999974,
+ 0.7140190967650397,
+ 0.5540104749052568,
+ 0.4203468105998068,
+ 0.3113234570616327,
+ 0.22373649617895944,
+ 0.1546612997412612,
+ 0.10132964856636549,
+ 0.06267502352282558,
+ 0.03628326851808436,
+ 0.019672665418885047,
+ 0.00978853982246061,
+ 0.004615467341300654,
+ 0.0020052849866752168,
+ 7.932024294083828E-4,
+ 2.672610507615473E-4,
+ 7.112364974736323E-5,
+ 1.3412170955555731E-5,
+ 1.5341794402698253E-6,
+ 5.6621427993653757E-8
]
},
"SA0P2": {
@@ -69,78 +69,78 @@
1.998773638612381
],
"ys": [
- 1.0660888228644068,
- 0.8716730067978099,
- 0.6934801717332749,
- 0.5405326220075642,
- 0.40990321960704657,
- 0.30507938231502557,
- 0.2202337918399829,
- 0.1527245757695499,
- 0.10121006109591386,
- 0.06346997910945823,
- 0.03749768324889921,
- 0.020783058026570825,
- 0.010808157958241638,
- 0.005294118065393745,
- 0.0024377564292367812,
- 0.0010302190494455156,
- 3.8564882358079925E-4,
- 1.2133563966813449E-4,
- 2.959166719348735E-5,
- 5.041371572081886E-6
+ 1.0640617165179749,
+ 0.8699347573605192,
+ 0.692234774458914,
+ 0.5399434480564881,
+ 0.41004118245159016,
+ 0.30583251535686873,
+ 0.22136852725340972,
+ 0.1539223480215964,
+ 0.10217525292222196,
+ 0.0640636359932703,
+ 0.03777143760545701,
+ 0.020873391518941672,
+ 0.010824391659105571,
+ 0.005290495151516786,
+ 0.0024326603023826776,
+ 0.001026803255772261,
+ 3.8378304628023454E-4,
+ 1.2050795680267754E-4,
+ 2.9309321869642945E-5,
+ 4.968929038315209E-6
]
},
"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.784110167732982,
- 0.5971127127912483,
- 0.44000489121477754,
- 0.3131829193807278,
- 0.21562526351716427,
- 0.141239285165485,
- 0.08930378590735805,
- 0.05355145134039893,
- 0.03079990379511722,
- 0.016912072022014606,
- 0.008870177641666898,
- 0.004442400317639017,
- 0.002116697170663203,
- 9.438416520552268E-4,
- 3.819154343536784E-4,
- 1.3550505201544378E-4,
- 3.8845344810999264E-5,
- 8.454437599000299E-6,
- 1.1049521824670764E-6,
- 5.2588487621771735E-8
+ 0.7834145974754583,
+ 0.5970989418904843,
+ 0.4406001396307478,
+ 0.3142281932033276,
+ 0.21691469166553987,
+ 0.14254250302952898,
+ 0.09039834417206327,
+ 0.054299336282715244,
+ 0.03120886162520526,
+ 0.01708497845592722,
+ 0.008922251240191713,
+ 0.0044489268061327185,
+ 0.0021128432073482164,
+ 9.403202393622164E-4,
+ 3.800010067205398E-4,
+ 1.346451213810742E-4,
+ 3.8535958882355275E-5,
+ 8.358918768404667E-6,
+ 1.0859948521659746E-6,
+ 5.1172064901400866E-8
]
},
"SA5P0": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.2541901671759064,
- 0.18598536864775972,
- 0.13150834380027404,
- 0.08935335465026673,
- 0.05804675588087531,
- 0.03637970502839559,
- 0.021904398834717693,
- 0.012704001192508222,
- 0.0069832944154086165,
- 0.003542111298937448,
- 0.0016310730650602543,
- 6.735425535872206E-4,
- 2.4513236903154904E-4,
- 8.03508366264512E-5,
- 2.2497141682863387E-5,
- 5.4211128874109765E-6,
- 9.955933871382086E-7,
- 1.1798184600469259E-7,
- 6.032781739742643E-9,
- 3.1737259531833734E-14
+ 0.2556739904241974,
+ 0.1875598127726266,
+ 0.13305267768982718,
+ 0.09070933739486951,
+ 0.05906613401313761,
+ 0.037014073888960566,
+ 0.022217847374429785,
+ 0.012822059782020535,
+ 0.007012017938337139,
+ 0.0035421635515735994,
+ 0.0016274400113865431,
+ 6.719390330632763E-4,
+ 2.4494174597488975E-4,
+ 8.050672115201703E-5,
+ 2.2615406267025697E-5,
+ 5.458919366414978E-6,
+ 9.981531579391535E-7,
+ 1.1692631975501546E-7,
+ 5.887351944991533E-9,
+ 2.4982688465632896E-14
]
}
}
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 d560348e..6dfda58c 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
@@ -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.20082676064116867,
- 0.17303158482719158,
- 0.14594179639708083,
- 0.11988197257474567,
- 0.09577256744660781,
- 0.07448415764500858,
- 0.05653535014883011,
- 0.041839648477448414,
- 0.0303591809822878,
- 0.021603536983251646,
- 0.015147902209371051,
- 0.010380513858986464,
- 0.007086868639928331,
- 0.004776405847494422,
- 0.00319403366434947,
- 0.0020630322786084473,
- 0.0012314821193950326,
- 6.362959860235963E-4,
- 2.713314236000678E-4,
- 8.845979888500938E-5
+ 0.2006503738451669,
+ 0.17285537650655405,
+ 0.1457654538416142,
+ 0.11970493734951379,
+ 0.09559546868503915,
+ 0.07431105108583717,
+ 0.05637516914066104,
+ 0.04170492687443072,
+ 0.03026024480656411,
+ 0.021542917739092143,
+ 0.015118630486935571,
+ 0.01037144636466253,
+ 0.007087040937276325,
+ 0.00477936932637762,
+ 0.00319704838542429,
+ 0.0020655066039083165,
+ 0.0012334191212818094,
+ 6.376596603888939E-4,
+ 2.721137279990724E-4,
+ 8.87953578895489E-5
]
},
"SA0P2": {
@@ -69,78 +69,78 @@
1.998773638612381
],
"ys": [
- 0.23235672977120586,
- 0.20103085787724273,
- 0.16949594749416605,
- 0.1389712314357323,
- 0.10971503991301251,
- 0.08417324450282236,
- 0.06257442666659785,
- 0.04514436992110307,
- 0.03178577283279019,
- 0.021843269000236736,
- 0.014712774190862494,
- 0.009775248303873083,
- 0.006484422014715584,
- 0.004352494841555026,
- 0.0029609855726470814,
- 0.001988265434383021,
- 0.0012502056040323954,
- 6.867898974882983E-4,
- 3.08380318694836E-4,
- 1.0832182802102842E-4
+ 0.23218634433928192,
+ 0.2008615226729532,
+ 0.16932701256342775,
+ 0.13880118413487627,
+ 0.10954239712160338,
+ 0.08399889699793918,
+ 0.062403831811478426,
+ 0.04498824304182709,
+ 0.031656814692440735,
+ 0.021750482043563533,
+ 0.014656504287886748,
+ 0.009747666241417543,
+ 0.006474381891500175,
+ 0.004350676075363791,
+ 0.0029619701046860658,
+ 0.001989807980551752,
+ 0.0012516569654339147,
+ 6.879341074423705E-4,
+ 3.0909617771927395E-4,
+ 1.0865839278701972E-4
]
},
"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.11534974599388695,
- 0.08698148362667116,
- 0.06406292276167219,
- 0.046078192405115945,
- 0.03253637462327355,
- 0.02236669387714956,
- 0.015293415446741954,
- 0.010356860424666315,
- 0.007106470813094833,
- 0.005007065846783978,
- 0.003667414131534428,
- 0.002770848786775516,
- 0.002086773137749997,
- 0.0014878216919477938,
- 9.535157338758262E-4,
- 5.308929783756662E-4,
- 2.463295318863031E-4,
- 9.459966953144536E-5,
- 2.8905529125483268E-5,
- 6.721429379688254E-6
+ 0.11507181130182526,
+ 0.08671239044320493,
+ 0.0638047438548466,
+ 0.04583571789858301,
+ 0.032317843931113206,
+ 0.0221834868474096,
+ 0.015153193599852392,
+ 0.010261839081528164,
+ 0.007049903467049767,
+ 0.004977854045652164,
+ 0.0036543232616935784,
+ 0.0027656175291817064,
+ 0.002084668071994431,
+ 0.0014867464168478108,
+ 9.528119444413634E-4,
+ 5.304336113939782E-4,
+ 2.460779365675649E-4,
+ 9.448830400960893E-5,
+ 2.8867573307658098E-5,
+ 6.7118167162917875E-6
]
},
"SA5P0": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.02653824712720612,
- 0.019066553270647907,
- 0.013626789983486497,
- 0.00976641241039197,
- 0.00706601708351237,
- 0.00523951388261743,
- 0.004007441363707505,
- 0.003191472930812208,
- 0.0026180228562578227,
- 0.0021443231305726374,
- 0.0016874006667018072,
- 0.0012325536428221151,
- 8.112607839937964E-4,
- 4.762084654635112E-4,
- 2.3778952000443157E-4,
- 1.0104841608143454E-4,
- 3.5068623684891964E-5,
- 9.656025948555976E-6,
- 1.971220245968162E-6,
- 2.798557895371194E-7
+ 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
]
}
}
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 652a2f4f..7fdd7b08 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
@@ -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.06295212478082786,
- 0.048048458157482585,
- 0.03619161082348148,
- 0.0267152751305139,
- 0.019260736860335054,
- 0.013535182229688403,
- 0.009262342125760426,
- 0.006136637176633699,
- 0.003951706514772565,
- 0.0024672025970475927,
- 0.001499024950979399,
- 8.710019776437942E-4,
- 4.921002498934159E-4,
- 2.6283929164592823E-4,
- 1.326287127071161E-4,
- 6.14117930372459E-5,
- 2.544365025981951E-5,
- 9.066496305781538E-6,
- 2.719577797059732E-6,
- 6.313004310982962E-7
+ 0.06387385985841773,
+ 0.04878791170303394,
+ 0.03678543653898289,
+ 0.02719066798635275,
+ 0.019636473198452138,
+ 0.013824775177858298,
+ 0.009478117307065536,
+ 0.00629095891722651,
+ 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,
+ 2.9238846727448723E-6,
+ 6.877293996647995E-7
]
},
"SA0P2": {
@@ -69,78 +69,78 @@
1.998773638612381
],
"ys": [
- 0.0877697243193884,
- 0.06659157694814948,
- 0.04922579949927613,
- 0.03552861479492543,
- 0.024688518599665064,
- 0.01672083614564811,
- 0.010940274062286886,
- 0.006899372453907445,
- 0.004211132882578026,
- 0.0024795228150876546,
- 0.0014092415433829243,
- 7.711400309583004E-4,
- 4.047444862395124E-4,
- 2.0238516038224294E-4,
- 9.527876089291164E-5,
- 4.1346212984332834E-5,
- 1.6214324144157022E-5,
- 5.575162343216449E-6,
- 1.6050336029577986E-6,
- 3.691356182224788E-7
+ 0.088973598361865,
+ 0.06757489032917961,
+ 0.05000915421337383,
+ 0.03614151511983438,
+ 0.025154436608518314,
+ 0.01706642902100955,
+ 0.011187217503172989,
+ 0.007068293069418349,
+ 0.004321986639291746,
+ 0.002549194097731731,
+ 0.0014512879973572024,
+ 7.955316758709134E-4,
+ 4.1834792018397775E-4,
+ 2.096649923516656E-4,
+ 9.898790045528424E-5,
+ 4.31113758495844E-5,
+ 1.6982402990994617E-5,
+ 5.8698986859737056E-6,
+ 1.6999975885559915E-6,
+ 3.936420513636225E-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.03826246806230938,
- 0.02603046344860471,
- 0.017155400855241892,
- 0.010885390093212639,
- 0.006660097241570287,
- 0.003858088495130119,
- 0.002166326100789246,
- 0.0011583421935267531,
- 6.009032500164472E-4,
- 3.0233926709153145E-4,
- 1.481758729078501E-4,
- 7.050104808577863E-5,
- 3.2189928803146996E-5,
- 1.383209680626369E-5,
- 5.459529842118774E-6,
- 1.942839215034085E-6,
- 5.888734403531785E-7,
- 1.497447089129761E-7,
- 2.995182697021266E-8,
- 4.2393461421128455E-9
+ 0.03767594095997617,
+ 0.025591509027051387,
+ 0.01683872594726036,
+ 0.01066750275022048,
+ 0.006517520841055036,
+ 0.00377083886880126,
+ 0.0021152217262377596,
+ 0.0011300616573363708,
+ 5.858085901632641E-4,
+ 2.945282830553312E-4,
+ 1.4422010705798024E-4,
+ 6.853405664262613E-5,
+ 3.1233127747528394E-5,
+ 1.3384657228636078E-5,
+ 5.263428989283832E-6,
+ 1.8642310318497476E-6,
+ 5.61631488856486E-7,
+ 1.4169285173256064E-7,
+ 2.804795495077893E-8,
+ 3.907069142607005E-9
]
},
"SA5P0": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.009600199498981164,
- 0.006320598140568553,
- 0.003998495592416973,
- 0.0024209681163326084,
- 0.001392280599876287,
- 7.653511087722585E-4,
- 3.991002814434199E-4,
- 2.0013103147428787E-4,
- 9.684010210476127E-5,
- 4.501923579779381E-5,
- 2.0158227838894868E-5,
- 8.64004496540036E-6,
- 3.4752442404719263E-6,
- 1.3213285385796123E-6,
- 4.448966364141143E-7,
- 1.338527206430684E-7,
- 3.383715559062799E-8,
- 6.921729172485612E-9,
- 1.0496384684360477E-9,
- 1.071989454665421E-10
+ 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,
+ 8.413591229100446E-6,
+ 3.3757400573966482E-6,
+ 1.2792076376049025E-6,
+ 4.2870969867204753E-7,
+ 1.2819192077167398E-7,
+ 3.2137086588691815E-8,
+ 6.497316746166965E-9,
+ 9.68926200208012E-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 306029e2..750495f7 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.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.5758963591396192,
- 0.43670801070473725,
- 0.3240168617746965,
- 0.23415179633332647,
- 0.16457670202113264,
- 0.11233601961898793,
- 0.07425068674098803,
- 0.047028698362003726,
- 0.028531598635389184,
- 0.016477953524790336,
- 0.009071377180117614,
- 0.0046111976462253675,
- 0.002153196360499234,
- 8.583917263340775E-4,
- 2.829609950190527E-4,
- 7.206823692384048E-5,
- 1.3101124477648389E-5,
- 1.504931810870186E-6,
- 9.244920976047788E-8,
- 1.7576389971140777E-10
+ 0.5759488812809885,
+ 0.43669034520306105,
+ 0.3239717485648503,
+ 0.23410994397651663,
+ 0.16454729254995498,
+ 0.11231614140871908,
+ 0.07423598104706032,
+ 0.047016450934913356,
+ 0.028520713904029413,
+ 0.01646848410593042,
+ 0.009063958383589987,
+ 0.004606375355459705,
+ 0.0021506726596965,
+ 8.573845289984907E-4,
+ 2.8265647371447E-4,
+ 7.200328395578721E-5,
+ 1.3092323394251897E-5,
+ 1.5044787016428837E-6,
+ 9.243906168195743E-8,
+ 1.751638914731057E-10
]
},
"SA0P2": {
@@ -69,78 +69,78 @@
1.998773638612381
],
"ys": [
- 0.702104775280691,
- 0.5477985858587733,
- 0.41716835550529163,
- 0.31153345142843625,
- 0.22583847101507867,
- 0.1607373099038445,
- 0.11121095346437515,
- 0.07432781208642227,
- 0.04791702940189752,
- 0.029582710732423727,
- 0.01745189556422591,
- 0.009797183664117526,
- 0.0051856467450227,
- 0.0025285995398624,
- 0.001094392596047108,
- 4.013954784182032E-4,
- 1.2009475138515132E-4,
- 2.7568603956290765E-5,
- 4.349211800032327E-6,
- 4.049796750543507E-7
+ 0.7022250487110518,
+ 0.5478402873693544,
+ 0.417164648605072,
+ 0.311514286895385,
+ 0.2258192930260603,
+ 0.16072179443395085,
+ 0.11119829011068338,
+ 0.0743166436048623,
+ 0.04790656687614202,
+ 0.02957277227993147,
+ 0.017442864238390088,
+ 0.00978978540006853,
+ 0.005180473060853787,
+ 0.0025256312348164002,
+ 0.0010930361608658555,
+ 4.009158654941289E-4,
+ 1.1996795674835778E-4,
+ 2.7545881966179313E-5,
+ 4.346992548031103E-6,
+ 4.0503400293166174E-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.5037815068164847,
- 0.36232769044544194,
- 0.2502317877044603,
- 0.16527564110221518,
- 0.10491376344791659,
- 0.06328235572250315,
- 0.03729241696615875,
- 0.021216923098733832,
- 0.011860650539141315,
- 0.006469521752897596,
- 0.0033978185298613704,
- 0.0016693252761849414,
- 7.37847177944601E-4,
- 2.815028806357047E-4,
- 8.855042818298073E-5,
- 2.169395730571108E-5,
- 3.54265809194102E-6,
- 3.0728007273696624E-7,
- 5.0866458201725544E-9,
- 1.93222203900609E-12
+ 0.5038377721817138,
+ 0.36230381390205413,
+ 0.25015708080680293,
+ 0.16518580611097067,
+ 0.1048360169373159,
+ 0.06322753117018583,
+ 0.03725731865189016,
+ 0.021195009656910922,
+ 0.011846580279059597,
+ 0.00646045788500985,
+ 0.0033924089737458396,
+ 0.0016665475412011412,
+ 7.366743950300344E-4,
+ 2.8111038987820134E-4,
+ 8.845419309324E-5,
+ 2.1679438987802537E-5,
+ 3.5420623128566176E-6,
+ 3.0744838085829977E-7,
+ 5.107842683919048E-9,
+ 1.9228389699303515E-12
]
},
"SA5P0": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -161,24 +161,24 @@
0.7929925155296614
],
"ys": [
- 0.13233288451521713,
- 0.08977540213967225,
- 0.05882358655458601,
- 0.03724983826410473,
- 0.0227163228543992,
- 0.013440022854711936,
- 0.007633639812747502,
- 0.004152790339150027,
- 0.00212045052364047,
- 9.844000224349687E-4,
- 4.046507020147577E-4,
- 1.4240223337367506E-4,
- 4.077384817524468E-5,
- 9.34644799588954E-6,
- 1.4024619752347574E-6,
- 1.2316882994106377E-7,
- 4.464442556419103E-9,
- 5.182326631898767E-11,
+ 0.13217805298960006,
+ 0.08963133100288148,
+ 0.05871322685852016,
+ 0.0371772372980239,
+ 0.022673057835178038,
+ 0.013415003374422129,
+ 0.007619300962341073,
+ 0.004144845979685093,
+ 0.0021164811090285227,
+ 9.827543889002197E-4,
+ 4.041253014060403E-4,
+ 1.4229181689961567E-4,
+ 4.0769986977574425E-5,
+ 9.35193520330931E-6,
+ 1.4048022505578046E-6,
+ 1.2353523926293996E-7,
+ 4.461708487184851E-9,
+ 5.242230396864113E-11,
0.0,
0.0
]
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 4ae8a49e..c29be333 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
@@ -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.17804932760568043,
- 0.13481129138484363,
- 0.09912001157718145,
- 0.0707041991473213,
- 0.04910272275447791,
- 0.03327821957072737,
- 0.022001417177528085,
- 0.014130093536055805,
- 0.00895648847606198,
- 0.005713988835711515,
- 0.0037554311356734474,
- 0.002495579266978758,
- 0.0016173329462348075,
- 9.260672181584312E-4,
- 4.377752886751453E-4,
- 1.5963736753540306E-4,
- 4.264990056231934E-5,
- 7.423896387068807E-6,
- 7.201121825554799E-7,
- 2.2667892662628333E-8
+ 0.17913734230734824,
+ 0.1357684181236626,
+ 0.09990651881134907,
+ 0.07130329144132078,
+ 0.04952410842749165,
+ 0.033552010919702786,
+ 0.02216631422672736,
+ 0.014221790763013983,
+ 0.009004023091277832,
+ 0.005737050568805529,
+ 0.0037660651288834723,
+ 0.002500096638743556,
+ 0.0016190748699046514,
+ 9.265993573052953E-4,
+ 4.3788427014813865E-4,
+ 1.5964052839221907E-4,
+ 4.264228617866765E-5,
+ 7.421122726760181E-6,
+ 7.19501299751569E-7,
+ 2.2616262833951562E-8
]
},
"SA0P2": {
@@ -69,78 +69,78 @@
1.998773638612381
],
"ys": [
- 0.2273056192373788,
- 0.17877826308879446,
- 0.1356678153764279,
- 0.09986757362886715,
- 0.07079981073537762,
- 0.04921088287252879,
- 0.033380947918689514,
- 0.022067083018556838,
- 0.014301066499500267,
- 0.009157027514487454,
- 0.005912474193919543,
- 0.003912510945659108,
- 0.0026398288339377217,
- 0.0017407724252953987,
- 0.0010466432208707053,
- 5.346080756978021E-4,
- 2.2129469521516696E-4,
- 7.139049766403652E-5,
- 1.662103819762455E-5,
- 2.3872257929322637E-6
+ 0.228452193693167,
+ 0.17987062537206622,
+ 0.13663309030967175,
+ 0.1006555512012042,
+ 0.07138688333995924,
+ 0.04961436045911991,
+ 0.033635693410577136,
+ 0.022214963365735963,
+ 0.01438068164363171,
+ 0.009196835936420601,
+ 0.005931170696594445,
+ 0.003920860898603422,
+ 0.002643388564354666,
+ 0.0017421680148024723,
+ 0.0010470933046818896,
+ 5.346964959039087E-4,
+ 2.2128654283682777E-4,
+ 7.137461709106763E-5,
+ 1.6614017473564147E-5,
+ 2.3855648355002396E-6
]
},
"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.1457749149192624,
- 0.1051942632106557,
- 0.07377523675929343,
- 0.050359195314580635,
- 0.033670519261203014,
- 0.021793231508606188,
- 0.013952704422754418,
- 0.008781093265310977,
- 0.00558915486660228,
- 0.0036428412051353887,
- 0.0024237761778375545,
- 0.0015895088289442656,
- 9.714202171149326E-4,
- 5.226859798546034E-4,
- 2.3642848274539277E-4,
- 8.722037276861857E-5,
- 2.4290153114547387E-5,
- 4.6367018958989855E-6,
- 4.4454758065228954E-7,
- 1.3361540606233621E-8
+ 0.1451090511896964,
+ 0.10467066535095923,
+ 0.07338664713664103,
+ 0.05008674058169957,
+ 0.033489621141967116,
+ 0.02168155293356069,
+ 0.013887608499536097,
+ 0.008746183969761826,
+ 0.0055719072984710535,
+ 0.0036351748079633084,
+ 0.002420740435567291,
+ 0.0015883868459047863,
+ 9.709589742605207E-4,
+ 5.22445783725696E-4,
+ 2.36296784581689E-4,
+ 8.715838803274344E-5,
+ 2.4267585514281153E-5,
+ 4.631447104590021E-6,
+ 4.4388663370114974E-7,
+ 1.3355283894291156E-8
]
},
"SA5P0": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -161,25 +161,25 @@
0.7929925155296614
],
"ys": [
- 0.0460271728313632,
- 0.03337299070321494,
- 0.02364984596929688,
- 0.016305036812306675,
- 0.010882423497124953,
- 0.007102419653614212,
- 0.004548495316836788,
- 0.0028991581969824497,
- 0.0018255578782369417,
- 0.0011015485296465535,
- 6.133452925118181E-4,
- 3.027744347865482E-4,
- 1.2752100687508648E-4,
- 4.5784693825692186E-5,
- 1.283966202898652E-5,
- 2.8156379169367597E-6,
- 4.378979386447339E-7,
- 3.7800483363232443E-8,
- 9.625180707007092E-10,
+ 0.04583718047854257,
+ 0.03323354400368285,
+ 0.02355313646842241,
+ 0.016241625822620717,
+ 0.01084311866394619,
+ 0.007079123034079655,
+ 0.004535328481488352,
+ 0.0028919517997218337,
+ 0.0018216927776096297,
+ 0.0010995070091791743,
+ 6.122966264768967E-4,
+ 3.022762280094454E-4,
+ 1.2731644283757869E-4,
+ 4.571329917412236E-5,
+ 1.282110005660829E-5,
+ 2.812353567198677E-6,
+ 4.3753763894934663E-7,
+ 3.7783578417837754E-8,
+ 9.63624550723746E-10,
0.0
]
}
diff --git a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
index 2dedc649..9a188ea8 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.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.9383481323320757,
- 0.7390523768482087,
- 0.5627964770568757,
- 0.41384460537666956,
- 0.2951183765291972,
- 0.20545628554322426,
- 0.14050972162930606,
- 0.09406594261791489,
- 0.061523508139426766,
- 0.038703853535948095,
- 0.02306211765405425,
- 0.012420642934022442,
- 0.005944177013425149,
- 0.0023438054706417005,
- 7.320751296367926E-4,
- 1.661797539916622E-4,
- 2.3733810312619122E-5,
- 1.3637519359015107E-6,
- 1.175239071391906E-8,
- 2.588602412382956E-11
+ 0.93870421288294,
+ 0.7393225549644573,
+ 0.5629979152002532,
+ 0.4139924782328673,
+ 0.2952250840342243,
+ 0.20553322635612578,
+ 0.14056614584656502,
+ 0.09410730183626793,
+ 0.061552768109999476,
+ 0.03872311370525716,
+ 0.02307378092685641,
+ 0.012426964440033973,
+ 0.005947198352509523,
+ 0.0023449914722882136,
+ 7.324192330180353E-4,
+ 1.6624190285187244E-4,
+ 2.373419286516947E-5,
+ 1.3612533340354747E-6,
+ 1.1661969399102649E-8,
+ 2.57065935345566E-11
]
},
"SA0P2": {
@@ -69,78 +69,78 @@
1.998773638612381
],
"ys": [
- 1.105186444264793,
- 0.9047245484304951,
- 0.714744025341657,
- 0.546997755822552,
- 0.40271063499401516,
- 0.28989177892584883,
- 0.2037239893877545,
- 0.14017957748814378,
- 0.0948903653141086,
- 0.06276086748518236,
- 0.04015332394666482,
- 0.024367522547533004,
- 0.013637174084145737,
- 0.006794975297013088,
- 0.002900620049246257,
- 0.0010127375521486685,
- 2.766551097246086E-4,
- 5.473721307536004E-5,
- 6.2062973056638875E-6,
- 2.2239402021916294E-7
+ 1.1056162916945917,
+ 0.9050692119357047,
+ 0.7150121700035934,
+ 0.5472013204397734,
+ 0.40286062601092343,
+ 0.29000290604041573,
+ 0.20380874083080333,
+ 0.14024527926689084,
+ 0.09493946241547999,
+ 0.0627947167281171,
+ 0.0401747904831376,
+ 0.024380172386137915,
+ 0.013644102509157704,
+ 0.006798390721359549,
+ 0.0029020596908909796,
+ 0.0010132311791573004,
+ 2.767711862061153E-4,
+ 5.475591918385991E-5,
+ 6.204316708999662E-6,
+ 2.2133231196817714E-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.7380978654700251,
- 0.5446829559803509,
- 0.3882780266315755,
- 0.26859834279854655,
- 0.18205883783417204,
- 0.11978775591182694,
- 0.07793051728607309,
- 0.049250429318840334,
- 0.030369267986667357,
- 0.01800626428691472,
- 0.010097153845010632,
- 0.005212659562294559,
- 0.002389185797053447,
- 9.327503871755168E-4,
- 2.9569280246056746E-4,
- 7.19503902368207E-5,
- 1.056522123963837E-5,
- 5.827805191672568E-7,
- 4.900618906359252E-9,
- 4.2752033910510036E-11
+ 0.738380019804441,
+ 0.5448842925222466,
+ 0.3884169577028692,
+ 0.2686905888344553,
+ 0.18211713536738966,
+ 0.11982281847672546,
+ 0.07795286339873278,
+ 0.04926631684581611,
+ 0.030380975944306447,
+ 0.01801423119558757,
+ 0.010102037219031577,
+ 0.005215299706969481,
+ 0.0023904103153296555,
+ 9.332107782552981E-4,
+ 2.9581233070494976E-4,
+ 7.197226801761037E-5,
+ 1.055929501732967E-5,
+ 5.805498062701054E-7,
+ 4.862857760166867E-9,
+ 4.247905501824415E-11
]
},
"SA5P0": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -161,24 +161,24 @@
0.7929925155296614
],
"ys": [
- 0.19975804852619505,
- 0.14538909788131346,
- 0.10400307640456691,
- 0.07260105916563274,
- 0.04897274401246109,
- 0.03201273179114714,
- 0.020216517311188346,
- 0.012503128127985501,
- 0.007563700057139103,
- 0.004367402236019257,
- 0.0023268176863251258,
- 0.0010965177651704634,
- 4.348524528212359E-4,
- 1.4274115123127657E-4,
- 3.477749217799798E-5,
- 5.745950716089173E-6,
- 4.6551996044968885E-7,
- 1.0273248639993878E-8,
+ 0.19979240707856005,
+ 0.14538270881257082,
+ 0.1039802361122197,
+ 0.07258222824805818,
+ 0.04896536987308868,
+ 0.0320136548531451,
+ 0.02022020956516874,
+ 0.0125066131580363,
+ 0.007566480902756153,
+ 0.004369487773235049,
+ 0.002328057253341186,
+ 0.0010969786251271737,
+ 4.348917591925763E-4,
+ 1.4267056837862207E-4,
+ 3.471982208651822E-5,
+ 5.724895533671951E-6,
+ 4.6258031648876124E-7,
+ 1.0222199240583624E-8,
0.0,
0.0
]
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 c00b67b1..34c37208 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.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.3001540383616879,
- 0.25996804013534813,
- 0.21852973044382043,
- 0.17722215931380342,
- 0.13814440560161717,
- 0.10320898786594213,
- 0.07371091265962146,
- 0.049925877599589025,
- 0.032096466227447676,
- 0.01948344011231727,
- 0.011169175072030642,
- 0.00588601086153586,
- 0.00287600179390659,
- 0.0012382506230161731,
- 4.616461295239516E-4,
- 1.4192899171483836E-4,
- 3.475016883103188E-5,
- 6.464774248247943E-6,
- 9.534150265565325E-7,
- 9.671006675588189E-8
+ 0.30017362044878304,
+ 0.25997800600845655,
+ 0.2185317123099277,
+ 0.17721806033913506,
+ 0.13813633287164673,
+ 0.10319904403974295,
+ 0.07370084050017532,
+ 0.04991674839900401,
+ 0.03208863112112183,
+ 0.019476831278208893,
+ 0.011163678840654109,
+ 0.005881706171748754,
+ 0.0028729783810932594,
+ 0.001236469287164289,
+ 4.6079610718895874E-4,
+ 1.416167623453195E-4,
+ 3.4670125479440184E-5,
+ 6.4536118509542435E-6,
+ 9.530449289578381E-7,
+ 9.670999543375752E-8
]
},
"SA0P2": {
@@ -69,78 +69,78 @@
1.998773638612381
],
"ys": [
- 0.331622856285252,
- 0.29560208196419013,
- 0.2565338205218416,
- 0.21643446693258578,
- 0.1758014537132124,
- 0.1381263524209612,
- 0.10415840860866449,
- 0.07501061312549723,
- 0.05158880947038995,
- 0.033733596742758915,
- 0.02094857877622853,
- 0.012301182392538933,
- 0.006783792966915221,
- 0.003473159141698918,
- 0.0016209320643428167,
- 6.710682260221141E-4,
- 2.420292133154167E-4,
- 7.461578679920015E-5,
- 1.9117270857662606E-5,
- 4.100982884701552E-6
+ 0.33165085791451066,
+ 0.29562065155988015,
+ 0.25654382703670564,
+ 0.21643729363543543,
+ 0.17579854693610053,
+ 0.13811960066778456,
+ 0.10414965265317788,
+ 0.07500154545047684,
+ 0.051580708007596364,
+ 0.033727178511579844,
+ 0.02094401529606365,
+ 0.01229824713387367,
+ 0.006782067371922229,
+ 0.003472227178204358,
+ 0.0016204772852677842,
+ 6.708768822540561E-4,
+ 2.4196318167460428E-4,
+ 7.459811256015455E-5,
+ 1.911411101271039E-5,
+ 4.1007022968721435E-6
]
},
"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.2723316271520372,
- 0.22535953598922656,
- 0.17996213116527232,
- 0.13836979363296364,
- 0.1026914007724431,
- 0.07282824746890089,
- 0.05011926989783884,
- 0.03305816912308876,
- 0.021084933210515196,
- 0.012921430216815149,
- 0.007558665107152614,
- 0.00415923216270431,
- 0.0021064460405320427,
- 9.557962065453292E-4,
- 3.767931323139444E-4,
- 1.2566261899114284E-4,
- 3.2681242754494004E-5,
- 6.181223929813809E-6,
- 6.711347732593155E-7,
- 2.2378453810730706E-8
+ 0.2723408664079978,
+ 0.22535427295926413,
+ 0.17994497893495184,
+ 0.1383449186535374,
+ 0.10266367594604311,
+ 0.07280202264488655,
+ 0.050097384327453795,
+ 0.03304182675492651,
+ 0.021073825668589168,
+ 0.01291452691757292,
+ 0.007554719328322312,
+ 0.004157152149866735,
+ 0.002105437800927276,
+ 9.55353260170581E-4,
+ 3.7662159367333385E-4,
+ 1.256055968956394E-4,
+ 3.2666235548366675E-5,
+ 6.178368401470126E-6,
+ 6.708301323030964E-7,
+ 2.236707262114731E-8
]
},
"SA5P0": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.10100761994357677,
- 0.07526360103957089,
- 0.054587314877085076,
- 0.03847947914813511,
- 0.02623530957353106,
- 0.017385984037019908,
- 0.011158226218371469,
- 0.00701344195213696,
- 0.004318069667920408,
- 0.0025661941306192966,
- 0.001439929809553527,
- 7.370477823341765E-4,
- 3.297973882412485E-4,
- 1.2773213803038674E-4,
- 3.9447120140931075E-5,
- 9.544443903761026E-6,
- 1.5457202459085527E-6,
- 1.1327374185809158E-7,
- 2.972906707544361E-10,
- 4.389238001777539E-12
+ 0.1009630710371175,
+ 0.07521673628531,
+ 0.0545428545988607,
+ 0.03844117387366226,
+ 0.026205285620643677,
+ 0.01736442988634108,
+ 0.01114407007500165,
+ 0.0070048493817140445,
+ 0.004313240054052287,
+ 0.00256370077748051,
+ 0.0014387545485157426,
+ 7.365499477329721E-4,
+ 3.2961351437766544E-4,
+ 1.2767266449166014E-4,
+ 3.943160472022289E-5,
+ 9.541232715611518E-6,
+ 1.5452131454874696E-6,
+ 1.1322120338908268E-7,
+ 2.9610242527464E-10,
+ 4.37902639628605E-12
]
}
}
--
GitLab
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 3/5] 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
From d6fb6c8e99b0c99cd73ec3d889cd7096b8735ec7 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 3 May 2024 18:51:49 -0600
Subject: [PATCH 4/5] reverted test tolerance to 1e-10
---
.../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 81b33a0e..ce1afb1f 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -37,7 +37,6 @@ import gov.usgs.earthquake.nshmp.calc.Site;
import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Imt;
-
import io.swagger.v3.core.util.Yaml;
/**
@@ -48,7 +47,7 @@ class NshmTestUtils {
private static final Path DATA_PATH = Paths.get("src/test/resources/e2e");
- private static final double TOLERANCE = 1e-12;
+ private static final double TOLERANCE = 1e-10;
private static final Gson GSON = new GsonBuilder()
.setPrettyPrinting()
--
GitLab
From a99bb53e8383d00dc932937804a1f78f524e7ec4 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 3 May 2024 18:53:54 -0600
Subject: [PATCH 5/5] formatting
---
src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index ce1afb1f..8b32caf6 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -37,6 +37,7 @@ import gov.usgs.earthquake.nshmp.calc.Site;
import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Imt;
+
import io.swagger.v3.core.util.Yaml;
/**
--
GitLab