From c4a5c24c75af4f2503179f645fb409c7d4d3fec9 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 13 Jan 2025 15:25:02 -0700
Subject: [PATCH 1/3] change class name for lambda
---
.../earthquake/nshmp/calc/DisaggConfig.java | 14 ++++++-------
.../earthquake/nshmp/calc/DisaggExport.java | 20 +++++++++----------
2 files changed, 17 insertions(+), 17 deletions(-)
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 8b670b51..62cf51fd 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 c684929b..a92bf6e2 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;
--
GitLab
From af8c4296048dc4dec94ef2ceaa94436c34840edf Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 13 Jan 2025 15:26:08 -0700
Subject: [PATCH 2/3] tag
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dd557fcb..a6503fff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ Publish:
- Markdown Lint
- Unit Tests
only:
- - tags@ghsc/nshmp/nshmp-lib
+ - tags
script:
- ./gradlew publish -P version=${CI_COMMIT_TAG}
stage: publish
--
GitLab
From ca5062b5e36bbc8715b7acaeef2962b5283b1224 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 15 Jan 2025 08:24:06 -0700
Subject: [PATCH 3/3] fix tag
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6503fff..dd557fcb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -59,7 +59,7 @@ Publish:
- Markdown Lint
- Unit Tests
only:
- - tags
+ - tags@ghsc/nshmp/nshmp-lib
script:
- ./gradlew publish -P version=${CI_COMMIT_TAG}
stage: publish
--
GitLab