Skip to content

Commit aaf9d1c

Browse files
pmpowers-usgspmpowers-usgs
authored
Merge pull request #406 from pmpowers-usgs/ngae-tests-124
Ngae tests 124
2 parents dbf5172 + 743bea3 commit aaf9d1c

30 files changed

+24881
-17489
lines changed

‎test/gov/usgs/earthquake/nshmp/gmm/CeusHardRock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
@RunWith(Parameterized.class)
2121
public class CeusHardRock extends GmmTest {
2222

23-
private static String GMM_INPUTS = "CEUS_vs2000_inputs.csv";
24-
private static String GMM_RESULTS = "CEUS_vs2000_results.csv";
23+
private static String GMM_INPUTS = "ceus-vs2000-inputs.csv";
24+
private static String GMM_RESULTS = "ceus-vs2000-results.csv";
2525

2626
@Parameters(name = "{index}: {0} {2} {1}")
2727
public static Collection<Object[]> data() throws IOException {

‎test/gov/usgs/earthquake/nshmp/gmm/CeusSoftRock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
@RunWith(Parameterized.class)
2121
public class CeusSoftRock extends GmmTest {
2222

23-
private static String GMM_INPUTS = "CEUS_vs760_inputs.csv";
24-
private static String GMM_RESULTS = "CEUS_vs760_results.csv";
23+
private static String GMM_INPUTS = "ceus-vs760-inputs.csv";
24+
private static String GMM_RESULTS = "ceus-vs760-results.csv";
2525

2626
@Parameters(name = "{index}: {0} {2} {1}")
2727
public static Collection<Object[]> data() throws IOException {

‎test/gov/usgs/earthquake/nshmp/gmm/GmmTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public abstract class GmmTest {
2929

3030
private static final String DATA_DIR = "data/";
31-
private static final double TOL = 1e-6;
31+
private static final double TOL = 1e-10;
3232

3333
private int index;
3434
private Gmm gmm;
@@ -77,8 +77,8 @@ static void generateResults(
7777
ScalarGroundMotion sgm = gmModel.calc(input);
7878
String result = Parsing.join(
7979
Lists.newArrayList(modelIndex++ + "-" + id,
80-
String.format("%.6f", Math.exp(sgm.mean())),
81-
String.format("%.6f", sgm.sigma())),
80+
String.format("%.10f", Math.exp(sgm.mean())),
81+
String.format("%.10f", sgm.sigma())),
8282
Delimiter.COMMA);
8383
lines.add(result);
8484
}

‎test/gov/usgs/earthquake/nshmp/gmm/LegacySoftRock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public class LegacySoftRock extends GmmTest {
2727
* currently used in the 2007 Alaska NSHM.
2828
*/
2929

30-
private static String GMM_INPUTS = "CEUS_vs760_inputs.csv";
31-
private static String GMM_RESULTS = "LEGACY_vs760_results.csv";
30+
private static String GMM_INPUTS = "ceus-vs760-inputs.csv";
31+
private static String GMM_RESULTS = "legacy-vs760-results.csv";
3232

3333
@Parameters(name = "{index}: {0} {2} {1}")
3434
public static Collection<Object[]> data() throws IOException {

‎test/gov/usgs/earthquake/nshmp/gmm/NgaEast.java

+47
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
package gov.usgs.earthquake.nshmp.gmm;
2+
3+
import static gov.usgs.earthquake.nshmp.gmm.Gmm.NGA_EAST_USGS;
4+
import static gov.usgs.earthquake.nshmp.gmm.Gmm.NGA_EAST_USGS_SEEDS;
5+
import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
6+
import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P02;
7+
import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P1;
8+
import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
9+
import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
10+
import static gov.usgs.earthquake.nshmp.gmm.Imt.SA3P0;
11+
import static gov.usgs.earthquake.nshmp.gmm.Imt.SA5P0;
12+
import static gov.usgs.earthquake.nshmp.gmm.Imt.SA10P0;
13+
14+
import java.io.IOException;
15+
import java.util.Collection;
16+
import java.util.EnumSet;
17+
import java.util.Set;
18+
19+
import org.junit.runner.RunWith;
20+
import org.junit.runners.Parameterized;
21+
import org.junit.runners.Parameterized.Parameters;
22+
23+
@SuppressWarnings("javadoc")
24+
@RunWith(Parameterized.class)
25+
public class NgaEast extends GmmTest {
26+
27+
private static String GMM_INPUTS = "nga-east-inputs.csv";
28+
private static String GMM_RESULTS = "nga-east-results.csv";
29+
30+
@Parameters(name = "{index}: {0} {2} {1}")
31+
public static Collection<Object[]> data() throws IOException {
32+
return loadResults(GMM_RESULTS);
33+
}
34+
35+
public NgaEast(int index, Gmm gmm, Imt imt, double exMedian, double exSigma) {
36+
super(index, gmm, imt, exMedian, exSigma, GMM_INPUTS);
37+
}
38+
39+
/* Result generation sets */
40+
private static Set<Gmm> gmms = EnumSet.of(NGA_EAST_USGS, NGA_EAST_USGS_SEEDS);
41+
private static Set<Imt> imts = EnumSet.of(PGA, SA0P02, SA0P1, SA0P2, SA1P0, SA3P0, SA5P0, SA10P0);
42+
43+
public static void main(String[] args) throws IOException {
44+
GmmTest.generateResults(gmms, imts, GMM_INPUTS, GMM_RESULTS);
45+
}
46+
47+
}

‎test/gov/usgs/earthquake/nshmp/gmm/Ngaw1.java ‎test/gov/usgs/earthquake/nshmp/gmm/NgaWest1.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020

2121
@SuppressWarnings("javadoc")
2222
@RunWith(Parameterized.class)
23-
public class Ngaw1 extends GmmTest {
23+
public class NgaWest1 extends GmmTest {
2424

25-
private static String GMM_INPUTS = "NGA_inputs.csv";
26-
private static String GMM_RESULTS = "NGAW1_results.csv";
25+
private static String GMM_INPUTS = "nga-west-inputs.csv";
26+
private static String GMM_RESULTS = "nga-west1-results.csv";
2727

2828
@Parameters(name = "{index}: {0} {2} {1}")
2929
public static Collection<Object[]> data() throws IOException {
3030
return loadResults(GMM_RESULTS);
3131
}
3232

33-
public Ngaw1(int index, Gmm gmm, Imt imt, double exMedian, double exSigma) {
33+
public NgaWest1(int index, Gmm gmm, Imt imt, double exMedian, double exSigma) {
3434
super(index, gmm, imt, exMedian, exSigma, GMM_INPUTS);
3535
}
3636

‎test/gov/usgs/earthquake/nshmp/gmm/Ngaw2.java ‎test/gov/usgs/earthquake/nshmp/gmm/NgaWest2.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@
2222

2323
@SuppressWarnings("javadoc")
2424
@RunWith(Parameterized.class)
25-
public class Ngaw2 extends GmmTest {
25+
public class NgaWest2 extends GmmTest {
2626

27-
private static String GMM_INPUTS = "NGA_inputs.csv";
28-
private static String GMM_RESULTS = "NGAW2_results.csv";
27+
private static String GMM_INPUTS = "nga-west-inputs.csv";
28+
private static String GMM_RESULTS = "nga-west2-results.csv";
2929

3030
@Parameters(name = "{index}: {0} {2} {1}")
3131
public static Collection<Object[]> data() throws IOException {
3232
return loadResults(GMM_RESULTS);
3333
}
3434

35-
public Ngaw2(int index, Gmm gmm, Imt imt, double exMedian, double exSigma) {
35+
public NgaWest2(int index, Gmm gmm, Imt imt, double exMedian, double exSigma) {
3636
super(index, gmm, imt, exMedian, exSigma, GMM_INPUTS);
3737
}
3838

‎test/gov/usgs/earthquake/nshmp/gmm/SubInterface.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
@RunWith(Parameterized.class)
2525
public class SubInterface extends GmmTest {
2626

27-
private static String GMM_INPUTS = "INTERFACE_inputs.csv";
28-
private static String GMM_RESULTS = "INTERFACE_results.csv";
27+
private static String GMM_INPUTS = "interface-inputs.csv";
28+
private static String GMM_RESULTS = "interface-results.csv";
2929

3030
@Parameters(name = "{index}: {0} {2} {1}")
3131
public static Collection<Object[]> data() throws IOException {

‎test/gov/usgs/earthquake/nshmp/gmm/SubSlab.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
@RunWith(Parameterized.class)
2626
public class SubSlab extends GmmTest {
2727

28-
private static String GMM_INPUTS = "SLAB_inputs.csv";
29-
private static String GMM_RESULTS = "SLAB_results.csv";
28+
private static String GMM_INPUTS = "slab-inputs.csv";
29+
private static String GMM_RESULTS = "slab-results.csv";
3030

3131
@Parameters(name = "{index}: {0} {2} {1}")
3232
public static Collection<Object[]> data() throws IOException {

0 commit comments

Comments
 (0)