diff --git a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
similarity index 80%
rename from src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-ANCHORAGE_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
index 14c72f7333f748d96ff0047ee7bbb52a30451efa..ce8d5eccf4e91405438b36aa6c80456ededdec8e 100644
--- a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
@@ -24,23 +24,23 @@
],
"ys": [
31.582813479978164,
- 22.540333643877755,
- 15.474210100724964,
- 10.1828284174066,
+ 22.54033364387775,
+ 15.474210100724962,
+ 10.182828417406599,
6.449603153163436,
3.874829200208182,
- 2.2578315032412433,
+ 2.2578315032412437,
1.2502702512704735,
- 0.6635952894157523,
+ 0.6635952894157522,
0.33280836493445576,
0.15563831840158654,
0.06651470349199638,
- 0.025334175824444916,
+ 0.02533417582444492,
0.008344260242984129,
0.002281234081363036,
4.905099541703147E-4,
7.106680468777945E-5,
- 9.366482156055953E-6,
+ 9.366482156055951E-6,
1.6221817886511806E-6,
3.9226735161194594E-8
]
@@ -69,21 +69,21 @@
0.7929925155296614
],
"ys": [
- 4.713651705544554,
- 2.977116760392886,
- 1.808059897986671,
+ 4.713651705544555,
+ 2.9771167603928865,
+ 1.8080598979866713,
1.049232189094306,
- 0.5745133346292347,
- 0.2965581079080615,
+ 0.5745133346292348,
+ 0.2965581079080614,
0.14114739956608777,
- 0.061679283003177494,
- 0.024321679600937018,
- 0.008469514908333564,
- 0.0026380884660043603,
- 7.771803183244354E-4,
+ 0.0616792830031775,
+ 0.02432167960093702,
+ 0.008469514908333562,
+ 0.0026380884660043595,
+ 7.771803183244353E-4,
2.4109621062432486E-4,
8.540282815765788E-5,
- 2.7739346926905467E-5,
+ 2.773934692690547E-5,
7.245217414287302E-6,
1.0985610862830077E-6,
1.1695491939047677E-8,
@@ -116,22 +116,22 @@
],
"ys": [
46.33660845379568,
- 35.522802618415156,
+ 35.52280261841515,
26.460679996194,
- 19.041804093767503,
+ 19.0418040937675,
13.188706864561727,
8.757919192102062,
5.55528392890878,
3.333708291389453,
1.8983397739576513,
- 1.021389293060455,
+ 1.0213892930604547,
0.5207239096916852,
0.2442406254825674,
0.10685463572633691,
0.04138335479680251,
0.014026251993902823,
0.003932391972808894,
- 8.50435333719899E-4,
+ 8.504353337198989E-4,
1.196312819651676E-4,
7.655134432772623E-6,
4.304490387327915E-7
@@ -163,24 +163,24 @@
"ys": [
60.119622521836234,
48.04425720405304,
- 37.17240663973347,
+ 37.17240663973346,
27.9717157456693,
- 20.24507310949916,
+ 20.245073109499156,
14.233013615251446,
- 9.614647498486521,
- 6.202530152633507,
- 3.8247549106886582,
+ 9.61464749848652,
+ 6.202530152633508,
+ 3.824754910688659,
2.2450721351219647,
1.2557452464723764,
0.6677198016325505,
- 0.3357788770172045,
- 0.1580226275680916,
+ 0.33577887701720444,
+ 0.15802262756809157,
0.06845320087983027,
- 0.026612603647860913,
- 0.00909621495431155,
- 0.0026387580725377403,
- 6.046929677379726E-4,
- 9.76805788912384E-5
+ 0.026612603647860916,
+ 0.009096214954311552,
+ 0.0026387580725377407,
+ 6.046929677379725E-4,
+ 9.768057889123841E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
similarity index 82%
rename from src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-FAIRBANKS_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
index bdbc6ae46e43c474a3a60e53f1ee70641607ff19..b3d3bf5b9e93289484cba6d5495609c54d7ec873 100644
--- a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
@@ -23,25 +23,25 @@
1.7119945007591926
],
"ys": [
- 9.45211495358342,
+ 9.452114953583418,
6.706211439845269,
4.588978464279589,
- 3.0086416270027048,
- 1.888824385638276,
- 1.1129215358345805,
+ 3.0086416270027057,
+ 1.8888243856382763,
+ 1.1129215358345803,
0.6279206376020909,
0.332220059774106,
0.16720102553008417,
0.07959344247355069,
- 0.03570406362909776,
- 0.014866442273198567,
+ 0.035704063629097754,
+ 0.014866442273198568,
0.005594983703070449,
0.001829808225027442,
4.919055822903513E-4,
1.0079740988490108E-4,
1.2471146653182707E-5,
- 7.02828607991142E-7,
- 1.1301945596475976E-8,
+ 7.028286079911419E-7,
+ 1.1301945596475977E-8,
0.0
]
},
@@ -71,21 +71,21 @@
"ys": [
1.9184256285352985,
1.2370238558137503,
- 0.7559151793391216,
+ 0.7559151793391217,
0.43656870088267014,
0.23723764134229494,
0.12274497208407278,
0.06008774189656887,
0.028081099253699622,
- 0.01234281356824203,
- 0.004923500549112307,
+ 0.012342813568242031,
+ 0.004923500549112306,
0.001726822893898249,
5.104323001168673E-4,
- 1.1878210581315675E-4,
+ 1.1878210581315673E-4,
2.0703558458760174E-5,
2.229665505804166E-6,
- 1.6009809951065922E-7,
- 3.0216427277983052E-9,
+ 1.600980995106592E-7,
+ 3.0216427277983056E-9,
0.0,
0.0,
0.0
@@ -115,10 +115,10 @@
1.6428726885203377
],
"ys": [
- 13.284064126608069,
- 9.853308437791231,
- 7.116796195810493,
- 4.9836861373184576,
+ 13.284064126608067,
+ 9.853308437791233,
+ 7.116796195810492,
+ 4.983686137318458,
3.3755093861650907,
2.2042574688021577,
1.3827750966815877,
@@ -128,12 +128,12 @@
0.1266282126160816,
0.05844529093292019,
0.024745808652838867,
- 0.008960497515163375,
+ 0.008960497515163373,
0.0026810937680349133,
6.060577052384319E-4,
- 9.024933719464242E-5,
- 6.0419769412494385E-6,
- 9.937964515447328E-8,
+ 9.024933719464243E-5,
+ 6.041976941249439E-6,
+ 9.93796451544733E-8,
0.0
]
},
@@ -162,24 +162,24 @@
],
"ys": [
17.300398191221607,
- 13.307293930796154,
- 9.902232049229976,
- 7.181330544933178,
- 5.023882976102354,
+ 13.307293930796153,
+ 9.902232049229973,
+ 7.181330544933179,
+ 5.023882976102353,
3.432899618436824,
2.265573659612581,
1.4342768435263218,
0.8702393842451819,
0.5021655036586723,
- 0.27472584746977935,
+ 0.2747258474697794,
0.14154536651264943,
0.06797544452596316,
- 0.0298631583102091,
+ 0.029863158310209095,
0.011642033780539348,
0.003845862387601881,
0.0010250902378172331,
2.0133713527376628E-4,
- 2.269066609619647E-5,
+ 2.2690666096196468E-5,
8.717032628046811E-7
]
}
diff --git a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
similarity index 84%
rename from src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-JUNEAU_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
index 7d8007c140107161852d63bc7f86428c2a9532f9..be87bc56bb1f6eb29871bb34122476e4745712dc 100644
--- a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
@@ -23,7 +23,7 @@
1.7119945007591926
],
"ys": [
- 4.591371937330782,
+ 4.5913719373307815,
3.1877577576389777,
2.097780831337861,
1.2957406821661408,
@@ -31,11 +31,11 @@
0.38952695598943826,
0.18714214109949412,
0.08044324750221588,
- 0.031642790756942145,
+ 0.03164279075694215,
0.011505242206800674,
- 0.0039927423287999,
- 0.0013499251795955985,
- 4.410966460474657E-4,
+ 0.003992742328799899,
+ 0.0013499251795955987,
+ 4.410966460474658E-4,
1.331099451711727E-4,
3.451133263715693E-5,
6.964165264154167E-6,
@@ -71,21 +71,21 @@
"ys": [
1.0253453315814594,
0.6496593903800941,
- 0.3831032756365199,
+ 0.38310327563652,
0.20845682337708707,
- 0.10339733714093748,
+ 0.10339733714093746,
0.04697449191854783,
0.01924142141387398,
- 0.007176804937656805,
+ 0.007176804937656804,
0.002418954964373144,
- 7.206937620110931E-4,
- 1.8814545129396007E-4,
- 4.2085742412970904E-5,
- 8.17630777390981E-6,
+ 7.20693762011093E-4,
+ 1.8814545129396004E-4,
+ 4.208574241297092E-5,
+ 8.176307773909808E-6,
1.352471640818951E-6,
1.5251255599794662E-7,
1.0827724111704109E-8,
- 2.018781241215586E-10,
+ 2.0187812412155862E-10,
0.0,
0.0,
0.0
@@ -116,21 +116,21 @@
],
"ys": [
6.068978404417162,
- 4.37287758772108,
+ 4.372877587721081,
2.96145914131037,
- 1.870504492866647,
+ 1.8705044928666466,
1.0987647948608863,
- 0.5997918227238852,
- 0.3047471478385926,
+ 0.5997918227238853,
+ 0.30474714783859264,
0.143437938591774,
0.06373152535013737,
0.027152772561542995,
- 0.01141099329902446,
- 0.004620895751111435,
+ 0.011410993299024457,
+ 0.004620895751111436,
0.001815109039587635,
6.31024145453754E-4,
- 1.846506962427567E-4,
- 4.119810433576226E-5,
+ 1.8465069624275671E-4,
+ 4.119810433576225E-5,
6.093004688366109E-6,
4.066762292155661E-7,
6.639809776402779E-9,
@@ -171,14 +171,14 @@
0.30211681938077767,
0.14566157672805446,
0.06635479340806372,
- 0.029195930933663506,
+ 0.029195930933663503,
0.012621055900268078,
- 0.005362098833654413,
+ 0.005362098833654412,
0.0021860669874765844,
- 8.176233092299378E-4,
+ 8.17623309229938E-4,
2.638499963322621E-4,
6.926088859606785E-5,
- 1.345966118871797E-5,
+ 1.3459661188717969E-5,
1.5087889923811794E-6,
5.8458404871550405E-8
]
diff --git a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
similarity index 79%
rename from src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-KODIAK_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
index fb11c0dcb72b47294f9acd6b2d755f113dc60208..1504167f6d312e13dc6c5ccb7495fa819b77f383 100644
--- a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
@@ -24,23 +24,23 @@
],
"ys": [
26.546661954616766,
- 17.45965029862474,
- 11.084965414334416,
- 6.7957695662611854,
- 4.04180974836993,
+ 17.459650298624737,
+ 11.084965414334418,
+ 6.795769566261186,
+ 4.041809748369929,
2.284910900383992,
1.2521375077588737,
- 0.647565642410389,
- 0.3187494553964873,
- 0.1474680499726443,
- 0.063745608493643,
- 0.025567265722348704,
- 0.00947305155343496,
- 0.0032435866327250426,
- 0.0010340415093725679,
- 3.127599718753763E-4,
+ 0.6475656424103889,
+ 0.31874945539648736,
+ 0.14746804997264432,
+ 0.06374560849364301,
+ 0.0255672657223487,
+ 0.009473051553434959,
+ 0.003243586632725043,
+ 0.0010340415093725676,
+ 3.1275997187537626E-4,
8.594852635443768E-5,
- 2.1434933824452503E-5,
+ 2.1434933824452506E-5,
4.196826749744855E-6,
1.8727466634359004E-7
]
@@ -73,16 +73,16 @@
2.364379185902818,
1.3821499030867548,
0.7633730877420555,
- 0.3928761374343867,
+ 0.39287613743438665,
0.18898207211847512,
- 0.08390418539943266,
+ 0.08390418539943265,
0.03503544780269543,
0.013992259926570478,
- 0.005483373586317797,
- 0.0022201719811300678,
- 9.498255878361636E-4,
- 4.09990816686342E-4,
- 1.668092721513497E-4,
+ 0.005483373586317798,
+ 0.002220171981130068,
+ 9.498255878361635E-4,
+ 4.099908166863419E-4,
+ 1.6680927215134974E-4,
5.663555747494913E-5,
1.5303011320298508E-5,
2.445330361266734E-6,
@@ -115,25 +115,25 @@
1.6428726885203377
],
"ys": [
- 38.17234655735215,
- 26.491016063791424,
+ 38.17234655735214,
+ 26.49101606379142,
17.663262208614288,
- 11.31146579184919,
+ 11.311465791849193,
6.988262252201193,
4.17945057323202,
2.4210383483389335,
1.3446006826080403,
- 0.7170897677723415,
+ 0.7170897677723416,
0.36421959456743086,
0.17622080748206914,
0.07866237753719352,
0.03299438003037053,
- 0.012420344249091964,
- 0.00420399993729522,
+ 0.012420344249091962,
+ 0.004203999937295219,
0.0012386815209033527,
3.129627579643493E-4,
- 6.605058658545652E-5,
- 1.195872499404559E-5,
+ 6.605058658545654E-5,
+ 1.1958724994045592E-5,
1.666631671207467E-6
]
},
@@ -166,21 +166,21 @@
28.30171628879847,
19.139647394512128,
12.347254701618091,
- 7.7700727484155845,
+ 7.770072748415585,
4.738914537317213,
2.7948688831579833,
1.5979478629398678,
0.8795385346624696,
- 0.46471970069090907,
+ 0.464719700690909,
0.23411222392624056,
- 0.11152929527402433,
+ 0.11152929527402436,
0.049726179214811754,
0.02050447915506657,
- 0.007703528112893126,
+ 0.0077035281128931266,
0.002629422657576131,
8.134129400120383E-4,
- 2.2596862585578322E-4,
- 5.6896530332304675E-5
+ 2.2596862585578324E-4,
+ 5.689653033230468E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
similarity index 81%
rename from src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-VALDEZ_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
index bba842717e324e69765bfebed09e6559dd230971..295cf0b5cebb329c11e5b382dd7cbd4eaeb3bf31 100644
--- a/src/test/resources/e2e/nshm-alaska-3.a.0/nshm-alaska-3.a.0-2023-VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
@@ -23,22 +23,22 @@
1.7119945007591926
],
"ys": [
- 14.762493063508536,
+ 14.762493063508535,
10.035995231798612,
6.556325924894737,
4.091869128752166,
- 2.443324688790007,
+ 2.4433246887900064,
1.368448163344026,
- 0.7362727316862254,
+ 0.7362727316862255,
0.3726253151479264,
- 0.18045140978368016,
- 0.08324161723329054,
- 0.03653007656037015,
+ 0.18045140978368018,
+ 0.08324161723329056,
+ 0.036530076560370155,
0.015138238886031097,
- 0.005865786022644364,
- 0.0021007741082511556,
+ 0.005865786022644363,
+ 0.002100774108251156,
6.934850674702332E-4,
- 2.1548618202044153E-4,
+ 2.154861820204415E-4,
6.179626325702729E-5,
1.647076170321766E-5,
3.656119431379834E-6,
@@ -69,15 +69,15 @@
0.7929925155296614
],
"ys": [
- 2.5610687113797286,
+ 2.561068711379729,
1.5796610981359254,
0.9241851752832643,
0.510499546540395,
- 0.2641903251205916,
- 0.12936999343141445,
- 0.05949448413670893,
- 0.026089994832228965,
- 0.010936401864297193,
+ 0.26419032512059154,
+ 0.12936999343141448,
+ 0.059494484136708936,
+ 0.026089994832228968,
+ 0.010936401864297195,
0.004384495443428714,
0.0017265312671550285,
6.916426859739275E-4,
@@ -117,23 +117,23 @@
"ys": [
18.656234425311315,
13.225956628182368,
- 9.15170798568187,
- 6.148262039235705,
- 4.002733950407603,
+ 9.151707985681867,
+ 6.148262039235704,
+ 4.0027339504076025,
2.5204316993495857,
1.5308821379071518,
0.8871340321837551,
- 0.4909438176623917,
+ 0.49094381766239176,
0.2575309154022499,
- 0.12814136421270458,
- 0.05860837911729968,
+ 0.12814136421270464,
+ 0.05860837911729966,
0.02500166184557037,
- 0.009452675419088032,
- 0.003155830078687412,
+ 0.009452675419088034,
+ 0.0031558300786874126,
9.024774578774151E-4,
2.2139445814584955E-4,
- 4.794864398530266E-5,
- 9.98374097780263E-6,
+ 4.794864398530267E-5,
+ 9.983740977802629E-6,
1.745023365440162E-6
]
},
@@ -162,23 +162,23 @@
],
"ys": [
26.372435877966993,
- 19.44776406642359,
+ 19.447764066423588,
13.900222661193535,
9.702611883068098,
- 6.53840824587522,
- 4.315703369680324,
- 2.7582056503639403,
- 1.6960189793166203,
+ 6.538408245875219,
+ 4.315703369680325,
+ 2.7582056503639407,
+ 1.6960189793166207,
1.0031907147799508,
0.5667522515914662,
0.30533047172102024,
0.15619418989992767,
- 0.075416694114016,
+ 0.07541669411401598,
0.03401715730737343,
0.014128278932822112,
0.005303281094011015,
0.00179062624386991,
- 5.466565693089321E-4,
+ 5.46656569308932E-4,
1.5253233886997755E-4,
4.0517273878088426E-5
]
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
similarity index 73%
rename from src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json
rename to src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
index dedc6dc7cea949ca092ecc33e5d4fc5c8adb5ffc..211a5abfcb496f1befae72517bf4c3b7bce77a03 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
@@ -23,25 +23,25 @@
1.7119945007591926
],
"ys": [
- 0.02078455097994014,
+ 0.020784550979940128,
0.013752036153143974,
0.008853912425965713,
- 0.005504502737593539,
- 0.0032956032209899913,
+ 0.005504502737593538,
+ 0.0032956032209899917,
0.0018514963923265217,
9.931435977960567E-4,
4.956595518220794E-4,
2.3401548992797762E-4,
- 1.0471944598011257E-4,
+ 1.0471944598011255E-4,
4.508421273772284E-5,
1.889630156023541E-5,
- 7.725874681605785E-6,
- 3.0391435785521576E-6,
+ 7.725874681605789E-6,
+ 3.0391435785521572E-6,
1.1170515811344102E-6,
- 3.7451324017266453E-7,
- 1.0752962397804162E-7,
- 2.5960707366581506E-8,
- 4.917918081492093E-9,
+ 3.745132401726645E-7,
+ 1.075296239780416E-7,
+ 2.5960707366581502E-8,
+ 4.917918081492094E-9,
6.50338376685779E-10
]
},
@@ -69,21 +69,21 @@
0.7929925155296614
],
"ys": [
- 0.0038496686700113564,
- 0.0025078664183317764,
- 0.0015597948853785955,
- 9.157017059864715E-4,
+ 0.003849668670011357,
+ 0.002507866418331777,
+ 0.0015597948853785957,
+ 9.157017059864713E-4,
5.001931310456335E-4,
2.547249918503188E-4,
- 1.1944866239705738E-4,
- 5.232735935686701E-5,
+ 1.194486623970574E-4,
+ 5.232735935686702E-5,
2.156118337115127E-5,
- 8.400347720866899E-6,
- 3.1469958181727794E-6,
+ 8.4003477208669E-6,
+ 3.14699581817278E-6,
1.142023685405199E-6,
3.9303700685767165E-7,
- 1.29477426563478E-7,
- 3.718668812692663E-8,
+ 1.2947742656347803E-7,
+ 3.7186688126926624E-8,
9.324871744942211E-9,
1.877882948712356E-9,
2.8466329320775234E-10,
@@ -115,22 +115,22 @@
1.6428726885203377
],
"ys": [
- 0.039154336261104546,
+ 0.03915433626110455,
0.028874987776381138,
- 0.02088358144124329,
- 0.014675088491569477,
+ 0.020883581441243287,
+ 0.014675088491569475,
0.009966398305490464,
- 0.006525399875535823,
- 0.004122194389111176,
- 0.002503901284660192,
- 0.001475981629274538,
- 8.455590549998983E-4,
- 4.744378692952328E-4,
+ 0.006525399875535824,
+ 0.0041221943891111765,
+ 0.0025039012846601923,
+ 0.0014759816292745382,
+ 8.455590549998979E-4,
+ 4.7443786929523266E-4,
2.5614908673281044E-4,
1.357929724979682E-4,
- 6.854218948534535E-5,
- 3.2918036847988655E-5,
- 1.4569587193494356E-5,
+ 6.854218948534532E-5,
+ 3.291803684798865E-5,
+ 1.4569587193494355E-5,
5.782794746110381E-6,
1.9737183250309444E-6,
5.657594675445634E-7,
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.060547993873404996,
- 0.04501093716568889,
+ 0.06054799387340501,
+ 0.04501093716568888,
0.03238422553470724,
0.022605947101161115,
- 0.015060131175111438,
- 0.009690757366506481,
+ 0.01506013117511144,
+ 0.009690757366506483,
0.005957079199326996,
- 0.003490107511158219,
- 0.001962702434309726,
+ 0.00349010751115822,
+ 0.0019627024343097255,
0.0010598138716072611,
- 5.526846406248315E-4,
- 2.7876439975788503E-4,
- 1.358294857340756E-4,
+ 5.526846406248314E-4,
+ 2.787643997578851E-4,
+ 1.3582948573407556E-4,
6.359388081275606E-5,
2.8287825293638214E-5,
- 1.170707349148745E-5,
+ 1.1707073491487447E-5,
4.4199232564301465E-6,
- 1.474547175412864E-6,
- 4.1424535992947275E-7,
+ 1.4745471754128641E-6,
+ 4.1424535992947286E-7,
9.342364439170645E-8
]
}
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
similarity index 65%
rename from src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json
rename to src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
index 3cdecfce711adc7160df6c385adba2b1116015f1..65fc783b780d917aabc13b7bf65422ee05d0ee47 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
@@ -23,25 +23,25 @@
1.7119945007591926
],
"ys": [
- 0.017675500237871122,
- 0.011804993270225163,
+ 0.01767550023787112,
+ 0.011804993270225161,
0.007916670756587604,
- 0.0053491472480445695,
- 0.0036313904277084216,
- 0.002384405538478485,
+ 0.00534914724804457,
+ 0.003631390427708422,
+ 0.0023844055384784854,
0.0014870231028831253,
- 8.355484214788524E-4,
- 4.14606577769327E-4,
- 1.7579111278565789E-4,
- 6.24093534270055E-5,
- 1.8240832144136128E-5,
- 4.414927964063777E-6,
- 9.994457044956114E-7,
- 2.4855133647506633E-7,
- 7.726459746150785E-8,
- 2.121042318488014E-8,
- 4.8605658644149765E-9,
- 8.64105244261508E-10,
+ 8.355484214788522E-4,
+ 4.146065777693268E-4,
+ 1.7579111278565783E-4,
+ 6.240935342700551E-5,
+ 1.824083214413613E-5,
+ 4.4149279640637774E-6,
+ 9.994457044956118E-7,
+ 2.485513364750663E-7,
+ 7.726459746150786E-8,
+ 2.1210423184880136E-8,
+ 4.860565864414977E-9,
+ 8.641052442615079E-10,
1.0633132855584105E-10
]
},
@@ -69,22 +69,22 @@
0.7929925155296614
],
"ys": [
- 0.004904504983066267,
- 0.003755611824541404,
- 0.0029006854981177585,
- 0.002197256906365073,
+ 0.004904504983066266,
+ 0.0037556118245414046,
+ 0.002900685498117759,
+ 0.0021972569063650723,
0.0015714972511203793,
- 0.001031785345548251,
- 5.98813717644033E-4,
- 2.999898092710795E-4,
- 1.263608775768721E-4,
- 4.334153727062958E-5,
- 1.1727951025836871E-5,
- 2.3832470064242063E-6,
+ 0.0010317853455482512,
+ 5.988137176440331E-4,
+ 2.999898092710794E-4,
+ 1.2636087757687212E-4,
+ 4.3341537270629574E-5,
+ 1.1727951025836873E-5,
+ 2.3832470064242068E-6,
3.5209264942037663E-7,
- 3.785179659277221E-8,
- 5.963076928168122E-9,
- 1.4910332126633125E-9,
+ 3.785179659277222E-8,
+ 5.963076928168123E-9,
+ 1.4910332126633127E-9,
3.14178873723765E-10,
5.251118966478055E-11,
5.968234937924543E-12,
@@ -115,23 +115,23 @@
1.6428726885203377
],
"ys": [
- 0.022709150996398572,
- 0.015516400129389079,
+ 0.02270915099639857,
+ 0.01551640012938908,
0.01063565058866354,
- 0.007250987342509734,
- 0.004847475264828739,
+ 0.007250987342509732,
+ 0.004847475264828738,
0.0031114243186504235,
- 0.0018782779132334624,
+ 0.0018782779132334618,
0.001050022497993213,
- 5.534113089259501E-4,
- 2.8160535709269497E-4,
- 1.4369489671881903E-4,
+ 5.534113089259502E-4,
+ 2.81605357092695E-4,
+ 1.4369489671881906E-4,
7.346403339083293E-5,
- 3.8325297999058965E-5,
+ 3.832529799905896E-5,
1.943156997427037E-5,
- 9.421592539610682E-6,
- 4.197688438855381E-6,
- 1.6696279770654767E-6,
+ 9.421592539610684E-6,
+ 4.1976884388553816E-6,
+ 1.669627977065477E-6,
5.688244700978394E-7,
1.6230550529800462E-7,
3.5499549032952975E-8
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.04184772415672415,
- 0.02851981218255562,
+ 0.04184772415672416,
+ 0.028519812182555622,
0.01902862263652819,
- 0.012597694078764633,
- 0.008183488070776034,
+ 0.012597694078764632,
+ 0.008183488070776037,
0.0052563265681882425,
- 0.003237883245763996,
- 0.0018635316801681953,
- 9.907119514822528E-4,
- 4.8301305512369827E-4,
- 2.193587945069327E-4,
- 9.551470151347579E-5,
- 4.124782682724972E-5,
- 1.7924007974639764E-5,
+ 0.003237883245763997,
+ 0.001863531680168195,
+ 9.907119514822526E-4,
+ 4.830130551236982E-4,
+ 2.1935879450693258E-4,
+ 9.551470151347582E-5,
+ 4.124782682724971E-5,
+ 1.7924007974639768E-5,
7.69163382946073E-6,
- 3.1292561141859632E-6,
+ 3.129256114185963E-6,
1.1644839692951632E-6,
3.815542517446424E-7,
- 1.0444941528551556E-7,
+ 1.0444941528551554E-7,
2.2656380775801956E-8
]
}
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
similarity index 90%
rename from src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json
rename to src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
index 505dbaf15db52a7ea3268d3a83136c7948f3c57e..f83c052f3551b86ae63c3f78595cff562a2eb805 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
@@ -24,19 +24,19 @@
],
"ys": [
0.6366574720501088,
- 0.47180374791963997,
+ 0.4718037479196399,
0.336364557146257,
- 0.2311796226192394,
+ 0.23117962261923944,
0.15426255108470943,
0.09868641697941964,
- 0.06168226983900997,
+ 0.061682269839009964,
0.037095482704419605,
- 0.02177513770028089,
+ 0.021775137700280892,
0.012418053525144834,
0.006834724125143083,
0.0035759571677002966,
0.0017322386889934245,
- 7.490722245704205E-4,
+ 7.490722245704206E-4,
2.781308992738419E-4,
8.555251892469371E-5,
1.9638736883809428E-5,
@@ -69,9 +69,9 @@
0.7929925155296614
],
"ys": [
- 0.16844377244854847,
+ 0.1684437724485485,
0.11829589663275786,
- 0.08101452065128258,
+ 0.08101452065128259,
0.05406282717487072,
0.035127313944556586,
0.02246250359719528,
@@ -118,15 +118,15 @@
0.7850465833348313,
0.6149388088135578,
0.46880770081149936,
- 0.348104179748503,
- 0.25232659558218706,
+ 0.34810417974850305,
+ 0.252326595582187,
0.17814867226367861,
0.12154240052962642,
0.07901532677500141,
0.04903288877565289,
0.02903200372417984,
0.016462922915925538,
- 0.00872825444898973,
+ 0.008728254448989729,
0.004380357672598145,
0.001967488906616791,
7.622024986858485E-4,
@@ -161,19 +161,19 @@
1.998773638612381
],
"ys": [
- 0.9277678999858486,
- 0.753748033038108,
- 0.5931923233025838,
+ 0.9277678999858487,
+ 0.7537480330381081,
+ 0.5931923233025839,
0.45540482519284387,
0.3391134734752599,
- 0.24809053741765913,
+ 0.2480905374176591,
0.1766116798966622,
- 0.12123002464436061,
+ 0.1212300246443606,
0.07985280215586492,
0.050147609948821836,
0.030081503068165788,
0.01724538444217736,
- 0.009432364207667705,
+ 0.009432364207667703,
0.004883172427187242,
0.002333377346825734,
9.819488750632801E-4,
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
similarity index 68%
rename from src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json
rename to src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
index 170de46ac701254ff6db7c3df5fe4f0b461f834f..79d39bb03e3385d31738ac99684c1228b9cec86b 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
@@ -26,23 +26,23 @@
0.05460474620644812,
0.039322200263679656,
0.027742521888583595,
- 0.01925648792066325,
- 0.013309032474447955,
- 0.009158100387208453,
+ 0.019256487920663257,
+ 0.013309032474447957,
+ 0.009158100387208452,
0.006469954492673557,
0.004711825464791654,
0.00361441996860359,
0.0029237508993505785,
- 0.002458976181859004,
+ 0.0024589761818590043,
0.002072470767532479,
0.0016635058660181767,
- 0.0012069209745320141,
+ 0.001206920974532014,
7.580051949212136E-4,
4.0281368863859246E-4,
- 1.7473743872927871E-4,
- 6.143664863718949E-5,
- 1.6603707164663934E-5,
- 3.2819885795529328E-6
+ 1.747374387292787E-4,
+ 6.14366486371895E-5,
+ 1.660370716466393E-5,
+ 3.281988579552932E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.011183350950193818,
- 0.008208501337863192,
- 0.0061259943786559495,
- 0.004704029030923134,
+ 0.01118335095019382,
+ 0.00820850133786319,
+ 0.006125994378655951,
+ 0.004704029030923133,
0.003744509775095578,
- 0.0031134253259270835,
+ 0.0031134253259270826,
0.0026896900327019677,
- 0.0023879637030226157,
+ 0.0023879637030226153,
0.002117544110718752,
- 0.0018011501748482462,
+ 0.0018011501748482464,
0.0014173471729516552,
- 0.0010068130175955076,
- 6.301951022408454E-4,
- 3.4447816991405104E-4,
- 1.5613960834869734E-4,
- 5.887416288449926E-5,
- 1.7483012613921885E-5,
+ 0.001006813017595508,
+ 6.301951022408455E-4,
+ 3.44478169914051E-4,
+ 1.561396083486973E-4,
+ 5.8874162884499284E-5,
+ 1.7483012613921882E-5,
3.8576776780498505E-6,
5.776336202494065E-7,
- 3.603564897905062E-8
+ 3.6035648979050635E-8
]
},
"Peak Ground Acceleration": {
@@ -115,25 +115,25 @@
1.6428726885203377
],
"ys": [
- 0.11111072621136196,
- 0.09432125494016415,
- 0.07822805599600458,
- 0.0629236938367594,
- 0.04897014435727335,
+ 0.11111072621136198,
+ 0.09432125494016416,
+ 0.07822805599600459,
+ 0.06292369383675941,
+ 0.04897014435727336,
0.03694215394316334,
- 0.02716384329913925,
- 0.019537877568746243,
- 0.013915832488455515,
- 0.009887221698272164,
- 0.0070940413496668455,
+ 0.027163843299139248,
+ 0.01953787756874624,
+ 0.013915832488455513,
+ 0.009887221698272162,
+ 0.007094041349666845,
0.0051464353161795075,
- 0.0038656085903222065,
- 0.0029837666408947193,
- 0.0023260711475453035,
- 0.0017237133487967334,
- 0.0011265388791854103,
- 6.015982295191787E-4,
- 2.510477911128342E-4,
+ 0.003865608590322207,
+ 0.00298376664089472,
+ 0.002326071147545305,
+ 0.0017237133487967337,
+ 0.00112653887918541,
+ 6.015982295191784E-4,
+ 2.510477911128341E-4,
7.632592705118942E-5
]
},
@@ -162,25 +162,25 @@
],
"ys": [
0.13557175676510383,
- 0.11487697773688867,
- 0.09473336922159181,
- 0.0757652391662049,
+ 0.11487697773688868,
+ 0.0947333692215918,
+ 0.07576523916620488,
0.05806165639924289,
0.043077020760732714,
- 0.03089333087514904,
+ 0.030893330875149033,
0.02154336192618488,
- 0.014802677054253841,
- 0.010119114510192408,
- 0.006988258677940672,
- 0.004954717225520119,
- 0.0036631265152625545,
+ 0.01480267705425384,
+ 0.010119114510192404,
+ 0.006988258677940673,
+ 0.00495471722552012,
+ 0.003663126515262554,
0.002832444396585899,
- 0.0022379408457528765,
+ 0.002237940845752876,
0.0017164930070629656,
- 0.0011926180558950764,
- 6.96553553664501E-4,
+ 0.0011926180558950769,
+ 6.965535536645008E-4,
3.2111317564048023E-4,
- 1.1269789534198826E-4
+ 1.1269789534198825E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
similarity index 72%
rename from src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json
rename to src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
index dfe267dabf9a110daeaf59f4c1b483ce28822c95..8e052db4a28ff6c40e5df1186c6cf559f4b8c4ea 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
@@ -23,19 +23,19 @@
1.7119945007591926
],
"ys": [
- 0.018666421015364296,
+ 0.018666421015364292,
0.012277714382170499,
0.007819753747405414,
0.004783588386662286,
- 0.0028112191687725907,
- 0.0015540453407317345,
- 8.285075887238436E-4,
- 4.182733081757242E-4,
+ 0.0028112191687725894,
+ 0.0015540453407317347,
+ 8.285075887238437E-4,
+ 4.1827330817572424E-4,
2.047796180654526E-4,
9.768413828648056E-5,
4.5829796515008224E-5,
2.1108151934584483E-5,
- 9.403078808734168E-6,
+ 9.40307880873417E-6,
3.952177823009205E-6,
1.52393681070903E-6,
5.283693302216127E-7,
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 0.003683929029161356,
- 0.002335050751486981,
- 0.0014025796207374247,
- 7.930112908299475E-4,
- 4.1808903382999877E-4,
- 2.0733134457052302E-4,
- 9.623213274255237E-5,
- 4.279209350393816E-5,
- 1.848842803384079E-5,
- 7.785121676935121E-6,
- 3.20942446688357E-6,
- 1.2788721198896172E-6,
- 4.7640365740538286E-7,
- 1.6510378239619127E-7,
- 4.9341854768598423E-8,
+ 0.0036839290291613555,
+ 0.0023350507514869807,
+ 0.001402579620737425,
+ 7.930112908299474E-4,
+ 4.1808903382999866E-4,
+ 2.0733134457052307E-4,
+ 9.623213274255234E-5,
+ 4.2792093503938167E-5,
+ 1.8488428033840786E-5,
+ 7.785121676935123E-6,
+ 3.2094244668835695E-6,
+ 1.278872119889617E-6,
+ 4.764036574053829E-7,
+ 1.6510378239619124E-7,
+ 4.934185476859842E-8,
1.2738983551119938E-8,
- 2.620252585057268E-9,
- 4.048583749596044E-10,
- 3.904486628199482E-11,
+ 2.6202525850572684E-9,
+ 4.048583749596045E-10,
+ 3.9044866281994814E-11,
1.53244519278671E-12
]
},
@@ -115,24 +115,24 @@
1.6428726885203377
],
"ys": [
- 0.02987894297965619,
+ 0.029878942979656185,
0.021699314985705948,
- 0.015627345176841466,
- 0.011107491120984693,
- 0.007776586292284122,
+ 0.01562734517684146,
+ 0.011107491120984695,
+ 0.0077765862922841225,
0.0053497753310025545,
0.0036068398003160375,
0.002364766212564209,
- 0.001511483656252948,
+ 0.0015114836562529477,
9.383042482967953E-4,
- 5.672612883032049E-4,
+ 5.67261288303205E-4,
3.277563019042573E-4,
1.837902668533268E-4,
- 9.707147245294275E-5,
- 4.8216709391054403E-5,
+ 9.707147245294277E-5,
+ 4.821670939105442E-5,
2.1867540425618328E-5,
8.832673455739918E-6,
- 3.0545231543247826E-6,
+ 3.054523154324783E-6,
8.84797873298568E-7,
1.9672786782893157E-7
]
@@ -162,23 +162,23 @@
],
"ys": [
0.048301983959234095,
- 0.0350497356176406,
- 0.024744052454742885,
+ 0.03504973561764059,
+ 0.02474405245474288,
0.01709523430471773,
- 0.01141511174006545,
- 0.007482577963101015,
+ 0.011415111740065452,
+ 0.007482577963101016,
0.0047698738556462535,
- 0.0029480912847476017,
- 0.001772579859044333,
- 0.001032373824751259,
+ 0.002948091284747602,
+ 0.0017725798590443333,
+ 0.0010323738247512593,
5.823000408387338E-4,
3.169405845714303E-4,
- 1.6560745740360763E-4,
- 8.238484623559816E-5,
- 3.852324830287547E-5,
- 1.6575499019099995E-5,
- 6.439186747078613E-6,
- 2.1925820654928872E-6,
+ 1.6560745740360768E-4,
+ 8.238484623559815E-5,
+ 3.852324830287548E-5,
+ 1.6575499019099988E-5,
+ 6.439186747078615E-6,
+ 2.192582065492888E-6,
6.249719391706647E-7,
1.4238886738032342E-7
]
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
similarity index 89%
rename from src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json
rename to src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
index 3efdf0519e12462a2513f7874330bd02286c7289..64cf362a87bd424cc01dfa35c5fc5910b4eeee95 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
@@ -23,22 +23,22 @@
1.7119945007591926
],
"ys": [
- 0.5639424382793682,
+ 0.5639424382793681,
0.41970430872704,
- 0.2996355631700337,
+ 0.29963556317003365,
0.20436506496344023,
0.13386011296908937,
0.08340469061324253,
0.05072763584783538,
- 0.02970332088645175,
+ 0.029703320886451754,
0.016962428614047866,
0.009368748098138395,
0.004942501068704084,
0.002420101079214425,
- 0.0010564988095787106,
+ 0.0010564988095787104,
3.945561117465654E-4,
1.2048922319737728E-4,
- 2.8266770250121335E-5,
+ 2.8266770250121338E-5,
4.252380705836177E-6,
4.4029329263288646E-7,
2.573585831849357E-8,
@@ -69,16 +69,16 @@
0.7929925155296614
],
"ys": [
- 0.16195200240025112,
- 0.11197070315750864,
+ 0.1619520024002511,
+ 0.11197070315750861,
0.07461644808670248,
0.04806931482649302,
0.029904421907731286,
- 0.01809720511043038,
+ 0.018097205110430375,
0.010526649862628145,
0.0058497036090659794,
- 0.003024869157973338,
- 0.0013988990917255155,
+ 0.0030248691579733374,
+ 0.001398899091725516,
5.607903420664931E-4,
1.884917390363045E-4,
5.034839107343867E-5,
@@ -115,16 +115,16 @@
1.6428726885203377
],
"ys": [
- 0.6547357887817037,
+ 0.6547357887817038,
0.5154175476805015,
0.3956456162265481,
- 0.2946377853731455,
+ 0.29463778537314556,
0.21261726439098355,
0.14856083770157558,
- 0.10023112298791949,
+ 0.1002311229879195,
0.06449394268051883,
0.03938928323399141,
- 0.022644338964053448,
+ 0.022644338964053445,
0.012321069753420741,
0.006191664090278571,
0.0028672800399024167,
@@ -164,11 +164,11 @@
0.7737520693137596,
0.626158058671475,
0.4943026693905384,
- 0.38152373161093633,
+ 0.3815237316109364,
0.2849928378328236,
- 0.20811270361164624,
+ 0.20811270361164622,
0.14726293268062962,
- 0.1003374121401908,
+ 0.10033741214019079,
0.06562437576887947,
0.04081755703105158,
0.02407438562720991,
@@ -177,7 +177,7 @@
0.003434334658947344,
0.0014729955574711105,
5.304815215680369E-4,
- 1.5325010460188717E-4,
+ 1.532501046018872E-4,
3.2864405116884194E-5,
4.5541957008082325E-6,
3.3625843088903307E-7
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
similarity index 70%
rename from src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json
rename to src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
index 4fa5a064ec2ff5dd40302aacfe46a2ca77f8f4ae..f5f90240d59c510aae39e008a824eb94ef73d1c1 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
@@ -24,25 +24,25 @@
],
"ys": [
0.10141210582180435,
- 0.07447849798602045,
+ 0.07447849798602046,
0.05330127231316856,
0.037102818795138215,
0.025232028167263762,
0.016610346496346337,
- 0.010874067593129602,
- 0.007089224798368082,
+ 0.010874067593129604,
+ 0.00708922479836808,
0.004735625457686324,
- 0.003249464756093951,
+ 0.0032494647560939506,
0.0022454952268110224,
- 0.001491447877255857,
- 8.988552768687257E-4,
- 4.6566809395121093E-4,
- 1.988297059158777E-4,
- 6.785029212800548E-5,
- 1.6876651512201575E-5,
+ 0.0014914478772558568,
+ 8.988552768687258E-4,
+ 4.6566809395121077E-4,
+ 1.9882970591587773E-4,
+ 6.785029212800547E-5,
+ 1.6876651512201572E-5,
2.653741741725593E-6,
- 1.7318139402766213E-7,
- 1.035570404004172E-10
+ 1.731813940276621E-7,
+ 1.0355704040041718E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.03338701576491687,
- 0.024650966455601664,
+ 0.033387015764916865,
+ 0.02465096645560166,
0.01764423071929716,
- 0.01226968084616165,
+ 0.012269680846161648,
0.008337057201618096,
- 0.005635024432572453,
+ 0.005635024432572455,
0.003789132702355024,
- 0.0025149123784953837,
- 0.001586342905921711,
- 9.01431544974797E-4,
- 4.4140296504165344E-4,
+ 0.0025149123784953846,
+ 0.0015863429059217106,
+ 9.014315449747967E-4,
+ 4.4140296504165366E-4,
1.7921117169766222E-4,
5.7541181003569944E-5,
- 1.4224526877692228E-5,
- 2.2078569144162733E-6,
- 1.8880753843912258E-7,
+ 1.422452687769223E-5,
+ 2.2078569144162738E-6,
+ 1.888075384391226E-7,
2.916565870061635E-9,
1.3533194681297855E-11,
- 1.476122320747685E-12,
- 7.365315902026218E-14
+ 1.4761223207476851E-12,
+ 7.365315902026216E-14
]
},
"Peak Ground Acceleration": {
@@ -115,25 +115,25 @@
1.6428726885203377
],
"ys": [
- 0.13047100258720737,
+ 0.1304710025872074,
0.09849712329595017,
0.07246017969843055,
- 0.05191828655903307,
- 0.036365265053184825,
- 0.02499321774137477,
+ 0.05191828655903308,
+ 0.03636526505318483,
+ 0.024993217741374762,
0.016900968071016344,
- 0.011231650127527285,
+ 0.011231650127527283,
0.007452801108191979,
- 0.005017181957434342,
- 0.003470567929844281,
- 0.0024023685398152335,
+ 0.005017181957434341,
+ 0.0034705679298442814,
+ 0.002402368539815233,
0.0016078002266633952,
9.514053815001429E-4,
- 4.656644721669268E-4,
+ 4.656644721669267E-4,
1.7536330043880214E-4,
4.811667218966292E-5,
- 8.632653500921544E-6,
- 8.008388400062674E-7,
+ 8.632653500921545E-6,
+ 8.008388400062673E-7,
2.2680106464068337E-8
]
},
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.16740950916822123,
+ 0.16740950916822125,
0.1301827371821187,
0.09802333688436565,
0.0720099099078939,
0.05129669394322607,
- 0.03606585232915037,
+ 0.036065852329150376,
0.024916005816203582,
- 0.016913099641626243,
- 0.011363408680915812,
- 0.007619737320678117,
- 0.005186419991130491,
- 0.00361155605985482,
+ 0.01691309964162624,
+ 0.011363408680915814,
+ 0.007619737320678116,
+ 0.00518641999113049,
+ 0.0036115560598548218,
0.00253928053666354,
- 0.0017305585661145022,
- 0.0010724055561078666,
- 5.639609734298514E-4,
- 2.3956867451954393E-4,
- 7.882123713799233E-5,
- 1.8675841989591893E-5,
+ 0.0017305585661145013,
+ 0.0010724055561078668,
+ 5.639609734298517E-4,
+ 2.395686745195439E-4,
+ 7.882123713799232E-5,
+ 1.86758419895919E-5,
2.701116080577684E-6
]
}
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
similarity index 90%
rename from src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json
rename to src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
index 0e280329d84dc754eb948a3bba3743b37b8a366d..f282faf7a36286b04287fab47a7626608bcfa154 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
@@ -25,8 +25,8 @@
"ys": [
0.5831008919911462,
0.4284199090706749,
- 0.3043299517318651,
- 0.20991504534178368,
+ 0.30432995173186517,
+ 0.20991504534178365,
0.14211631298661964,
0.09374868521078619,
0.061383844950437326,
@@ -69,18 +69,18 @@
0.7929925155296614
],
"ys": [
- 0.15758937503731726,
- 0.11247692685397596,
- 0.07946884297427431,
+ 0.15758937503731724,
+ 0.11247692685397598,
+ 0.07946884297427433,
0.05560574371886311,
0.03824085383493095,
0.02585465059626231,
- 0.017050534628279733,
+ 0.01705053462827973,
0.011010094459237604,
0.006875269673181763,
- 0.004031893488663088,
+ 0.004031893488663087,
0.002153405881721273,
- 0.0010132607735766973,
+ 0.001013260773576697,
4.0392561747766895E-4,
1.357315165926373E-4,
3.5070265791185964E-5,
@@ -117,7 +117,7 @@
"ys": [
0.7094470259373502,
0.5498428629048978,
- 0.4155123147834937,
+ 0.41551231478349365,
0.3063031193282665,
0.22104888785899784,
0.15688910340717468,
@@ -126,7 +126,7 @@
0.04928602923975804,
0.030791659709764246,
0.018082373041434497,
- 0.009607207734429656,
+ 0.009607207734429657,
0.004562768246986615,
0.0017919912792970505,
5.570645285749892E-4,
@@ -161,24 +161,24 @@
1.998773638612381
],
"ys": [
- 0.846343456814455,
- 0.6798282480043856,
+ 0.8463434568144551,
+ 0.6798282480043855,
0.529575106126662,
0.4029924331123037,
0.2978878788706715,
0.21720849261933428,
- 0.15561695133652087,
- 0.10937917498336787,
+ 0.15561695133652084,
+ 0.10937917498336788,
0.07525155479744264,
0.05001008517906983,
0.031720239807918466,
- 0.018914948303394897,
+ 0.018914948303394893,
0.010396290099441215,
0.005116134863810127,
0.002168905715322163,
7.537255830739884E-4,
2.043519900756787E-4,
- 3.950315353965148E-5,
+ 3.950315353965147E-5,
4.114149996331726E-6,
1.1332666265240457E-7
]
diff --git a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
similarity index 89%
rename from src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json
rename to src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
index 3f161bcae7dd6d61fa20fda6700b60fc60be5297..84a5bf24f17ddea50e5bbda8089533bbabf23839 100644
--- a/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
@@ -31,14 +31,14 @@
0.03979043310304015,
0.02608186984634462,
0.01639011789619338,
- 0.009939769051733804,
+ 0.009939769051733806,
0.005732292608201422,
0.0030911152287355775,
- 0.0015239775147447624,
+ 0.0015239775147447628,
6.709168675782273E-4,
2.574847006859803E-4,
8.37874171428662E-5,
- 2.2516613948134413E-5,
+ 2.251661394813441E-5,
4.500727576177568E-6,
6.144243207535918E-7,
4.524870395276403E-8,
@@ -70,18 +70,18 @@
],
"ys": [
0.05798340021258256,
- 0.041904227365681966,
- 0.029366243207829653,
- 0.01992526977609041,
+ 0.04190422736568196,
+ 0.02936624320782965,
+ 0.019925269776090413,
0.013059136945119223,
- 0.008356470041248173,
+ 0.008356470041248171,
0.005219092927360337,
- 0.0032087975808839653,
- 0.0019199405262616404,
+ 0.0032087975808839644,
+ 0.0019199405262616406,
0.0010855264302155057,
5.619278902307795E-4,
- 2.563270845634497E-4,
- 9.79582646732166E-5,
+ 2.563270845634498E-4,
+ 9.795826467321661E-5,
3.093950684856507E-5,
7.164683336505891E-6,
9.927613969917701E-7,
@@ -115,16 +115,16 @@
1.6428726885203377
],
"ys": [
- 0.247718930784228,
+ 0.24771893078422802,
0.21523675836712636,
0.18161823548824615,
0.1478057991464071,
- 0.11545178047071233,
+ 0.11545178047071235,
0.08622984829115031,
0.0614308340584074,
0.0414783202603966,
0.026613647847004044,
- 0.016122062107857667,
+ 0.01612206210785767,
0.009167459234650009,
0.0047229038072055946,
0.002214599540841417,
@@ -166,11 +166,11 @@
0.2111408438896052,
0.17854755392401112,
0.14527845926431035,
- 0.11415150096883397,
+ 0.11415150096883399,
0.08587864028339966,
- 0.0615484614301632,
+ 0.061548461430163195,
0.04205905132892357,
- 0.02729969817162939,
+ 0.027299698171629392,
0.01678063082631571,
0.009668716589318763,
0.005145168066638075,
diff --git a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
similarity index 63%
rename from src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-BOSTON_MA.json
rename to src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
index 5fbf85280d192433016ad59e8e0cdc4967f984d8..8fbe33b7dacdf6ba26f68f12b85deeb8879408fc 100644
--- a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
@@ -23,26 +23,26 @@
1.7119945007591926
],
"ys": [
- 0.012035250953950498,
- 0.008136450513957992,
- 0.005357340154375906,
- 0.003403819993864419,
- 0.002075982258963484,
- 0.0011822041734730927,
+ 0.012035250953950496,
+ 0.008136450513957994,
+ 0.005357340154375904,
+ 0.0034038199938644185,
+ 0.0020759822589634836,
+ 0.001182204173473093,
6.381637241440367E-4,
- 3.1805354126301E-4,
- 1.488509696381637E-4,
- 6.570858797962464E-5,
- 2.7907226394671618E-5,
- 1.160317307310204E-5,
- 4.7473682801237555E-6,
- 1.8823085054717088E-6,
- 6.985968736604167E-7,
- 2.3617353275626022E-7,
+ 3.180535412630101E-4,
+ 1.4885096963816372E-4,
+ 6.570858797962465E-5,
+ 2.7907226394671614E-5,
+ 1.1603173073102042E-5,
+ 4.747368280123755E-6,
+ 1.882308505471709E-6,
+ 6.98596873660417E-7,
+ 2.361735327562602E-7,
6.822723750146087E-8,
1.654170745318874E-8,
3.143062035320597E-9,
- 4.1677143037056364E-10
+ 4.167714303705636E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.0025398230942089,
+ 0.0025398230942089003,
0.0017004849473223659,
- 0.001080537204575473,
- 6.427743459107483E-4,
- 3.5250053778408794E-4,
- 1.784508617487966E-4,
- 8.235649641224018E-5,
- 3.51825900817057E-5,
- 1.4039816722421815E-5,
+ 0.0010805372045754734,
+ 6.427743459107486E-4,
+ 3.5250053778408804E-4,
+ 1.784508617487965E-4,
+ 8.235649641224025E-5,
+ 3.518259008170571E-5,
+ 1.403981672242182E-5,
5.2925574919901536E-6,
- 1.931873813330582E-6,
- 6.930280662347881E-7,
- 2.387560829136424E-7,
+ 1.9318738133305824E-6,
+ 6.930280662347882E-7,
+ 2.3875608291364243E-7,
7.949667457419139E-8,
2.3033109721002647E-8,
- 5.814345246474629E-9,
+ 5.81434524647463E-9,
1.1768734801565262E-9,
1.7921158518774916E-10,
1.707680249601977E-11,
- 6.620975889303252E-13
+ 6.620975889303251E-13
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.022133797305397513,
- 0.01646478822114371,
+ 0.022133797305397516,
+ 0.016464788221143715,
0.011993007697334196,
0.008469921726676995,
- 0.0057694224366679715,
- 0.0037852346853179046,
- 0.0023980285092101684,
- 0.0014644603827730191,
+ 0.005769422436667971,
+ 0.003785234685317904,
+ 0.002398028509210169,
+ 0.001464460382773019,
8.708938689719437E-4,
- 5.050137904309896E-4,
+ 5.050137904309894E-4,
2.8744285592528334E-4,
- 1.5759519816243778E-4,
- 8.474954902281691E-5,
- 4.3315663950153084E-5,
- 2.1006734979279977E-5,
- 9.36468746818696E-6,
- 3.7358919546444565E-6,
- 1.2797193572338942E-6,
- 3.6777257578539196E-7,
- 8.117385475823618E-8
+ 1.5759519816243772E-4,
+ 8.474954902281687E-5,
+ 4.331566395015309E-5,
+ 2.100673497927998E-5,
+ 9.364687468186962E-6,
+ 3.735891954644456E-6,
+ 1.2797193572338944E-6,
+ 3.677725757853919E-7,
+ 8.117385475823619E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.03366552771204858,
- 0.025274901753270337,
- 0.018363592179908052,
+ 0.03366552771204859,
+ 0.02527490175327033,
+ 0.01836359217990806,
0.012936884452302021,
0.008688945266911698,
- 0.005625605703707623,
- 0.0034731062327398453,
- 0.002041414499953952,
+ 0.005625605703707624,
+ 0.0034731062327398457,
+ 0.002041414499953951,
0.0011521441250253442,
- 6.256035783742622E-4,
- 3.2905129521755496E-4,
- 1.6788122677082186E-4,
- 8.289006542304934E-5,
- 3.932990927477223E-5,
+ 6.256035783742621E-4,
+ 3.29051295217555E-4,
+ 1.678812267708219E-4,
+ 8.28900654230493E-5,
+ 3.9329909274772225E-5,
1.770632155464228E-5,
7.400623622880165E-6,
- 2.8151709437106135E-6,
- 9.444508782310243E-7,
- 2.6643564801230023E-7,
- 6.028000859708367E-8
+ 2.815170943710613E-6,
+ 9.444508782310246E-7,
+ 2.664356480123001E-7,
+ 6.028000859708366E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
similarity index 68%
rename from src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-CHICAGO_IL.json
rename to src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
index b97856e47793c99b8432f07e87fd9b2a73d0fd23..7f164c52a733f0859d2479350a120519ab428cf0 100644
--- a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
@@ -23,25 +23,25 @@
1.7119945007591926
],
"ys": [
- 0.011743450939977121,
+ 0.011743450939977118,
0.008125308944564938,
- 0.005699841355233887,
+ 0.005699841355233888,
0.004063331479854992,
0.002914932752547856,
- 0.002011657491709991,
- 0.0013023024188037935,
- 7.508580888508446E-4,
+ 0.0020116574917099913,
+ 0.001302302418803793,
+ 7.508580888508447E-4,
3.779758912608106E-4,
- 1.607665792621911E-4,
- 5.640450250928885E-5,
- 1.5854840222432897E-5,
+ 1.6076657926219107E-4,
+ 5.6404502509288863E-5,
+ 1.5854840222432907E-5,
3.4666024386239945E-6,
6.276175503615024E-7,
- 1.1311107110879792E-7,
- 3.2901695050199055E-8,
- 8.920167427589633E-9,
- 2.0381078454137677E-9,
- 3.617194732035356E-10,
+ 1.1311107110879795E-7,
+ 3.290169505019905E-8,
+ 8.920167427589635E-9,
+ 2.0381078454137685E-9,
+ 3.6171947320353567E-10,
4.4457055160088465E-11
]
},
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 0.0039146752310542585,
- 0.0031451242905594454,
- 0.002539985104779431,
- 0.001995407146569926,
- 0.0014663954072994363,
+ 0.003914675231054258,
+ 0.003145124290559445,
+ 0.0025399851047794315,
+ 0.0019954071465699266,
+ 0.0014663954072994365,
9.81078515831008E-4,
- 5.766625095711314E-4,
- 2.9122083149339624E-4,
- 1.2323301880628126E-4,
- 4.23293094143438E-5,
- 1.1417819112031974E-5,
+ 5.766625095711313E-4,
+ 2.912208314933962E-4,
+ 1.2323301880628123E-4,
+ 4.232930941434379E-5,
+ 1.1417819112031977E-5,
2.284917995979172E-6,
- 3.189051251922006E-7,
- 2.6634716674399803E-8,
- 2.631094090897221E-9,
- 6.434177330359818E-10,
- 1.343931260071307E-10,
- 2.2316057744142464E-11,
- 2.521633307504799E-12,
+ 3.1890512519220076E-7,
+ 2.66347166743998E-8,
+ 2.6310940908972222E-9,
+ 6.43417733035982E-10,
+ 1.3439312600713073E-10,
+ 2.231605774414246E-11,
+ 2.5216333075047996E-12,
1.3184079536599202E-13
]
},
@@ -116,23 +116,23 @@
],
"ys": [
0.014201965383094008,
- 0.009836661064584256,
- 0.00688705539510868,
- 0.004822972654784704,
+ 0.009836661064584255,
+ 0.006887055395108681,
+ 0.004822972654784702,
0.0033064514318962616,
- 0.0021523212203669317,
- 0.0012913959704858489,
- 6.980789885746676E-4,
+ 0.002152321220366931,
+ 0.0012913959704858482,
+ 6.98078988574668E-4,
3.4489953492751826E-4,
- 1.5983798459686004E-4,
- 7.33965023878937E-5,
- 3.422789089731295E-5,
+ 1.5983798459686007E-4,
+ 7.339650238789367E-5,
+ 3.4227890897312936E-5,
1.6846491297689144E-5,
- 8.285358896839056E-6,
- 3.961387655798772E-6,
+ 8.28535889683906E-6,
+ 3.961387655798771E-6,
1.7527896460680704E-6,
- 6.948067057717802E-7,
- 2.362740206995038E-7,
+ 6.948067057717801E-7,
+ 2.3627402069950385E-7,
6.733661284906263E-8,
1.4715213946019287E-8
]
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.02584957271338508,
- 0.017753646580124727,
+ 0.02584957271338509,
+ 0.017753646580124724,
0.012007008129215242,
- 0.008128801283198312,
- 0.005452530605807154,
+ 0.008128801283198313,
+ 0.005452530605807153,
0.0036242624057437533,
0.002294303050029684,
- 0.0013363583126878719,
- 7.036603069604338E-4,
+ 0.0013363583126878716,
+ 7.036603069604337E-4,
3.30610885337662E-4,
- 1.4009518367835518E-4,
+ 1.400951836783552E-4,
5.5199892795127905E-5,
2.1302618500609412E-5,
- 8.422390673359909E-6,
+ 8.42239067335991E-6,
3.4034559898394304E-6,
1.3409496391300434E-6,
- 4.90670931766195E-7,
+ 4.906709317661948E-7,
1.5953368600015112E-7,
4.3540972907165534E-8,
- 9.429156219063078E-9
+ 9.42915621906308E-9
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-LOS_ANGELES_CA.json
rename to src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
diff --git a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
similarity index 62%
rename from src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-NEW_MADRID_MO.json
rename to src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
index d87509be8c8a7a3f64f85952cf2a314f821e6128..7037b601836a22b401d5838c93919b38f42b0692 100644
--- a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-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.03810825840039236,
- 0.028315881963472067,
- 0.020672225797126374,
- 0.014870841055017734,
- 0.01064517851463895,
+ 0.028315881963472057,
+ 0.020672225797126367,
+ 0.014870841055017738,
+ 0.010645178514638951,
0.007579226339112702,
- 0.005525146309384491,
- 0.004150104336178289,
- 0.0032832768942294005,
+ 0.005525146309384489,
+ 0.004150104336178288,
+ 0.0032832768942293996,
0.002736483538207061,
0.0023616078072307626,
- 0.0020302193043108072,
- 0.0016536229943857192,
- 0.0012136295169658802,
- 7.696144694320107E-4,
- 4.122710029507207E-4,
- 1.8003022715414643E-4,
+ 0.002030219304310808,
+ 0.001653622994385719,
+ 0.0012136295169658808,
+ 7.696144694320109E-4,
+ 4.1227100295072064E-4,
+ 1.800302271541464E-4,
6.366327102023256E-5,
- 1.729567497551861E-5,
- 3.4296680438421225E-6
+ 1.7295674975518613E-5,
+ 3.4296680438421237E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.009208490572401863,
+ 0.009208490572401862,
0.006949044290028717,
0.005306022483737845,
- 0.00415598280715448,
- 0.003374832319325517,
- 0.002867336657508213,
+ 0.004155982807154481,
+ 0.0033748323193255178,
+ 0.0028673366575082126,
0.0025338938062588858,
- 0.002296577849638026,
- 0.002071024070927564,
- 0.0017848984735762317,
- 0.0014189996388149055,
- 0.001016106674128016,
- 6.401986492207045E-4,
- 3.51856592068447E-4,
- 1.6023573276676502E-4,
- 6.062719466111044E-5,
- 1.8059984462885992E-5,
+ 0.0022965778496380263,
+ 0.0020710240709275645,
+ 0.0017848984735762319,
+ 0.001418999638814905,
+ 0.0010161066741280161,
+ 6.401986492207046E-4,
+ 3.5185659206844706E-4,
+ 1.60235732766765E-4,
+ 6.062719466111046E-5,
+ 1.8059984462886E-5,
3.992606691586526E-6,
5.941978049955505E-7,
3.907477602123017E-8
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.07385719651712237,
+ 0.07385719651712236,
0.06339731846609972,
- 0.053247390588328176,
- 0.0435096428460709,
- 0.03455200231823049,
- 0.026735789278431794,
- 0.020266534158040125,
- 0.015094050334430918,
- 0.011160466116674341,
- 0.00824323367015754,
- 0.006149418866075564,
- 0.004638605840165206,
- 0.0036081610853177662,
- 0.0028667097097824813,
- 0.0022820277341210914,
- 0.0017173902293493681,
+ 0.05324739058832817,
+ 0.04350964284607091,
+ 0.03455200231823048,
+ 0.02673578927843179,
+ 0.02026653415804013,
+ 0.01509405033443092,
+ 0.011160466116674345,
+ 0.008243233670157545,
+ 0.006149418866075562,
+ 0.004638605840165204,
+ 0.0036081610853177675,
+ 0.0028667097097824818,
+ 0.002282027734121092,
+ 0.0017173902293493675,
0.0011387960982620043,
- 6.20634628925764E-4,
+ 6.206346289257639E-4,
2.676485464183286E-4,
- 8.5590182373738E-5
+ 8.559018237373796E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -162,25 +162,25 @@
],
"ys": [
0.08841662701849765,
- 0.07591742600201583,
- 0.0634904922902513,
- 0.05159654623603554,
- 0.040338611992381736,
- 0.030668710568369003,
- 0.0226647187361527,
+ 0.07591742600201586,
+ 0.06349049229025132,
+ 0.05159654623603552,
+ 0.04033861199238173,
+ 0.03066871056836901,
+ 0.022664718736152712,
0.016375571535456927,
- 0.011700180723249342,
- 0.008331012521430117,
+ 0.011700180723249338,
+ 0.008331012521430115,
0.0059918284439274515,
- 0.004419617060158352,
- 0.0033904787433168887,
+ 0.00441961706015835,
+ 0.00339047874331689,
0.002704887471971463,
- 0.0021874716446254982,
- 0.001705434057416785,
- 0.0012009117597148592,
- 7.123552774961516E-4,
- 3.3561010223032633E-4,
- 1.2135441742664015E-4
+ 0.0021874716446254974,
+ 0.0017054340574167853,
+ 0.001200911759714859,
+ 7.123552774961517E-4,
+ 3.356101022303263E-4,
+ 1.2135441742664016E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
similarity index 67%
rename from src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-NEW_YORK_NY.json
rename to src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
index 59c5ea63c308187d90e9bc8460e691a9b1d76669..8a3df6f99054d98f3a65ffa471850e06121c95c2 100644
--- a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
@@ -23,24 +23,24 @@
1.7119945007591926
],
"ys": [
- 0.012374804522292667,
- 0.008366615574145388,
+ 0.012374804522292664,
+ 0.00836661557414539,
0.005447933203374217,
- 0.0033819355792352452,
+ 0.003381935579235245,
0.0020006567971856686,
- 0.001105422985268529,
- 5.859581677512342E-4,
- 2.9321216786829424E-4,
+ 0.0011054229852685289,
+ 5.859581677512343E-4,
+ 2.932121678682943E-4,
1.421916075501724E-4,
6.726067803272612E-5,
- 3.134520433789696E-5,
+ 3.134520433789695E-5,
1.4361751527596114E-5,
6.369510633138831E-6,
2.6653684534293637E-6,
1.0234643150923622E-6,
- 3.5363710757446497E-7,
- 1.0369647752886425E-7,
- 2.5379169471070924E-8,
+ 3.5363710757446486E-7,
+ 1.0369647752886424E-7,
+ 2.5379169471070928E-8,
4.851084599984121E-9,
6.463135305490378E-10
]
@@ -70,24 +70,24 @@
],
"ys": [
0.0026995587713563303,
- 0.0017298562174529152,
- 0.0010437246587511788,
- 5.893703808209609E-4,
+ 0.001729856217452915,
+ 0.001043724658751179,
+ 5.893703808209607E-4,
3.0866135946543816E-4,
- 1.5129449159709626E-4,
- 6.909234873826656E-5,
- 3.0170083088739845E-5,
- 1.2820296859449096E-5,
+ 1.5129449159709623E-4,
+ 6.909234873826654E-5,
+ 3.0170083088739838E-5,
+ 1.2820296859449094E-5,
5.334744194862449E-6,
- 2.1850795994287938E-6,
- 8.683687558905424E-7,
- 3.2288483966793267E-7,
+ 2.1850795994287946E-6,
+ 8.683687558905425E-7,
+ 3.2288483966793256E-7,
1.1154021351741914E-7,
3.321633846097989E-8,
- 8.550579030900382E-9,
+ 8.550579030900384E-9,
1.7547455322744306E-9,
- 2.7055513137256066E-10,
- 2.6042457346830447E-11,
+ 2.705551313725607E-10,
+ 2.6042457346830444E-11,
1.0203573556440597E-12
]
},
@@ -115,25 +115,25 @@
1.6428726885203377
],
"ys": [
- 0.020286596128412503,
+ 0.020286596128412507,
0.015122005526298518,
0.011082055927620184,
- 0.007943124693114981,
- 0.005565081037653395,
- 0.003811541282858031,
- 0.0025512684613907275,
- 0.0016581992888227435,
- 0.0010500509127704901,
- 6.457811692687935E-4,
+ 0.007943124693114983,
+ 0.005565081037653393,
+ 0.0038115412828580303,
+ 0.0025512684613907266,
+ 0.0016581992888227432,
+ 0.00105005091277049,
+ 6.457811692687936E-4,
3.870049228081458E-4,
- 2.2185052288528707E-4,
- 1.2362061855638126E-4,
- 6.497784148592093E-5,
- 3.216899369858367E-5,
- 1.4558524637476322E-5,
+ 2.2185052288528715E-4,
+ 1.236206185563812E-4,
+ 6.497784148592097E-5,
+ 3.216899369858368E-5,
+ 1.4558524637476324E-5,
5.872716012004253E-6,
2.02924869721662E-6,
- 5.875115950380294E-7,
+ 5.875115950380293E-7,
1.3058577801930758E-7
]
},
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.03092438557753146,
- 0.023158670112213064,
+ 0.030924385577531452,
+ 0.023158670112213068,
0.0168266446727544,
- 0.011887481789564946,
- 0.008051319708031236,
- 0.005306104962367635,
- 0.003378081358145653,
- 0.00207687872119885,
+ 0.011887481789564952,
+ 0.008051319708031232,
+ 0.005306104962367634,
+ 0.003378081358145652,
+ 0.002076878721198851,
0.001240205271953173,
- 7.171120777581216E-4,
- 4.0159722262661073E-4,
- 2.1704931466717478E-4,
- 1.1263830633195167E-4,
- 5.5685617014544695E-5,
- 2.5902604304970153E-5,
- 1.1100158846964052E-5,
- 4.29968921259496E-6,
+ 7.171120777581213E-4,
+ 4.015972226266107E-4,
+ 2.170493146671748E-4,
+ 1.126383063319517E-4,
+ 5.5685617014544675E-5,
+ 2.5902604304970156E-5,
+ 1.110015884696405E-5,
+ 4.299689212594959E-6,
1.461140887787391E-6,
- 4.1591376645650764E-7,
+ 4.159137664565076E-7,
9.467170166750412E-8
]
}
diff --git a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
similarity index 98%
rename from src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-RENO_NV.json
rename to src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
index 2fe950c9bf191ecf653ca58b303f10ee1c4c1c80..6358bb7ca8c5c4e1d1ff4b6bb8e63fbc38ed5132 100644
--- a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
@@ -76,11 +76,11 @@
0.02114650811223566,
0.012726247663438568,
0.007323504383620474,
- 0.004014409327054083,
+ 0.0040144093270540835,
0.00205488138625064,
9.525469423918409E-4,
3.8994761986655535E-4,
- 1.3652451696297344E-4,
+ 1.365245169629735E-4,
3.884698378921924E-5,
8.873557780140218E-6,
1.3451231092798012E-6,
@@ -165,7 +165,7 @@
0.4648421129913744,
0.3364614024187943,
0.23936400511977998,
- 0.16657296053887222,
+ 0.1665729605388722,
0.11552626958244688,
0.07924766772201519,
0.05346535671204676,
diff --git a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-SALT_LAKE_CITY_UT.json
rename to src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
diff --git a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-SAN_FRANCISCO_CA.json
rename to src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
diff --git a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
similarity index 84%
rename from src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-SEATTLE_WA.json
rename to src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
index 387ec8fbc25e321aaa0141cc390cc26d4b512d84..97795b24292f483a1ce636ccab70a24bf480ba89 100644
--- a/src/test/resources/e2e/nshm-conus-6.a.3/nshm-conus-6.a.3-2023-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
@@ -23,20 +23,20 @@
1.7119945007591926
],
"ys": [
- 0.19897581677887669,
+ 0.19897581677887666,
0.1577395573051793,
0.12044861188465388,
0.08849701093209442,
- 0.0628636073809434,
- 0.04276589752771626,
- 0.028375492860898792,
- 0.018099393086572425,
+ 0.06286360738094342,
+ 0.04276589752771625,
+ 0.02837549286089879,
+ 0.01809939308657242,
0.011162206885093687,
- 0.006559356758212913,
+ 0.006559356758212915,
0.0036143759422569417,
- 0.0018285570367639593,
+ 0.0018285570367639595,
8.296667905783596E-4,
- 3.2849455618839946E-4,
+ 3.284945561883995E-4,
1.0963455941947854E-4,
2.9696131236439645E-5,
5.805827780831235E-6,
@@ -71,19 +71,19 @@
"ys": [
0.057458910275419064,
0.04119453721482716,
- 0.02873888612621549,
- 0.019517266040986556,
+ 0.028738886126215488,
+ 0.019517266040986553,
0.012865085501768908,
0.008286940358446314,
- 0.0051778287701842295,
- 0.003135105605324782,
- 0.0018040520137694123,
- 9.550967828148112E-4,
- 4.525051792337518E-4,
- 1.8601411939532503E-4,
- 6.340025655239959E-5,
- 1.774413744796896E-5,
- 3.6119400522511263E-6,
+ 0.005177828770184231,
+ 0.0031351056053247803,
+ 0.0018040520137694118,
+ 9.550967828148115E-4,
+ 4.525051792337519E-4,
+ 1.8601411939532498E-4,
+ 6.34002565523996E-5,
+ 1.7744137447968963E-5,
+ 3.6119400522511268E-6,
4.377163495039788E-7,
1.040241402813071E-8,
1.7354534758719045E-11,
@@ -132,8 +132,8 @@
3.7074288922810117E-4,
1.0887407546288273E-4,
2.3944480179971553E-5,
- 3.4423038486722727E-6,
- 2.787499924287682E-7,
+ 3.4423038486722723E-6,
+ 2.7874999242876813E-7,
6.628896595304417E-9
]
},
@@ -163,19 +163,19 @@
"ys": [
0.2869636502669868,
0.25417973544818384,
- 0.21906830834876054,
+ 0.21906830834876057,
0.1834844524639711,
0.14787713473344755,
0.11527966254404634,
0.08627079311437469,
0.061710212057459315,
- 0.04223637305486283,
- 0.02756873475343311,
+ 0.04223637305486282,
+ 0.027568734753433105,
0.017153092866713564,
0.010123007487523891,
0.00561719974969265,
- 0.002888657013889449,
- 0.0013460854387742323,
+ 0.0028886570138894493,
+ 0.0013460854387742321,
5.496026708999016E-4,
1.9120436392156004E-4,
5.465049981000188E-5,
diff --git a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HILO_HI.json
similarity index 93%
rename from src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HILO_HI.json
index 8669ded72d43f02fe13bdc12d2709810c7d9cd16..c6aea429d9107f5c8317653aaeaab2e1118b613b 100644
--- a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HILO_HI.json
@@ -23,16 +23,16 @@
1.7119945007591926
],
"ys": [
- 1.139427959929886,
- 0.9096459257402049,
+ 1.1394279599298858,
+ 0.909645925740205,
0.6810439562313703,
- 0.4821343899828438,
+ 0.48213438998284386,
0.3270662494936988,
0.2122733790095776,
- 0.13579352589768767,
+ 0.13579352589768764,
0.08466990088453301,
0.0514796672410259,
- 0.0295922152331615,
+ 0.029592215233161495,
0.015605186053687877,
0.007369438722986227,
0.0030791345001285235,
@@ -74,12 +74,12 @@
0.11286823232748022,
0.08019936527365806,
0.057001082377164766,
- 0.03977231046422921,
+ 0.0397723104642292,
0.026270923994779784,
0.0159300182060438,
0.008586807484419114,
0.0040091692633346795,
- 0.0016237229130359049,
+ 0.0016237229130359047,
5.831580842583807E-4,
1.935491083341371E-4,
6.446411351755592E-5,
@@ -162,15 +162,15 @@
],
"ys": [
1.4371068709113273,
- 1.3442294606163503,
+ 1.3442294606163505,
1.2504550788598903,
1.145108478540398,
- 1.0076845134906758,
+ 1.0076845134906756,
0.8393355383077514,
0.6496537972367906,
0.4625305796292689,
- 0.3035348264320895,
- 0.18409848770017573,
+ 0.30353482643208957,
+ 0.1840984877001757,
0.10404729414822564,
0.054920827101472565,
0.026929508320917738,
diff --git a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HONOLULU_HI.json
similarity index 98%
rename from src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HONOLULU_HI.json
index cf16ace1826fba2417f019b7e241979cc4e9b627..5f307f1d3eafd85d51559394fe223273545d0628 100644
--- a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HONOLULU_HI.json
@@ -70,11 +70,11 @@
],
"ys": [
0.023279814179665247,
- 0.015258454706800595,
+ 0.015258454706800593,
0.009636588671134795,
0.0058636185962218715,
0.0034303179683354557,
- 0.0019508911864085045,
+ 0.0019508911864085043,
0.0010720245656982627,
5.727230032611106E-4,
2.940392779991596E-4,
@@ -117,7 +117,7 @@
"ys": [
0.16241112120908746,
0.12117474522250349,
- 0.08821017091766083,
+ 0.08821017091766084,
0.06247545594775962,
0.0429411432751231,
0.028525687803782396,
diff --git a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-KAILUA_KONA_HI.json
similarity index 90%
rename from src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-KAILUA_KONA_HI.json
index 700f75ca93f830cd20e39ddd48ab73086bb2ea0c..75e60ef6eaf3dd9429246559d7491673bc5ea3ac 100644
--- a/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-KAILUA_KONA_HI.json
@@ -25,21 +25,21 @@
"ys": [
0.9310649618626425,
0.7152683525622627,
- 0.5254960437436177,
- 0.37057192881004786,
+ 0.5254960437436178,
+ 0.37057192881004797,
0.2536030693592891,
0.1673342748557868,
0.10852163641624823,
0.06764805605345484,
0.04042125038591836,
- 0.022759302561329988,
- 0.012035453130050871,
+ 0.02275930256132998,
+ 0.012035453130050867,
0.006001361401039622,
0.002825403258669261,
0.0012397199668725764,
4.913127725890904E-4,
1.6916652515186739E-4,
- 4.608184816695928E-5,
+ 4.6081848166959275E-5,
9.142956045358946E-6,
1.067682459238504E-6,
4.413524073773537E-8
@@ -73,20 +73,20 @@
0.13554779250681923,
0.09647775115759329,
0.06847614819048337,
- 0.04772578379364716,
+ 0.04772578379364718,
0.03208679105889853,
0.020129540279605004,
0.011639202185119844,
0.006195139919067763,
0.0030758835356592914,
- 0.0014771509658122375,
- 7.061929082246017E-4,
+ 0.0014771509658122373,
+ 7.061929082246016E-4,
3.34514415859711E-4,
1.5467986387544445E-4,
6.363609376236911E-5,
2.247131683032451E-5,
6.219516642047412E-6,
- 1.2615492254822047E-6,
+ 1.2615492254822045E-6,
1.5297532779407637E-7,
7.198489307670766E-9
]
@@ -116,24 +116,24 @@
],
"ys": [
1.3099486083268739,
- 1.199523417668875,
+ 1.1995234176688747,
1.0517265084684118,
0.8707860874217463,
0.6765138623146243,
- 0.493401638622512,
+ 0.49340163862251196,
0.33992289432676787,
0.22192803156480623,
0.13847632521718928,
0.0817533386032545,
0.04511099205028912,
0.022490754664834876,
- 0.010374939794256521,
- 0.004313773760782855,
- 0.0016216028906538636,
+ 0.01037493979425652,
+ 0.004313773760782856,
+ 0.0016216028906538638,
5.238693662990279E-4,
1.377271763315316E-4,
2.6761997339916372E-5,
- 3.504591338211114E-6,
+ 3.5045913382111136E-6,
2.30974963417142E-7
]
},
@@ -163,7 +163,7 @@
"ys": [
1.3761096429204573,
1.2927474893926607,
- 1.1783350570784317,
+ 1.178335057078432,
1.0275173511479154,
0.842703120792494,
0.6513972997833428,