diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggConfig.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggConfig.java index 8b670b514d544ad59631099475804f7ac928afb8..62cf51fdb2c56c1511ccac7e9b2321befc3c59bc 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggConfig.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggConfig.java @@ -6,7 +6,7 @@ import java.util.ArrayList; import java.util.List; import gov.usgs.earthquake.nshmp.calc.CalcConfig.Disagg.Bins; -import gov.usgs.earthquake.nshmp.calc.DisaggExport.εBin; +import gov.usgs.earthquake.nshmp.calc.DisaggExport.epsilonBin; import gov.usgs.earthquake.nshmp.gmm.Imt; /** @@ -24,7 +24,7 @@ import gov.usgs.earthquake.nshmp.gmm.Imt; final class DisaggConfig { final Bins bins; - final List<εBin> εBins; + final List<epsilonBin> εBins; final double contributorLimit; final Imt imt; @@ -37,7 +37,7 @@ final class DisaggConfig { private DisaggConfig( Bins bins, - List<εBin> εBins, + List<epsilonBin> εBins, double contributorLimit, Imt imt, DisaggDataset model, @@ -90,7 +90,7 @@ final class DisaggConfig { static class Builder { private Bins bins; - private List<εBin> εBins; + private List<epsilonBin> εBins; private Double contributorLimit; private Imt imt; @@ -158,13 +158,13 @@ final class DisaggConfig { } } - static List<εBin> createEpsilonBins(List<Double> εLevels, double εDelta) { + static List<epsilonBin> createEpsilonBins(List<Double> εLevels, double εDelta) { double εDeltaBy2 = εDelta / 2.0; - List<εBin> bins = new ArrayList<>(); + List<epsilonBin> bins = new ArrayList<>(); for (int i = 0; i < εLevels.size(); i++) { Double min = (i == 0) ? null : εLevels.get(i) - εDeltaBy2; Double max = (i == εLevels.size() - 1) ? null : εLevels.get(i) + εDeltaBy2; - bins.add(new εBin(i, min, max)); + bins.add(new epsilonBin(i, min, max)); } return List.copyOf(bins); } diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggExport.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggExport.java index c684929b5f6df36760164bb458afbfc4bcf8234e..a92bf6e2148f600c5932ad4d0d7f6f3a5405e7b5 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggExport.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggExport.java @@ -91,13 +91,13 @@ final class DisaggExport { double εBar = dd.rmεScaled.get(ri, mi) / rmBinWeight; double[] εValues = dd.rmε.column(ri, mi).yValues().toArray(); DoubleData.multiply(toPercent, εValues); - List<εData> εDataList = new ArrayList<>(); + List<epsilonData> εDataList = new ArrayList<>(); for (int i = 0; i < εValues.length; i++) { double εValue = εValues[i]; if (εValue <= 0.0) { continue; } - εDataList.add(new εData(i, εValue)); + εDataList.add(new epsilonData(i, εValue)); } RmBin rmBin = new RmBin( r, m, @@ -122,7 +122,7 @@ final class DisaggExport { final double rBar; final double mBar; final double εBar; - final List<εData> εdata; + final List<epsilonData> εdata; private RmBin( double r, @@ -130,7 +130,7 @@ final class DisaggExport { double rBar, double mBar, double εBar, - List<εData> εdata) { + List<epsilonData> εdata) { this.r = r; this.m = m; @@ -145,12 +145,12 @@ final class DisaggExport { * Single ε value bin. */ @SuppressWarnings("unused") - private static final class εData { + private static final class epsilonData { final int εbin; final double value; - private εData(int εbin, double value) { + private epsilonData(int εbin, double value) { this.εbin = εbin; this.value = value; } @@ -358,23 +358,23 @@ final class DisaggExport { return List.copyOf(jsonContributors); } - private static List<SummaryItem> toSummaryItems(List<εBin> εBins) { + private static List<SummaryItem> toSummaryItems(List<epsilonBin> εBins) { return εBins.stream() .map(DisaggExport::εBinToSummary) .collect(Collectors.toList()); } - private static SummaryItem εBinToSummary(εBin bin) { + private static SummaryItem εBinToSummary(epsilonBin bin) { return new SummaryItem("ε" + bin.id, bin.toString(), null); } - static final class εBin { + static final class epsilonBin { final int id; final Double min; final Double max; - εBin(int id, Double min, Double max) { + epsilonBin(int id, Double min, Double max) { this.id = id; this.min = min; this.max = max;