From ea92ba5dc1466ee185da20e1618fe5835c74c2e9 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Thu, 31 Mar 2022 08:39:35 -0600
Subject: [PATCH] fixed hawaii result names
---
.../nshmp/model/NshmTestsConus.java | 6 +-
.../nshmp/model/NshmTestsHawaii.java | 6 +-
..._HI.json => nshm-hawaii-2021-HILO_HI.json} | 58 +++++++++----------
...json => nshm-hawaii-2021-HONOLULU_HI.json} | 42 +++++++-------
...n => nshm-hawaii-2021-KAILUA_KONA_HI.json} | 38 ++++++------
5 files changed, 75 insertions(+), 75 deletions(-)
rename src/test/resources/e2e/{nshm-conus-2018-HILO_HI.json => nshm-hawaii-2021-HILO_HI.json} (82%)
rename src/test/resources/e2e/{nshm-conus-2018-HONOLULU_HI.json => nshm-hawaii-2021-HONOLULU_HI.json} (87%)
rename src/test/resources/e2e/{nshm-conus-2018-KAILUA_KONA_HI.json => nshm-hawaii-2021-KAILUA_KONA_HI.json} (88%)
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
index 9af40f667..529d2a795 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
@@ -66,7 +66,7 @@ class NshmTestsConus {
private static final double TOLERANCE = 1e-12;
- private static final List<NamedLocation> CONUS_SITES = List.of(
+ private static final List<NamedLocation> SITES = List.of(
LOS_ANGELES_CA,
SAN_FRANCISCO_CA,
SEATTLE_WA,
@@ -111,7 +111,7 @@ class NshmTestsConus {
}
private static Stream<NamedLocation> siteStream() {
- return CONUS_SITES.stream();
+ return SITES.stream();
}
private static void compareCurves(NamedLocation location) {
@@ -246,7 +246,7 @@ class NshmTestsConus {
/* Initialize and shut down executor to generate results. */
setUpBeforeClass();
- writeExpecteds("nshm-conus", 2018, CONUS_SITES);
+ writeExpecteds(MODEL_NAME, MODEL_YEAR, SITES);
tearDownAfterClass();
}
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsHawaii.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsHawaii.java
index f98dd312b..6d184fea8 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsHawaii.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsHawaii.java
@@ -61,7 +61,7 @@ class NshmTestsHawaii {
private static final double TOLERANCE = 1e-12;
- private static final List<NamedLocation> CONUS_SITES = List.of(
+ private static final List<NamedLocation> SITES = List.of(
HILO_HI,
HONOLULU_HI,
KAILUA_KONA_HI);
@@ -100,7 +100,7 @@ class NshmTestsHawaii {
}
private static Stream<NamedLocation> siteStream() {
- return CONUS_SITES.stream();
+ return SITES.stream();
}
private static void compareCurves(NamedLocation location) {
@@ -235,7 +235,7 @@ class NshmTestsHawaii {
/* Initialize and shut down executor to generate results. */
setUpBeforeClass();
- writeExpecteds("nshm-conus", 2018, CONUS_SITES);
+ writeExpecteds(MODEL_NAME, MODEL_YEAR, SITES);
tearDownAfterClass();
}
diff --git a/src/test/resources/e2e/nshm-conus-2018-HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
similarity index 82%
rename from src/test/resources/e2e/nshm-conus-2018-HILO_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
index 8f0b4a16b..fdea57eff 100644
--- a/src/test/resources/e2e/nshm-conus-2018-HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.139427959929886,
- 0.9096459257402049,
- 0.6810439562313703,
- 0.48213438998284375,
+ 1.1394279599298858,
+ 0.909645925740205,
+ 0.6810439562313704,
+ 0.48213438998284386,
0.3270662494936988,
0.2122733790095776,
- 0.13579352589768767,
- 0.08466990088453301,
- 0.0514796672410259,
- 0.0295922152331615,
+ 0.13579352589768764,
+ 0.08466990088453302,
+ 0.051479667241025914,
+ 0.029592215233161495,
0.015605186053687877,
0.007369438722986228,
0.003079134500128523,
0.001133816052813239,
- 3.683841726832002E-4,
- 1.077152977087167E-4,
- 2.7590429340726252E-5,
- 6.106383784135073E-6,
+ 3.683841726832001E-4,
+ 1.0771529770871671E-4,
+ 2.7590429340726256E-5,
+ 6.106383784135074E-6,
9.141545957726994E-7,
- 4.7166583187373387E-8
+ 4.716658318737339E-8
]
},
"5.00 Second Spectral Acceleration": {
@@ -71,23 +71,23 @@
"ys": [
0.24225805041057027,
0.1626494298061276,
- 0.11286823232748021,
+ 0.11286823232748022,
0.08019936527365806,
0.057001082377164766,
- 0.03977231046422921,
+ 0.039772310464229216,
0.026270923994779784,
0.0159300182060438,
0.008586807484419113,
0.0040091692633346795,
- 0.0016237229130359049,
+ 0.0016237229130359047,
5.831580842583807E-4,
- 1.9354910833413707E-4,
+ 1.935491083341371E-4,
6.446411351755592E-5,
2.0541404464536928E-5,
5.89324452995356E-6,
1.3026715401568408E-6,
2.061368668443604E-7,
- 2.2313612928494355E-8,
+ 2.231361292849435E-8,
3.427414499140028E-10
]
},
@@ -121,18 +121,18 @@
1.0330746473392465,
0.868541087272583,
0.6793538859833672,
- 0.4895776766820634,
+ 0.48957767668206337,
0.32305214036758084,
0.19728774899189122,
0.11230291486323442,
- 0.059998792401783616,
+ 0.05999879240178362,
0.02903842762547559,
- 0.012752442114810742,
+ 0.012752442114810743,
0.004825259624029285,
- 0.0015856433122290357,
+ 0.0015856433122290359,
4.467361996202859E-4,
1.0815891326044897E-4,
- 2.150197599508401E-5,
+ 2.1501975995084007E-5,
3.0877820264321665E-6,
2.0121735347546392E-7
]
@@ -164,23 +164,23 @@
1.4371068709113273,
1.3442294606163505,
1.2504550788598903,
- 1.1451084785403978,
- 1.0076845134906758,
+ 1.145108478540398,
+ 1.0076845134906756,
0.8393355383077514,
0.6496537972367906,
0.4625305796292689,
- 0.3035348264320895,
- 0.18409848770017576,
+ 0.30353482643208957,
+ 0.18409848770017573,
0.10404729414822564,
0.05492082710147257,
0.026929508320917738,
0.012117250742785222,
0.0049122319794404614,
- 0.0017509584506394302,
+ 0.0017509584506394304,
5.433850247572385E-4,
1.4341185451814312E-4,
3.1018961899754435E-5,
- 5.139667971021216E-6
+ 5.1396679710212166E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
similarity index 87%
rename from src/test/resources/e2e/nshm-conus-2018-HONOLULU_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
index 87cb4ce99..5e230f1e6 100644
--- a/src/test/resources/e2e/nshm-conus-2018-HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
@@ -25,24 +25,24 @@
"ys": [
0.1096176362431887,
0.07712267985209978,
- 0.05236216472551225,
- 0.03410083982464373,
- 0.02132788570031522,
+ 0.05236216472551226,
+ 0.03410083982464372,
+ 0.021327885700315224,
0.012597455865731777,
0.007195466062794852,
0.0039020156778838797,
0.0020347763827356416,
- 0.0010104978512827576,
+ 0.0010104978512827578,
4.744665345271375E-4,
- 2.0784677016393615E-4,
+ 2.0784677016393618E-4,
8.354936782969439E-5,
3.0262362405560818E-5,
9.700628718654082E-6,
2.73388661760168E-6,
- 6.418080520161568E-7,
+ 6.418080520161567E-7,
1.2432205810419981E-7,
1.6644800833465068E-8,
- 8.894088492362763E-10
+ 8.894088492362762E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -83,11 +83,11 @@
2.5779423268780836E-5,
9.34540879758316E-6,
3.0570885601346303E-6,
- 8.448187381597024E-7,
+ 8.448187381597023E-7,
2.0283376419955368E-7,
3.799045552673217E-8,
5.257992980887434E-9,
- 4.696318067912854E-10,
+ 4.696318067912855E-10,
8.040835683421514E-12
]
},
@@ -116,13 +116,13 @@
],
"ys": [
0.16241112120908746,
- 0.12117474522250349,
- 0.08821017091766083,
- 0.06247545594775962,
- 0.04294114327512309,
+ 0.1211747452225035,
+ 0.08821017091766084,
+ 0.062475455947759634,
+ 0.0429411432751231,
0.028525687803782396,
0.018224455950293393,
- 0.011059987400758737,
+ 0.011059987400758736,
0.006364262004183083,
0.0034377054571609225,
0.001738825379832288,
@@ -162,18 +162,18 @@
],
"ys": [
0.20884911299107897,
- 0.1614581046884402,
+ 0.16145810468844024,
0.11999074916434269,
0.08664281640904029,
- 0.06035281081025549,
- 0.041136602866201834,
- 0.027122373299762817,
+ 0.06035281081025548,
+ 0.04113660286620183,
+ 0.02712237329976281,
0.017158998663766196,
0.010389832056442814,
- 0.005966842420004628,
- 0.003237425806138684,
+ 0.005966842420004629,
+ 0.0032374258061386835,
0.0016481130397465967,
- 7.801989781232736E-4,
+ 7.801989781232735E-4,
3.388907756049955E-4,
1.3261398028112855E-4,
4.5544380625508945E-5,
diff --git a/src/test/resources/e2e/nshm-conus-2018-KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
similarity index 88%
rename from src/test/resources/e2e/nshm-conus-2018-KAILUA_KONA_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
index e95d6d19d..cdfb35eec 100644
--- a/src/test/resources/e2e/nshm-conus-2018-KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
@@ -23,7 +23,7 @@
1.7119945007591924
],
"ys": [
- 0.9310649618626424,
+ 0.9310649618626425,
0.7152683525622628,
0.5254960437436178,
0.37057192881004797,
@@ -31,15 +31,15 @@
0.1673342748557868,
0.10852163641624823,
0.06764805605345484,
- 0.040421250385918366,
- 0.022759302561329985,
+ 0.04042125038591836,
+ 0.02275930256132998,
0.012035453130050871,
0.006001361401039622,
0.002825403258669261,
0.0012397199668725764,
4.913127725890904E-4,
1.6916652515186739E-4,
- 4.6081848166959275E-5,
+ 4.608184816695928E-5,
9.142956045358946E-6,
1.067682459238504E-6,
4.4135240737735364E-8
@@ -73,13 +73,13 @@
0.13554779250681923,
0.09647775115759329,
0.06847614819048337,
- 0.04772578379364717,
+ 0.04772578379364718,
0.03208679105889853,
- 0.020129540279605,
+ 0.020129540279605004,
0.011639202185119844,
0.0061951399190677625,
- 0.003075883535659292,
- 0.0014771509658122375,
+ 0.0030758835356592923,
+ 0.0014771509658122373,
7.061929082246017E-4,
3.3451441585971104E-4,
1.5467986387544447E-4,
@@ -120,11 +120,11 @@
1.0517265084684115,
0.8707860874217463,
0.6765138623146243,
- 0.493401638622512,
+ 0.49340163862251196,
0.33992289432676787,
0.22192803156480623,
0.13847632521718928,
- 0.08175333860325448,
+ 0.0817533386032545,
0.04511099205028913,
0.022490754664834876,
0.010374939794256521,
@@ -132,7 +132,7 @@
0.0016216028906538638,
5.238693662990279E-4,
1.3772717633153163E-4,
- 2.676199733991637E-5,
+ 2.6761997339916372E-5,
3.5045913382111145E-6,
2.3097496341714198E-7
]
@@ -162,23 +162,23 @@
],
"ys": [
1.3761096429204573,
- 1.292747489392661,
+ 1.2927474893926607,
1.178335057078432,
1.0275173511479154,
0.842703120792494,
0.6513972997833428,
- 0.4724290039202468,
- 0.3221706088273527,
+ 0.47242900392024684,
+ 0.32217060882735266,
0.20861884543377657,
- 0.128355896587962,
+ 0.12835589658796198,
0.07482094551740774,
- 0.040954079958872666,
+ 0.04095407995887267,
0.02092944382070038,
- 0.009967533485864722,
- 0.004400165256626161,
+ 0.009967533485864724,
+ 0.0044001652566261614,
0.0017609227596797569,
6.180891817013114E-4,
- 1.815463526788613E-4,
+ 1.8154635267886133E-4,
4.1290331752591286E-5,
6.280186508295586E-6
]
--
GitLab