From adcb150b50723a0ed945a6235e927f3f0632cb9e Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 14 Mar 2016 10:39:14 -0600
Subject: [PATCH] made SiteSet public
---
src/org/opensha2/calc/Site.java | 1 -
src/org/opensha2/calc/SiteSet.java | 2 +-
src/org/opensha2/programs/HazardCalc.java | 3 ++-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/org/opensha2/calc/Site.java b/src/org/opensha2/calc/Site.java
index dde2da60d..9baa45477 100644
--- a/src/org/opensha2/calc/Site.java
+++ b/src/org/opensha2/calc/Site.java
@@ -21,7 +21,6 @@ import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
diff --git a/src/org/opensha2/calc/SiteSet.java b/src/org/opensha2/calc/SiteSet.java
index f74692571..4e184bffb 100644
--- a/src/org/opensha2/calc/SiteSet.java
+++ b/src/org/opensha2/calc/SiteSet.java
@@ -47,7 +47,7 @@ import com.google.gson.JsonObject;
*
* @author Peter Powers
*/
-final class SiteSet implements Iterable<Site> {
+public final class SiteSet implements Iterable<Site> {
final private GriddedRegion region;
final private Builder builder;
diff --git a/src/org/opensha2/programs/HazardCalc.java b/src/org/opensha2/programs/HazardCalc.java
index b1309a2b7..fd80ab11f 100644
--- a/src/org/opensha2/programs/HazardCalc.java
+++ b/src/org/opensha2/programs/HazardCalc.java
@@ -23,6 +23,7 @@ import org.opensha2.calc.Calcs;
import org.opensha2.calc.Hazard;
import org.opensha2.calc.Results;
import org.opensha2.calc.Site;
+import org.opensha2.calc.SiteSet;
import org.opensha2.eq.model.HazardModel;
import org.opensha2.gmm.Imt;
import org.opensha2.util.Logging;
@@ -118,7 +119,7 @@ public class HazardCalc {
Iterable<Site> sites = config.sites();
if (argCount > 2) {
Path sitePath = Paths.get(args[2]);
- sites = Site.fromCsv(sitePath);
+ sites = SiteSet.fromCsv(sitePath);
log.info("");
StringBuilder sb = new StringBuilder()
.append("Site config:")
--
GitLab