Skip to content
Snippets Groups Projects
Commit dabd5d65 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

added bounds to model info object

parent 1ca4a4cb
No related branches found
No related tags found
1 merge request!273Site, tree, and NGA-East edits
...@@ -12,6 +12,7 @@ import java.nio.file.Path; ...@@ -12,6 +12,7 @@ import java.nio.file.Path;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -61,6 +62,7 @@ public final class HazardModel implements Iterable<SourceTree> { ...@@ -61,6 +62,7 @@ public final class HazardModel implements Iterable<SourceTree> {
private final String name; private final String name;
private final CalcConfig config; private final CalcConfig config;
private final Map<NehrpSiteClass, Double> siteClassMap; private final Map<NehrpSiteClass, Double> siteClassMap;
private final Map<String, Double> bounds;
private final Multimap<SourceType, RuptureSet<? extends Source>> ruptureSetMap; private final Multimap<SourceType, RuptureSet<? extends Source>> ruptureSetMap;
private final Set<TectonicSetting> settings; private final Set<TectonicSetting> settings;
...@@ -74,6 +76,7 @@ public final class HazardModel implements Iterable<SourceTree> { ...@@ -74,6 +76,7 @@ public final class HazardModel implements Iterable<SourceTree> {
this.name = builder.info.name; this.name = builder.info.name;
this.config = builder.config; this.config = builder.config;
this.siteClassMap = Maps.immutableEnumMap(builder.info.siteClassMap); this.siteClassMap = Maps.immutableEnumMap(builder.info.siteClassMap);
this.bounds = new HashMap<>(builder.info.bounds); // TODO make immutable
this.ruptureSetMap = builder.ruptureSetMap; this.ruptureSetMap = builder.ruptureSetMap;
this.settings = Sets.immutableEnumSet(builder.settings); this.settings = Sets.immutableEnumSet(builder.settings);
this.mapRegionMap = Maps.immutableEnumMap(builder.mapRegionMap); this.mapRegionMap = Maps.immutableEnumMap(builder.mapRegionMap);
...@@ -316,10 +319,15 @@ public final class HazardModel implements Iterable<SourceTree> { ...@@ -316,10 +319,15 @@ public final class HazardModel implements Iterable<SourceTree> {
final String name; final String name;
@SerializedName("site-class-vs30") @SerializedName("site-class-vs30")
final Map<NehrpSiteClass, Double> siteClassMap; 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.name = name;
this.siteClassMap = siteClassMap; this.siteClassMap = siteClassMap;
this.bounds = bounds;
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment