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

made SiteSet public

parent 7beb96b0
No related branches found
No related tags found
1 merge request!94Site handling refactor
...@@ -21,7 +21,6 @@ import com.google.gson.JsonDeserializationContext; ...@@ -21,7 +21,6 @@ import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer; import com.google.gson.JsonDeserializer;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer; import com.google.gson.JsonSerializer;
......
...@@ -47,7 +47,7 @@ import com.google.gson.JsonObject; ...@@ -47,7 +47,7 @@ import com.google.gson.JsonObject;
* *
* @author Peter Powers * @author Peter Powers
*/ */
final class SiteSet implements Iterable<Site> { public final class SiteSet implements Iterable<Site> {
final private GriddedRegion region; final private GriddedRegion region;
final private Builder builder; final private Builder builder;
......
...@@ -23,6 +23,7 @@ import org.opensha2.calc.Calcs; ...@@ -23,6 +23,7 @@ import org.opensha2.calc.Calcs;
import org.opensha2.calc.Hazard; import org.opensha2.calc.Hazard;
import org.opensha2.calc.Results; import org.opensha2.calc.Results;
import org.opensha2.calc.Site; import org.opensha2.calc.Site;
import org.opensha2.calc.SiteSet;
import org.opensha2.eq.model.HazardModel; import org.opensha2.eq.model.HazardModel;
import org.opensha2.gmm.Imt; import org.opensha2.gmm.Imt;
import org.opensha2.util.Logging; import org.opensha2.util.Logging;
...@@ -118,7 +119,7 @@ public class HazardCalc { ...@@ -118,7 +119,7 @@ public class HazardCalc {
Iterable<Site> sites = config.sites(); Iterable<Site> sites = config.sites();
if (argCount > 2) { if (argCount > 2) {
Path sitePath = Paths.get(args[2]); Path sitePath = Paths.get(args[2]);
sites = Site.fromCsv(sitePath); sites = SiteSet.fromCsv(sitePath);
log.info(""); log.info("");
StringBuilder sb = new StringBuilder() StringBuilder sb = new StringBuilder()
.append("Site config:") .append("Site config:")
......
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