Skip to content
Snippets Groups Projects
Commit c4a5c24c authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

change class name for lambda

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