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 ba2e51d86bbc754e707e9c91d88d55690e7a6cfc..60295b233bc585d46134e7c229a27b68687a50c1 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -87,17 +87,17 @@ class NshmTests {
*/
public static void main(String[] args) throws IOException {
// run single model
- // NshmModel nshmModel =
- // NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
+ NshmModel nshmModel =
+ NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
+ NshmTestUtils.writeExpecteds(nshmModel);
+ nshmModel.exec.shutdown();
+
+ // for (Nshm nshm : NSHMS.values()) {
+ // /* Initialize and shut down executor to generate results. */
+ // NshmModel nshmModel = NshmTestUtils.loadModel(nshm);
// NshmTestUtils.writeExpecteds(nshmModel);
// nshmModel.exec.shutdown();
-
- for (Nshm nshm : NSHMS.values()) {
- /* Initialize and shut down executor to generate results. */
- NshmModel nshmModel = NshmTestUtils.loadModel(nshm);
- NshmTestUtils.writeExpecteds(nshmModel);
- nshmModel.exec.shutdown();
- }
+ // }
}
/**
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
index 9b047f707ab52c84e81c549333a3e520120c033f..bd295c0312bbd524b24fce5a12136583e11ba314 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
@@ -24,25 +24,25 @@
],
"ys": [
0.03140199836610397,
- 0.021117409797304226,
- 0.01379295178931493,
- 0.00869656700708949,
+ 0.021117409797304223,
+ 0.013792951789314932,
+ 0.008696567007089488,
0.005290805654625041,
- 0.003036490917270708,
+ 0.0030364909172707075,
0.0016751011556612925,
8.677373903714001E-4,
- 4.289188926721494E-4,
+ 4.289188926721495E-4,
2.0235316825357782E-4,
- 9.205602846076074E-5,
+ 9.205602846076073E-5,
4.063482489850078E-5,
- 1.7359710544267037E-5,
+ 1.7359710544267034E-5,
7.075729925264028E-6,
- 2.6818721948072718E-6,
- 9.250128128146017E-7,
- 2.7305393243278333E-7,
- 6.769575736079953E-8,
+ 2.681872194807273E-6,
+ 9.25012812814602E-7,
+ 2.730539324327833E-7,
+ 6.769575736079954E-8,
1.3129696503476157E-8,
- 1.7698286907721423E-9
+ 1.7698286907721421E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 0.005867292219110497,
- 0.003824832868466257,
- 0.0023929312222295933,
- 0.0014244814734809628,
- 7.967755787146476E-4,
+ 0.005867292219110499,
+ 0.0038248328684662566,
+ 0.002392931222229593,
+ 0.001424481473480963,
+ 7.967755787146474E-4,
4.198025397391885E-4,
- 2.0599827713582025E-4,
- 9.542841191828279E-5,
- 4.195397953754037E-5,
- 1.7519733455529052E-5,
- 7.015770739727138E-6,
- 2.6927344093994585E-6,
+ 2.059982771358202E-4,
+ 9.54284119182828E-5,
+ 4.195397953754035E-5,
+ 1.751973345552905E-5,
+ 7.015770739727137E-6,
+ 2.6927344093994568E-6,
9.68504940016099E-7,
- 3.290536380670676E-7,
+ 3.2905363806706766E-7,
9.720308639640623E-8,
- 2.499951673620781E-8,
- 5.155486497350212E-9,
+ 2.4999516736207815E-8,
+ 5.155486497350211E-9,
7.983811170654452E-10,
- 7.727267238902779E-11,
+ 7.727267238902777E-11,
3.0632279373181007E-12
]
},
@@ -115,23 +115,23 @@
1.6428726885203377
],
"ys": [
- 0.05768176631979705,
- 0.0430924372074033,
+ 0.057681766319797066,
+ 0.04309243720740332,
0.03158998092630394,
- 0.022537892785624517,
- 0.015579065356071974,
- 0.010411063715061494,
+ 0.022537892785624514,
+ 0.015579065356071977,
+ 0.010411063715061496,
0.006729305958030286,
- 0.004190647005685594,
+ 0.004190647005685595,
0.0025344410360458387,
- 0.001489394101283274,
+ 0.0014893941012832743,
8.561569042062332E-4,
- 4.728987737605025E-4,
+ 4.7289877376050247E-4,
2.5571611197859763E-4,
1.3131447973005453E-4,
6.397823652524017E-5,
- 2.8667301419849297E-5,
- 1.1501063261195743E-5,
+ 2.86673014198493E-5,
+ 1.150106326119574E-5,
3.961898044829674E-6,
1.1443125622382274E-6,
2.5335867375548424E-7
@@ -161,24 +161,24 @@
1.998773638612381
],
"ys": [
- 0.08723799512304442,
+ 0.08723799512304443,
0.06581562207023935,
0.04807392701104474,
0.03409402467179439,
0.023127784976379094,
- 0.01519225348628602,
- 0.009568028782612533,
- 0.005764951207487774,
- 0.0033438874658604564,
- 0.0018660267533230903,
- 0.0010059800226474966,
- 5.239362908329591E-4,
- 2.6305702100226733E-4,
+ 0.015192253486286018,
+ 0.009568028782612537,
+ 0.0057649512074877726,
+ 0.0033438874658604572,
+ 0.0018660267533230908,
+ 0.0010059800226474968,
+ 5.23936290832959E-4,
+ 2.630570210022674E-4,
1.2659826495025258E-4,
- 5.777116085974566E-5,
- 2.450126731406833E-5,
- 9.477521675844408E-6,
- 3.242723631229073E-6,
+ 5.7771160859745676E-5,
+ 2.4501267314068323E-5,
+ 9.477521675844412E-6,
+ 3.2427236312290734E-6,
9.362399575687823E-7,
2.1770787463930905E-7
]
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
index 341ec40b128989ff963a97ad05e1134f791f917e..bf0f8218bf90e15b9d838e0c68f59917ac1fd421 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.028716965168264,
- 0.01886487994515705,
+ 0.028716965168263994,
+ 0.018864879945157037,
0.012214410336495216,
0.007811378755969861,
- 0.004958072843068914,
- 0.0030430254157746547,
+ 0.004958072843068912,
+ 0.003043025415774655,
0.001801194832614685,
- 9.78138997366046E-4,
- 4.774219607796428E-4,
- 2.020054821950422E-4,
- 7.245783442942092E-5,
- 2.1673952969917548E-5,
- 5.473081124101165E-6,
- 1.3049230514184375E-6,
- 3.396231647344524E-7,
- 1.0683367558362431E-7,
- 2.9773479240922235E-8,
- 6.962943852677989E-9,
- 1.2649325781181002E-9,
- 1.5888452390126723E-10
+ 9.781389973660458E-4,
+ 4.7742196077964286E-4,
+ 2.0200548219504228E-4,
+ 7.245783442942089E-5,
+ 2.1673952969917555E-5,
+ 5.473081124101164E-6,
+ 1.3049230514184373E-6,
+ 3.3962316473445227E-7,
+ 1.068336755836243E-7,
+ 2.9773479240922238E-8,
+ 6.96294385267799E-9,
+ 1.2649325781181E-9,
+ 1.588845239012672E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.007107163927520146,
- 0.005044374961729104,
- 0.0036098092001682334,
- 0.002566612826496862,
+ 0.007107163927520147,
+ 0.005044374961729101,
+ 0.003609809200168233,
+ 0.0025666128264968625,
0.0017569962891242118,
0.0011261235004660468,
- 6.477313305370011E-4,
- 3.251738192982299E-4,
- 1.3834151213638156E-4,
- 4.821034174852281E-5,
- 1.3350914739802089E-5,
- 2.8151215514871247E-6,
+ 6.477313305370014E-4,
+ 3.2517381929822984E-4,
+ 1.3834151213638158E-4,
+ 4.8210341748522806E-5,
+ 1.3350914739802084E-5,
+ 2.815121551487124E-6,
4.3883529699940863E-7,
- 5.3884401669757356E-8,
- 9.528067482900411E-9,
- 2.381287271761181E-9,
- 5.049535398817942E-10,
+ 5.3884401669757375E-8,
+ 9.528067482900414E-9,
+ 2.3812872717611815E-9,
+ 5.049535398817941E-10,
8.505766114071679E-11,
- 9.735929496440572E-12,
- 5.151390743421167E-13
+ 9.73592949644057E-12,
+ 5.151390743421166E-13
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.0351216741448582,
+ 0.03512167414485821,
0.023211200244723885,
- 0.015217197102548959,
- 0.009865315238999507,
- 0.0062893816628032655,
- 0.0038894953821493623,
- 0.0022910218368709465,
- 0.0012601925559916993,
- 6.544817819640684E-4,
- 3.269742624513813E-4,
- 1.6306741803760654E-4,
- 8.137426381044411E-5,
- 4.161546426829107E-5,
- 2.080762388680752E-5,
- 1.001141506832018E-5,
- 4.44687071224383E-6,
- 1.7683274720331923E-6,
- 6.028249709072296E-7,
+ 0.015217197102548954,
+ 0.009865315238999509,
+ 0.006289381662803265,
+ 0.0038894953821493636,
+ 0.0022910218368709483,
+ 0.001260192555991699,
+ 6.54481781964068E-4,
+ 3.269742624513814E-4,
+ 1.630674180376065E-4,
+ 8.13742638104441E-5,
+ 4.1615464268291055E-5,
+ 2.0807623886807524E-5,
+ 1.0011415068320185E-5,
+ 4.446870712243829E-6,
+ 1.7683274720331918E-6,
+ 6.028249709072294E-7,
1.7201583835604052E-7,
- 3.7521157074011703E-8
+ 3.75211570740117E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.06640900091125866,
- 0.04481552596821446,
- 0.02929024731626321,
- 0.018772343014893264,
- 0.011679854583179558,
- 0.007173629474797435,
- 0.004252887054863991,
- 0.002382839867435222,
- 0.0012464263395316187,
- 6.014244596026235E-4,
- 2.7052055821085266E-4,
- 1.1629834415263532E-4,
+ 0.06640900091125869,
+ 0.044815525968214455,
+ 0.029290247316263212,
+ 0.018772343014893268,
+ 0.011679854583179553,
+ 0.007173629474797434,
+ 0.00425288705486399,
+ 0.0023828398674352216,
+ 0.0012464263395316189,
+ 6.01424459602623E-4,
+ 2.7052055821085276E-4,
+ 1.162983441526353E-4,
4.94038659917164E-5,
- 2.1122171127527715E-5,
- 8.964616707914122E-6,
+ 2.1122171127527722E-5,
+ 8.964616707914119E-6,
3.6358487148704516E-6,
- 1.360029335615549E-6,
- 4.51150734168798E-7,
- 1.258059605263143E-7,
- 2.7975224069953314E-8
+ 1.3600293356155483E-6,
+ 4.5115073416879813E-7,
+ 1.2580596052631427E-7,
+ 2.797522406995332E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
index 261bf9a7062ee602d28b153d0bf74b27a795afc6..7682dada668130d3fbb71e1970ca33a1e2082a93 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
@@ -24,25 +24,25 @@
],
"ys": [
0.09850176713422258,
- 0.07312729909012126,
- 0.05308397184730751,
+ 0.07312729909012128,
+ 0.053083971847307516,
0.03768446624790958,
- 0.02630808344095556,
- 0.01790809043786765,
- 0.012160029178287754,
- 0.008222905743560025,
- 0.005692879397239757,
- 0.0041037978211855425,
- 0.0031069691710146207,
- 0.0024215583101441906,
- 0.001854411189102515,
- 0.0013192248814640891,
+ 0.026308083440955563,
+ 0.017908090437867646,
+ 0.012160029178287752,
+ 0.008222905743560023,
+ 0.005692879397239758,
+ 0.004103797821185542,
+ 0.00310696917101462,
+ 0.00242155831014419,
+ 0.0018544111891025147,
+ 0.0013192248814640894,
8.294421357236949E-4,
- 4.468168964229126E-4,
- 1.9751472450576995E-4,
+ 4.468168964229127E-4,
+ 1.9751472450576986E-4,
7.082379863370093E-5,
- 1.9544561496314157E-5,
- 3.88357952865561E-6
+ 1.954456149631417E-5,
+ 3.883579528655611E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.020226805685536923,
- 0.014456993690890865,
- 0.010311275339298464,
+ 0.020226805685536926,
+ 0.014456993690890863,
+ 0.010311275339298471,
0.007410282372372471,
- 0.005420242154345005,
- 0.004112202045405046,
+ 0.005420242154345008,
+ 0.004112202045405045,
0.0032598918457679518,
- 0.0027056013898286713,
+ 0.002705601389828671,
0.002295628152726618,
- 0.001909728430262791,
- 0.0014958430610445947,
- 0.0010702048038474616,
- 6.794014527943354E-4,
- 3.777448399802698E-4,
- 1.7431530417571855E-4,
- 6.676688108364843E-5,
- 2.010923480249365E-5,
+ 0.0019097284302627905,
+ 0.0014958430610445951,
+ 0.0010702048038474618,
+ 6.794014527943355E-4,
+ 3.7774483998026975E-4,
+ 1.7431530417571852E-4,
+ 6.676688108364841E-5,
+ 2.0109234802493648E-5,
4.489749073748097E-6,
- 6.69242122394876E-7,
- 4.398566361226216E-8
+ 6.692421223948756E-7,
+ 4.398566361226214E-8
]
},
"Peak Ground Acceleration": {
@@ -116,25 +116,25 @@
],
"ys": [
0.1886054256128138,
- 0.16275334197403102,
- 0.13755397463891877,
+ 0.16275334197403096,
+ 0.1375539746389188,
0.11317989772270942,
- 0.09047602199495315,
- 0.07032705935347142,
+ 0.09047602199495318,
+ 0.07032705935347143,
0.05330210287581899,
- 0.03936547661127353,
- 0.028495426301947097,
+ 0.03936547661127352,
+ 0.028495426301947083,
0.02022888255013566,
0.014163984801627954,
0.00972284422318302,
0.00669613851628052,
- 0.004611542864451253,
- 0.003196105674453867,
- 0.0021516250421904116,
+ 0.004611542864451254,
+ 0.0031961056744538668,
+ 0.0021516250421904108,
0.0013255803040000025,
6.922864839444246E-4,
- 2.910424437563198E-4,
- 9.122232638554797E-5
+ 2.910424437563199E-4,
+ 9.1222326385548E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.22470370542893037,
- 0.1939084405485559,
- 0.16314578939913849,
+ 0.2247037054289303,
+ 0.193908440548556,
+ 0.16314578939913846,
0.1334721570174714,
0.10507322983912896,
- 0.08032395568597926,
- 0.059464867655382836,
- 0.0427127849672139,
- 0.029944507690815473,
- 0.020496635602782646,
- 0.013767300330333573,
- 0.009150639601752168,
- 0.006113656085200025,
+ 0.08032395568597925,
+ 0.05946486765538283,
+ 0.04271278496721389,
+ 0.02994450769081548,
+ 0.02049663560278264,
+ 0.013767300330333571,
+ 0.009150639601752166,
+ 0.006113656085200024,
0.004178588006264202,
0.0029323165891444636,
- 0.002053070561467998,
- 0.0013503046278127767,
+ 0.0020530705614679986,
+ 0.0013503046278127765,
7.713251130950329E-4,
- 3.563473983853019E-4,
- 1.2741054530630147E-4
+ 3.56347398385302E-4,
+ 1.274105453063015E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
index c3f7ca4c11e9f007e9c50610a170e5c3164bda50..6e4be2b9bc7b3361c9a13b281ca8ca6ad8656844 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.03173858014171648,
- 0.021339780972349124,
- 0.013891736155355614,
- 0.008702871323317573,
- 0.005257010814937974,
- 0.003005434084977267,
+ 0.03173858014171649,
+ 0.02133978097234913,
+ 0.013891736155355617,
+ 0.008702871323317575,
+ 0.005257010814937978,
+ 0.003005434084977266,
0.0016656813512850115,
8.787709846342374E-4,
- 4.4982230327846414E-4,
+ 4.498223032784642E-4,
2.233768838664674E-4,
- 1.0813164329058E-4,
+ 1.0813164329057997E-4,
5.087678520362409E-5,
- 2.3000914423316594E-5,
- 9.796473238506976E-6,
+ 2.300091442331659E-5,
+ 9.796473238506978E-6,
3.834226566465003E-6,
- 1.3526179722084802E-6,
- 4.0561593777847027E-7,
- 1.0159328170663664E-7,
- 1.983620005558785E-8,
- 2.6881101620063547E-9
+ 1.3526179722084804E-6,
+ 4.056159377784702E-7,
+ 1.0159328170663663E-7,
+ 1.9836200055587848E-8,
+ 2.6881101620063556E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.0061025079058511095,
- 0.003899067974125618,
+ 0.006102507905851109,
+ 0.0038990679741256196,
0.002382642687892061,
- 0.00138663763370032,
- 7.624471722655169E-4,
- 3.991905113937744E-4,
+ 0.0013866376337003201,
+ 7.624471722655167E-4,
+ 3.991905113937745E-4,
1.9772432210500465E-4,
9.426079143655626E-5,
4.351161422788669E-5,
- 1.9358718499170798E-5,
+ 1.9358718499170794E-5,
8.303052242177256E-6,
- 3.3925889700760563E-6,
- 1.2851573724623575E-6,
- 4.5199061406267797E-7,
+ 3.392588970076056E-6,
+ 1.2851573724623573E-6,
+ 4.5199061406267786E-7,
1.3712336694696286E-7,
3.595587559990004E-8,
7.519232998092494E-9,
- 1.1793297231150328E-9,
+ 1.1793297231150324E-9,
1.1536327397598236E-10,
- 4.625232359646364E-12
+ 4.625232359646363E-12
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.053422434955574166,
- 0.04020920495554081,
- 0.029855756453638558,
- 0.0217266204504069,
- 0.01545155301653882,
+ 0.05342243495557418,
+ 0.040209204955540825,
+ 0.029855756453638554,
+ 0.02172662045040689,
+ 0.015451553016538822,
0.010719211766649875,
- 0.0072464779449506024,
- 0.004745418573916583,
- 0.0030227167657870552,
- 0.001868387203005202,
+ 0.007246477944950602,
+ 0.004745418573916584,
+ 0.003022716765787055,
+ 0.0018683872030052023,
0.0011249844803513092,
- 6.479801770598047E-4,
- 3.627963118316445E-4,
- 1.9167743860676635E-4,
- 9.54296906591475E-5,
- 4.3456067606267236E-5,
- 1.764341472644732E-5,
+ 6.479801770598048E-4,
+ 3.6279631183164457E-4,
+ 1.9167743860676632E-4,
+ 9.542969065914748E-5,
+ 4.345606760626724E-5,
+ 1.7643414726447324E-5,
6.133767088181088E-6,
- 1.7849365683808554E-6,
- 3.978894235967971E-7
+ 1.7849365683808552E-6,
+ 3.978894235967972E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.08079525692428417,
- 0.060877287273066176,
- 0.044629057123178224,
- 0.031926302078010976,
- 0.021985425373050815,
- 0.014766339179658411,
+ 0.0807952569242842,
+ 0.06087728727306617,
+ 0.044629057123178204,
+ 0.03192630207801098,
+ 0.021985425373050812,
+ 0.014766339179658408,
0.009589023782390913,
- 0.00600763853559983,
- 0.0036471049278067936,
+ 0.006007638535599829,
+ 0.003647104927806794,
0.002138717977256336,
- 0.0012124137077166005,
- 6.626542322611687E-4,
- 3.4774996062009417E-4,
- 1.7398642420530911E-4,
- 8.203255085018509E-5,
+ 0.0012124137077166007,
+ 6.62654232261169E-4,
+ 3.477499606200942E-4,
+ 1.7398642420530906E-4,
+ 8.203255085018508E-5,
3.5712179306848327E-5,
- 1.4088660740274175E-5,
- 4.889784000529996E-6,
- 1.4261978938027703E-6,
- 3.339970262028064E-7
+ 1.408866074027418E-5,
+ 4.889784000529995E-6,
+ 1.4261978938027705E-6,
+ 3.339970262028063E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
index eacc54cb23d43bbfafd49b8391373f1ee7bc6fbb..36289ba69d6bb288efc5a15929167891bad00fe8 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
@@ -29,10 +29,10 @@
0.13624546359391296,
0.08506227171193938,
0.050930598806163255,
- 0.030158159091716916,
+ 0.030158159091716923,
0.017456250416622635,
0.010023495239063,
- 0.005643347529223006,
+ 0.0056433475292230065,
0.003057066831819484,
0.001541731293160766,
6.949253604013826E-4,
@@ -69,9 +69,9 @@
0.7929925155296614
],
"ys": [
- 0.11454312605927197,
+ 0.11454312605927199,
0.07774977737128347,
- 0.05111873766856917,
+ 0.05111873766856916,
0.032564050475628284,
0.020001855395237383,
0.01190823141989159,
@@ -82,7 +82,7 @@
3.5518422155049847E-4,
1.2455086316643806E-4,
3.5566198683860574E-5,
- 8.159419258458496E-6,
+ 8.159419258458494E-6,
1.2251021309367327E-6,
1.0484430247693849E-7,
3.920291953879094E-9,
@@ -163,7 +163,7 @@
"ys": [
0.6216532405946646,
0.46272644211304453,
- 0.33436224894384825,
+ 0.3343622489438483,
0.23714631355626206,
0.16431040627752377,
0.11340616476478484,
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
index 16ec0510c1ab2d230a160695fa605b09516051fd..1518a288168ae15eeeb327c75ad3f0597485e859 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
@@ -120,7 +120,7 @@
0.0861981278754339,
0.06177240482401042,
0.04303374915551782,
- 0.02929063040852448,
+ 0.029290630408524483,
0.01953817139931182,
0.012778226345862159,
0.008368974319197935,
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
index 397c69fe3c1235c10b0107378b51e75cd114d3d7..14e50836587fa5c2727c72892137f4da405e9652 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
@@ -77,7 +77,7 @@
0.030155590303921745,
0.01904155553388089,
0.011808350337992548,
- 0.00718083336322479,
+ 0.007180833363224791,
0.0041853531191431105,
0.0022659598771207212,
0.0010946630897325576,
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
index 263ffe8c41bd263ac868c1b2eac69af3a4ed7e13..f90a861955e3fbcc760b19823b65670050abb1e8 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
@@ -29,14 +29,14 @@
0.08910831230443658,
0.06333736560966338,
0.043093389988133696,
- 0.028580388460289777,
+ 0.028580388460289784,
0.01821735738362719,
- 0.01123227796892613,
+ 0.011232277968926126,
0.00660873652693667,
- 0.0036548832126260655,
+ 0.0036548832126260646,
0.001860604963475091,
- 8.510413673500248E-4,
- 3.3987935013381714E-4,
+ 8.510413673500249E-4,
+ 3.398793501338172E-4,
1.1435202682716995E-4,
3.114357779727954E-5,
6.088655157703063E-6,
@@ -69,22 +69,22 @@
0.7929925155296614
],
"ys": [
- 0.05804476459665961,
+ 0.0580447645966596,
0.041635106894742896,
0.02901816422632226,
0.019653876323849274,
- 0.012901472583868468,
- 0.008269880789363747,
+ 0.01290147258386847,
+ 0.008269880789363748,
0.005139400897507957,
0.0030906591428687662,
- 0.0017598187411684081,
- 9.163676483739542E-4,
- 4.241153350881833E-4,
- 1.692063074918274E-4,
+ 0.001759818741168408,
+ 9.163676483739544E-4,
+ 4.241153350881834E-4,
+ 1.6920630749182736E-4,
5.555488821491962E-5,
- 1.4850334291205167E-5,
- 2.8640101774040855E-6,
- 3.2858861718099857E-7,
+ 1.4850334291205169E-5,
+ 2.864010177404086E-6,
+ 3.285886171809985E-7,
6.7005888291790454E-9,
5.614225022270342E-12,
0.0,
@@ -131,8 +131,8 @@
0.0010395594741382048,
3.8214957132823714E-4,
1.1226052751016851E-4,
- 2.4609229150341752E-5,
- 3.5111346042809243E-6,
+ 2.4609229150341756E-5,
+ 3.511134604280924E-6,
2.8182370150762684E-7,
6.626616132457025E-9
]
@@ -167,17 +167,17 @@
0.18425987035877295,
0.1485658072494233,
0.11586814527240913,
- 0.08674776317270892,
+ 0.08674776317270891,
0.06207341639858485,
- 0.04249817002030045,
+ 0.042498170020300444,
0.027752312154425564,
- 0.017285454796169643,
+ 0.017285454796169646,
0.010223972209830248,
- 0.005694323318959238,
+ 0.005694323318959239,
0.0029419321920128197,
- 0.001376805535864566,
+ 0.0013768055358645659,
5.636744379753912E-4,
- 1.9616835926077882E-4,
+ 1.9616835926077877E-4,
5.592130460225895E-5,
1.22149525135547E-5,
1.9287484178736967E-6