diff --git a/src/test/java/gov/usgs/earthquake/nshmp/gmm/GmmTest.java b/src/test/java/gov/usgs/earthquake/nshmp/gmm/GmmTest.java
index 54c92fab26753de4f44fac44ef62af8881cecb97..82409b24c5ddde2f7a0d201e885a26ab2b98b1d2 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/gmm/GmmTest.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/gmm/GmmTest.java
@@ -9,6 +9,8 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.EnumSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -17,10 +19,8 @@ import java.util.stream.Stream;
import org.junit.jupiter.params.provider.Arguments;
-import com.google.common.collect.FluentIterable;
import com.google.common.collect.Lists;
import com.google.common.io.Resources;
-import com.google.common.primitives.Doubles;
import gov.usgs.earthquake.nshmp.Text;
import gov.usgs.earthquake.nshmp.Text.Delimiter;
@@ -130,24 +130,29 @@ class GmmTest {
}
private static GmmInput argsToInput(String line) {
- Iterator<Double> it = FluentIterable
- .from(Text.split(line, Delimiter.COMMA))
- .transform(Doubles.stringConverter())
- .iterator();
+ String[] strings = line.split(",");
+ double[] values = Arrays.stream(strings)
+ .limit(13)
+ .mapToDouble(Double::parseDouble)
+ .toArray();
+ Set<GmmFlag> flags = EnumSet.noneOf(GmmFlag.class);
+ if (strings.length == 14) {
+ flags.add(GmmFlag.valueOf(strings[13].trim()));
+ }
return GmmInput.builder()
- .mag(it.next())
- .distances(it.next(), it.next(), it.next())
- .dip(it.next())
- .width(it.next())
- .zTor(it.next())
- .zHyp(it.next())
- .rake(it.next())
- .vs30(it.next())
- .z1p0(it.next())
- .z2p5(it.next())
- .zSed(it.next())
- .flags(Set.of())
+ .mag(values[0])
+ .distances(values[1], values[2], values[3])
+ .dip(values[4])
+ .width(values[5])
+ .zTor(values[6])
+ .zHyp(values[7])
+ .rake(values[8])
+ .vs30(values[9])
+ .z1p0(values[10])
+ .z2p5(values[11])
+ .zSed(values[12])
+ .flags(flags)
.build();
}
diff --git a/src/test/resources/gmm/deep-basin-inputs.csv b/src/test/resources/gmm/deep-basin-inputs.csv
index cca9a5e833d9b04a1ca473af12489d5877374415..7a6b1632d9c63cd6554d870ce918a1db4ecebab6 100644
--- a/src/test/resources/gmm/deep-basin-inputs.csv
+++ b/src/test/resources/gmm/deep-basin-inputs.csv
@@ -1,10 +1,10 @@
-#Mw, rjB, rRup, rX, dip, width, zTor, zHyp, rake, vs30, z1p0, z2p5, zSed
+#Mw, rjB, rRup, rX, dip, width, zTor, zHyp, rake, vs30, z1p0, z2p5, zSed, flag
7.0, 40, 40, 40, 90, 12, 1, 7, 0, 180, 0.04, 0.5, NaN
7.0, 40, 40, 40, 90, 12, 1, 7, 0, 180, 0.1, 2, NaN
7.0, 40, 40, 40, 90, 12, 1, 7, 0, 180, 0.8, 4, NaN
7.0, 40, 40, 40, 90, 12, 1, 7, 0, 360, 0.04, 0.5, NaN
7.0, 40, 40, 40, 90, 12, 1, 7, 0, 360, 0.1, 2, NaN
-7.0, 40, 40, 40, 90, 12, 1, 7, 0, 360, 0.8, 4, NaN
+7.0, 40, 40, 40, 90, 12, 1, 7, 0, 360, 0.8, 4, NaN, LA_CYBERSHAKE
7.0, 40, 40, 40, 90, 12, 1, 7, 0, 760, 0.04, 0.5, NaN
7.0, 40, 40, 40, 90, 12, 1, 7, 0, 760, 0.1, 2, NaN
7.0, 40, 40, 40, 90, 12, 1, 7, 0, 760, 0.8, 4, NaN
@@ -13,7 +13,7 @@
8.2, 40, 40, 40, 90, 12, 1, 7, 0, 180, 0.8, 4, NaN
8.2, 40, 40, 40, 90, 12, 1, 7, 0, 360, 0.04, 0.5, NaN
8.2, 40, 40, 40, 90, 12, 1, 7, 0, 360, 0.1, 2, NaN
-8.2, 40, 40, 40, 90, 12, 1, 7, 0, 360, 0.8, 4, NaN
+8.2, 40, 40, 40, 90, 12, 1, 7, 0, 360, 0.8, 4, NaN, LA_CYBERSHAKE
8.2, 40, 40, 40, 90, 12, 1, 7, 0, 760, 0.04, 0.5, NaN
8.2, 40, 40, 40, 90, 12, 1, 7, 0, 760, 0.1, 2, NaN
8.2, 40, 40, 40, 90, 12, 1, 7, 0, 760, 0.8, 4, NaN
diff --git a/src/test/resources/gmm/deep-basin-results.csv b/src/test/resources/gmm/deep-basin-results.csv
index b7ca26c101c6c5b0bf05c066f876c67517f5aef5..4a5c78cff897c56c738e6cf67e3984db52eb84c2 100644
--- a/src/test/resources/gmm/deep-basin-results.csv
+++ b/src/test/resources/gmm/deep-basin-results.csv
@@ -237,7 +237,7 @@
2-ASK_14_CYBERSHAKE-SA3P0,0.0772817212,0.7343023900
3-ASK_14_CYBERSHAKE-SA3P0,0.0343344342,0.7343023900
4-ASK_14_CYBERSHAKE-SA3P0,0.0343344342,0.7343023900
-5-ASK_14_CYBERSHAKE-SA3P0,0.0405236928,0.7343023900
+5-ASK_14_CYBERSHAKE-SA3P0,0.0430127461,0.7343023900
6-ASK_14_CYBERSHAKE-SA3P0,0.0168827954,0.7343023900
7-ASK_14_CYBERSHAKE-SA3P0,0.0168827954,0.7343023900
8-ASK_14_CYBERSHAKE-SA3P0,0.0257338966,0.7343023900
@@ -246,7 +246,7 @@
11-ASK_14_CYBERSHAKE-SA3P0,0.2319177674,0.7343023900
12-ASK_14_CYBERSHAKE-SA3P0,0.1030355588,0.7343023900
13-ASK_14_CYBERSHAKE-SA3P0,0.1030355588,0.7343023900
-14-ASK_14_CYBERSHAKE-SA3P0,0.1216091493,0.7343023900
+14-ASK_14_CYBERSHAKE-SA3P0,0.1290786476,0.7343023900
15-ASK_14_CYBERSHAKE-SA3P0,0.0506642472,0.7343023900
16-ASK_14_CYBERSHAKE-SA3P0,0.0506642472,0.7343023900
17-ASK_14_CYBERSHAKE-SA3P0,0.0772258661,0.7343023900
@@ -255,7 +255,7 @@
2-ASK_14_CYBERSHAKE-SA5P0,0.0438748838,0.7256031973
3-ASK_14_CYBERSHAKE-SA5P0,0.0186464798,0.7256031973
4-ASK_14_CYBERSHAKE-SA5P0,0.0186464798,0.7256031973
-5-ASK_14_CYBERSHAKE-SA5P0,0.0219784497,0.7256031973
+5-ASK_14_CYBERSHAKE-SA5P0,0.0262762580,0.7256031973
6-ASK_14_CYBERSHAKE-SA5P0,0.0093068248,0.7256031973
7-ASK_14_CYBERSHAKE-SA5P0,0.0093068248,0.7256031973
8-ASK_14_CYBERSHAKE-SA5P0,0.0131080702,0.7256031973
@@ -264,7 +264,7 @@
11-ASK_14_CYBERSHAKE-SA5P0,0.1454201924,0.7256031973
12-ASK_14_CYBERSHAKE-SA5P0,0.0618024356,0.7256031973
13-ASK_14_CYBERSHAKE-SA5P0,0.0618024356,0.7256031973
-14-ASK_14_CYBERSHAKE-SA5P0,0.0728460135,0.7256031973
+14-ASK_14_CYBERSHAKE-SA5P0,0.0870907944,0.7256031973
15-ASK_14_CYBERSHAKE-SA5P0,0.0308468112,0.7256031973
16-ASK_14_CYBERSHAKE-SA5P0,0.0308468112,0.7256031973
17-ASK_14_CYBERSHAKE-SA5P0,0.0434457697,0.7256031973
@@ -273,7 +273,7 @@
2-ASK_14_CYBERSHAKE-SA10P0,0.0159982839,0.7256031973
3-ASK_14_CYBERSHAKE-SA10P0,0.0077697321,0.7256031973
4-ASK_14_CYBERSHAKE-SA10P0,0.0077697321,0.7256031973
-5-ASK_14_CYBERSHAKE-SA10P0,0.0086517833,0.7256031973
+5-ASK_14_CYBERSHAKE-SA10P0,0.0107450867,0.7256031973
6-ASK_14_CYBERSHAKE-SA10P0,0.0042736325,0.7256031973
7-ASK_14_CYBERSHAKE-SA10P0,0.0042736325,0.7256031973
8-ASK_14_CYBERSHAKE-SA10P0,0.0052762792,0.7256031973
@@ -282,7 +282,7 @@
11-ASK_14_CYBERSHAKE-SA10P0,0.0662202866,0.7256031973
12-ASK_14_CYBERSHAKE-SA10P0,0.0321605672,0.7256031973
13-ASK_14_CYBERSHAKE-SA10P0,0.0321605672,0.7256031973
-14-ASK_14_CYBERSHAKE-SA10P0,0.0358115640,0.7256031973
+14-ASK_14_CYBERSHAKE-SA10P0,0.0444761904,0.7256031973
15-ASK_14_CYBERSHAKE-SA10P0,0.0176894702,0.7256031973
16-ASK_14_CYBERSHAKE-SA10P0,0.0176894702,0.7256031973
17-ASK_14_CYBERSHAKE-SA10P0,0.0218396373,0.7256031973
@@ -669,7 +669,7 @@
2-BSSA_14_CYBERSHAKE-SA3P0,0.0859747529,0.7081645289
3-BSSA_14_CYBERSHAKE-SA3P0,0.0309433319,0.7081645289
4-BSSA_14_CYBERSHAKE-SA3P0,0.0309433319,0.7081645289
-5-BSSA_14_CYBERSHAKE-SA3P0,0.0485732352,0.7081645289
+5-BSSA_14_CYBERSHAKE-SA3P0,0.0417621490,0.7081645289
6-BSSA_14_CYBERSHAKE-SA3P0,0.0145968102,0.7081645289
7-BSSA_14_CYBERSHAKE-SA3P0,0.0145968102,0.7081645289
8-BSSA_14_CYBERSHAKE-SA3P0,0.0244542256,0.7081645289
@@ -678,7 +678,7 @@
11-BSSA_14_CYBERSHAKE-SA3P0,0.2803551300,0.7081645289
12-BSSA_14_CYBERSHAKE-SA3P0,0.1010884317,0.7081645289
13-BSSA_14_CYBERSHAKE-SA3P0,0.1010884317,0.7081645289
-14-BSSA_14_CYBERSHAKE-SA3P0,0.1586833698,0.7081645289
+14-BSSA_14_CYBERSHAKE-SA3P0,0.1364323068,0.7081645289
15-BSSA_14_CYBERSHAKE-SA3P0,0.0478027043,0.7081645289
16-BSSA_14_CYBERSHAKE-SA3P0,0.0478027043,0.7081645289
17-BSSA_14_CYBERSHAKE-SA3P0,0.0800844909,0.7081645289
@@ -687,7 +687,7 @@
2-BSSA_14_CYBERSHAKE-SA5P0,0.0485512575,0.7064764681
3-BSSA_14_CYBERSHAKE-SA5P0,0.0175622643,0.7064764681
4-BSSA_14_CYBERSHAKE-SA5P0,0.0175622643,0.7064764681
-5-BSSA_14_CYBERSHAKE-SA5P0,0.0297771220,0.7064764681
+5-BSSA_14_CYBERSHAKE-SA5P0,0.0306536740,0.7064764681
6-BSSA_14_CYBERSHAKE-SA5P0,0.0088354105,0.7064764681
7-BSSA_14_CYBERSHAKE-SA5P0,0.0088354105,0.7064764681
8-BSSA_14_CYBERSHAKE-SA5P0,0.0184814508,0.7064764681
@@ -696,7 +696,7 @@
11-BSSA_14_CYBERSHAKE-SA5P0,0.2194029922,0.7064764681
12-BSSA_14_CYBERSHAKE-SA5P0,0.0793662575,0.7064764681
13-BSSA_14_CYBERSHAKE-SA5P0,0.0793662575,0.7064764681
-14-BSSA_14_CYBERSHAKE-SA5P0,0.1345668586,0.7064764681
+14-BSSA_14_CYBERSHAKE-SA5P0,0.1385281162,0.7064764681
15-BSSA_14_CYBERSHAKE-SA5P0,0.0399302339,0.7064764681
16-BSSA_14_CYBERSHAKE-SA5P0,0.0399302339,0.7064764681
17-BSSA_14_CYBERSHAKE-SA5P0,0.0835239802,0.7064764681
@@ -705,7 +705,7 @@
2-BSSA_14_CYBERSHAKE-SA10P0,0.0133732187,0.6495667787
3-BSSA_14_CYBERSHAKE-SA10P0,0.0060545794,0.6495667787
4-BSSA_14_CYBERSHAKE-SA10P0,0.0060545794,0.6495667787
-5-BSSA_14_CYBERSHAKE-SA10P0,0.0096871434,0.6495667787
+5-BSSA_14_CYBERSHAKE-SA10P0,0.0116093976,0.6495667787
6-BSSA_14_CYBERSHAKE-SA10P0,0.0037091091,0.6495667787
7-BSSA_14_CYBERSHAKE-SA10P0,0.0037091091,0.6495667787
8-BSSA_14_CYBERSHAKE-SA10P0,0.0074916698,0.6495667787
@@ -714,7 +714,7 @@
11-BSSA_14_CYBERSHAKE-SA10P0,0.0945035179,0.6495667787
12-BSSA_14_CYBERSHAKE-SA10P0,0.0427854405,0.6495667787
13-BSSA_14_CYBERSHAKE-SA10P0,0.0427854405,0.6495667787
-14-BSSA_14_CYBERSHAKE-SA10P0,0.0684554074,0.6495667787
+14-BSSA_14_CYBERSHAKE-SA10P0,0.0820392565,0.6495667787
15-BSSA_14_CYBERSHAKE-SA10P0,0.0262108819,0.6495667787
16-BSSA_14_CYBERSHAKE-SA10P0,0.0262108819,0.6495667787
17-BSSA_14_CYBERSHAKE-SA10P0,0.0529408189,0.6495667787
@@ -1101,7 +1101,7 @@
2-CB_14_CYBERSHAKE-SA3P0,0.0697039346,0.7127222460
3-CB_14_CYBERSHAKE-SA3P0,0.0332890011,0.7127222460
4-CB_14_CYBERSHAKE-SA3P0,0.0332890011,0.7127222460
-5-CB_14_CYBERSHAKE-SA3P0,0.0387243251,0.7127222460
+5-CB_14_CYBERSHAKE-SA3P0,0.0420502806,0.7127222460
6-CB_14_CYBERSHAKE-SA3P0,0.0154073190,0.7127222460
7-CB_14_CYBERSHAKE-SA3P0,0.0164976170,0.7127222460
8-CB_14_CYBERSHAKE-SA3P0,0.0205493672,0.7127222460
@@ -1110,7 +1110,7 @@
11-CB_14_CYBERSHAKE-SA3P0,0.1958798973,0.7127222460
12-CB_14_CYBERSHAKE-SA3P0,0.0935477479,0.7127222460
13-CB_14_CYBERSHAKE-SA3P0,0.0935477479,0.7127222460
-14-CB_14_CYBERSHAKE-SA3P0,0.1088219318,0.7127222460
+14-CB_14_CYBERSHAKE-SA3P0,0.1181684318,0.7127222460
15-CB_14_CYBERSHAKE-SA3P0,0.0432971838,0.7127222460
16-CB_14_CYBERSHAKE-SA3P0,0.0463611062,0.7127222460
17-CB_14_CYBERSHAKE-SA3P0,0.0577472125,0.7127222460
@@ -1119,7 +1119,7 @@
2-CB_14_CYBERSHAKE-SA5P0,0.0328958216,0.6934277179
3-CB_14_CYBERSHAKE-SA5P0,0.0166846139,0.6934277179
4-CB_14_CYBERSHAKE-SA5P0,0.0166846139,0.6934277179
-5-CB_14_CYBERSHAKE-SA5P0,0.0195871072,0.6934277179
+5-CB_14_CYBERSHAKE-SA5P0,0.0229156519,0.6934277179
6-CB_14_CYBERSHAKE-SA5P0,0.0083528142,0.6934277179
7-CB_14_CYBERSHAKE-SA5P0,0.0089270372,0.6934277179
8-CB_14_CYBERSHAKE-SA5P0,0.0112004637,0.6934277179
@@ -1128,7 +1128,7 @@
11-CB_14_CYBERSHAKE-SA5P0,0.1152787318,0.6934277179
12-CB_14_CYBERSHAKE-SA5P0,0.0584688584,0.6934277179
13-CB_14_CYBERSHAKE-SA5P0,0.0584688584,0.6934277179
-14-CB_14_CYBERSHAKE-SA5P0,0.0686402337,0.6934277179
+14-CB_14_CYBERSHAKE-SA5P0,0.0803046454,0.6934277179
15-CB_14_CYBERSHAKE-SA5P0,0.0292712505,0.6934277179
16-CB_14_CYBERSHAKE-SA5P0,0.0312835332,0.6934277179
17-CB_14_CYBERSHAKE-SA5P0,0.0392504334,0.6934277179
@@ -1137,7 +1137,7 @@
2-CB_14_CYBERSHAKE-SA10P0,0.0070177261,0.6976338581
3-CB_14_CYBERSHAKE-SA10P0,0.0039398314,0.6976338581
4-CB_14_CYBERSHAKE-SA10P0,0.0039398314,0.6976338581
-5-CB_14_CYBERSHAKE-SA10P0,0.0047076388,0.6976338581
+5-CB_14_CYBERSHAKE-SA10P0,0.0059571922,0.6976338581
6-CB_14_CYBERSHAKE-SA10P0,0.0022319931,0.6976338581
7-CB_14_CYBERSHAKE-SA10P0,0.0023912559,0.6976338581
8-CB_14_CYBERSHAKE-SA10P0,0.0030611510,0.6976338581
@@ -1146,7 +1146,7 @@
11-CB_14_CYBERSHAKE-SA10P0,0.0257518651,0.6976338581
12-CB_14_CYBERSHAKE-SA10P0,0.0144573904,0.6976338581
13-CB_14_CYBERSHAKE-SA10P0,0.0144573904,0.6976338581
-14-CB_14_CYBERSHAKE-SA10P0,0.0172748948,0.6976338581
+14-CB_14_CYBERSHAKE-SA10P0,0.0218601876,0.6976338581
15-CB_14_CYBERSHAKE-SA10P0,0.0081904003,0.6976338581
16-CB_14_CYBERSHAKE-SA10P0,0.0087748222,0.6976338581
17-CB_14_CYBERSHAKE-SA10P0,0.0112330327,0.6976338581
@@ -1533,7 +1533,7 @@
2-CY_14_CYBERSHAKE-SA3P0,0.0748867422,0.6881437387
3-CY_14_CYBERSHAKE-SA3P0,0.0293931149,0.6892367985
4-CY_14_CYBERSHAKE-SA3P0,0.0293931149,0.6892367985
-5-CY_14_CYBERSHAKE-SA3P0,0.0360224164,0.6892367985
+5-CY_14_CYBERSHAKE-SA3P0,0.0368372128,0.6892367985
6-CY_14_CYBERSHAKE-SA3P0,0.0128954441,0.6906930821
7-CY_14_CYBERSHAKE-SA3P0,0.0128954441,0.6906930821
8-CY_14_CYBERSHAKE-SA3P0,0.0166396094,0.6906930821
@@ -1542,7 +1542,7 @@
11-CY_14_CYBERSHAKE-SA3P0,0.2016148190,0.6864744018
12-CY_14_CYBERSHAKE-SA3P0,0.0793650679,0.6881345585
13-CY_14_CYBERSHAKE-SA3P0,0.0793650679,0.6881345585
-14-CY_14_CYBERSHAKE-SA3P0,0.0972650068,0.6881345585
+14-CY_14_CYBERSHAKE-SA3P0,0.0994650586,0.6881345585
15-CY_14_CYBERSHAKE-SA3P0,0.0349547098,0.6903473757
16-CY_14_CYBERSHAKE-SA3P0,0.0349547098,0.6903473757
17-CY_14_CYBERSHAKE-SA3P0,0.0451037371,0.6903473757
@@ -1551,7 +1551,7 @@
2-CY_14_CYBERSHAKE-SA5P0,0.0281245311,0.6838260561
3-CY_14_CYBERSHAKE-SA5P0,0.0116476806,0.6838260561
4-CY_14_CYBERSHAKE-SA5P0,0.0116476806,0.6838260561
-5-CY_14_CYBERSHAKE-SA5P0,0.0147433780,0.6838260561
+5-CY_14_CYBERSHAKE-SA5P0,0.0183754256,0.6838260561
6-CY_14_CYBERSHAKE-SA5P0,0.0055703451,0.6838260561
7-CY_14_CYBERSHAKE-SA5P0,0.0055703451,0.6838260561
8-CY_14_CYBERSHAKE-SA5P0,0.0074846954,0.6838260561
@@ -1560,7 +1560,7 @@
11-CY_14_CYBERSHAKE-SA5P0,0.0886828674,0.6838260561
12-CY_14_CYBERSHAKE-SA5P0,0.0367277134,0.6838260561
13-CY_14_CYBERSHAKE-SA5P0,0.0367277134,0.6838260561
-14-CY_14_CYBERSHAKE-SA5P0,0.0464891321,0.6838260561
+14-CY_14_CYBERSHAKE-SA5P0,0.0579417813,0.6838260561
15-CY_14_CYBERSHAKE-SA5P0,0.0175645303,0.6838260561
16-CY_14_CYBERSHAKE-SA5P0,0.0175645303,0.6838260561
17-CY_14_CYBERSHAKE-SA5P0,0.0236009001,0.6838260561
@@ -1569,7 +1569,7 @@
2-CY_14_CYBERSHAKE-SA10P0,0.0051321613,0.6735783934
3-CY_14_CYBERSHAKE-SA10P0,0.0025698802,0.6735783934
4-CY_14_CYBERSHAKE-SA10P0,0.0025698802,0.6735783934
-5-CY_14_CYBERSHAKE-SA10P0,0.0032744643,0.6735783934
+5-CY_14_CYBERSHAKE-SA10P0,0.0042573298,0.6735783934
6-CY_14_CYBERSHAKE-SA10P0,0.0015171734,0.6735783934
7-CY_14_CYBERSHAKE-SA10P0,0.0015171734,0.6735783934
8-CY_14_CYBERSHAKE-SA10P0,0.0020555318,0.6735783934
@@ -1578,7 +1578,7 @@
11-CY_14_CYBERSHAKE-SA10P0,0.0212011465,0.6735783934
12-CY_14_CYBERSHAKE-SA10P0,0.0106162694,0.6735783934
13-CY_14_CYBERSHAKE-SA10P0,0.0106162694,0.6735783934
-14-CY_14_CYBERSHAKE-SA10P0,0.0135269323,0.6735783934
+14-CY_14_CYBERSHAKE-SA10P0,0.0175871854,0.6735783934
15-CY_14_CYBERSHAKE-SA10P0,0.0062674988,0.6735783934
16-CY_14_CYBERSHAKE-SA10P0,0.0062674988,0.6735783934
17-CY_14_CYBERSHAKE-SA10P0,0.0084914774,0.6735783934