From dabd5d650e88bb3cae89f8dca14bc1f7d1be98e4 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Thu, 12 May 2022 11:35:55 -0600
Subject: [PATCH] added bounds to model info object
---
.../gov/usgs/earthquake/nshmp/model/HazardModel.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/HazardModel.java b/src/main/java/gov/usgs/earthquake/nshmp/model/HazardModel.java
index c89c991b..7ba8d037 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/model/HazardModel.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/model/HazardModel.java
@@ -12,6 +12,7 @@ import java.nio.file.Path;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.EnumSet;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -61,6 +62,7 @@ public final class HazardModel implements Iterable<SourceTree> {
private final String name;
private final CalcConfig config;
private final Map<NehrpSiteClass, Double> siteClassMap;
+ private final Map<String, Double> bounds;
private final Multimap<SourceType, RuptureSet<? extends Source>> ruptureSetMap;
private final Set<TectonicSetting> settings;
@@ -74,6 +76,7 @@ public final class HazardModel implements Iterable<SourceTree> {
this.name = builder.info.name;
this.config = builder.config;
this.siteClassMap = Maps.immutableEnumMap(builder.info.siteClassMap);
+ this.bounds = new HashMap<>(builder.info.bounds); // TODO make immutable
this.ruptureSetMap = builder.ruptureSetMap;
this.settings = Sets.immutableEnumSet(builder.settings);
this.mapRegionMap = Maps.immutableEnumMap(builder.mapRegionMap);
@@ -316,10 +319,15 @@ public final class HazardModel implements Iterable<SourceTree> {
final String name;
@SerializedName("site-class-vs30")
final Map<NehrpSiteClass, Double> siteClassMap;
+ final Map<String, Double> bounds;
- Info(String name, Map<NehrpSiteClass, Double> siteClassMap) {
+ Info(
+ String name,
+ Map<NehrpSiteClass, Double> siteClassMap,
+ Map<String, Double> bounds) {
this.name = name;
this.siteClassMap = siteClassMap;
+ this.bounds = bounds;
}
}
--
GitLab