From 500bbb111d722562a4da94a5a515e74e460c0ef8 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 4 Nov 2024 13:32:48 -0700
Subject: [PATCH] changed return period fields from int to double
---
.../java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java | 8 ++++----
.../gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
index 37fb6e6d..126015be 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
@@ -542,7 +542,7 @@ public final class CalcConfig {
* The return period (in years) at which disaggregations will be performed
* unless period-specific ground motion levels are included in a sites file.
*/
- public final Integer returnPeriod;
+ public final Double returnPeriod;
/**
* The distance, magnitude, and epsilon bins into which contributing sources
@@ -611,7 +611,7 @@ public final class CalcConfig {
private static final class Builder {
- Integer returnPeriod;
+ Double returnPeriod;
Bins bins;
Double contributorLimit;
@@ -793,7 +793,7 @@ public final class CalcConfig {
*
* <p><b>Default:</b> [475, 975, 2475]
*/
- public final List<Integer> returnPeriods;
+ public final List<Double> returnPeriods;
private Output(Builder b) {
this.directory = b.directory;
@@ -805,7 +805,7 @@ public final class CalcConfig {
Path directory;
Set<DataType> dataTypes;
- List<Integer> returnPeriods;
+ List<Double> returnPeriods;
Output build() {
checkNotNull(directory);
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java b/src/test/java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java
index 53246033..53f2b189 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java
@@ -370,7 +370,7 @@ class CalcConfigTests {
@Test
void testOutputMember() {
- List<Integer> defaultReturnPeroiods = List.of(475, 975, 2475, 10000);
+ List<Double> defaultReturnPeroiods = List.of(475.0, 975.0, 2475.0, 10000.0);
CalcConfig.Output def = DEFAULTS.output;
assertEquals(Path.of("hazout"), def.directory);
@@ -381,7 +381,7 @@ class CalcConfigTests {
assertEquals(Path.of("custom"), def.directory);
// also tests automatic addition of TOTAL and MAP
assertEquals(Set.of(DataType.TOTAL, DataType.MAP, DataType.GMM), def.dataTypes);
- assertEquals(List.of(100, 200), def.returnPeriods);
+ assertEquals(List.of(100.0, 200.0), def.returnPeriods);
def = EXTENDS_EMPTY.output;
assertEquals(Path.of("hazout"), def.directory);
--
GitLab