From e3ca25186e9ac19af322e86de508c1b1fce27140 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 30 Sep 2024 13:29:09 -0600
Subject: [PATCH] using var
---
.../usgs/earthquake/nshmp/model/LoaderTests.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/LoaderTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/LoaderTests.java
index 9b8ab8bb..d54fe784 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/LoaderTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/LoaderTests.java
@@ -33,7 +33,6 @@ import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
import gov.usgs.earthquake.nshmp.calc.HazardExport;
import gov.usgs.earthquake.nshmp.calc.Site;
import gov.usgs.earthquake.nshmp.calc.Sites;
-import gov.usgs.earthquake.nshmp.data.MutableXySequence;
import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Gmm;
@@ -108,8 +107,8 @@ class LoaderTests {
*/
// GMM curves
- Map<Gmm, Map<Location, XySequence>> gmmExpecteds = expecteds.gmmCurves.get(imt);
- Map<Gmm, ? extends XySequence> gmmActuals = gmmActualsImtMap.get(imt);
+ var gmmExpecteds = expecteds.gmmCurves.get(imt);
+ var gmmActuals = gmmActualsImtMap.get(imt);
for (Gmm gmm : gmmActuals.keySet()) {
XySequence gmmExpected = gmmExpecteds.get(gmm).get(loc);
XySequence gmmActual = gmmActuals.get(gmm);
@@ -117,8 +116,8 @@ class LoaderTests {
}
// Source type curves
- Map<SourceType, Map<Location, XySequence>> typeExpecteds = expecteds.typeCurves.get(imt);
- Map<SourceType, ? extends XySequence> typeActuals = typeActualsImtMap.get(imt);
+ var typeExpecteds = expecteds.typeCurves.get(imt);
+ var typeActuals = typeActualsImtMap.get(imt);
for (SourceType type : typeActuals.keySet()) {
XySequence typeExpected = typeExpecteds.get(type).get(loc);
XySequence typeActual = typeActuals.get(type);
@@ -126,8 +125,8 @@ class LoaderTests {
}
// Magnitude curves
- Map<Double, XySequence> magExpecteds = expecteds.magCurves.get(imt).get(loc);
- Map<Double, MutableXySequence> magActuals = actuals.magCurves().get(imt);
+ var magExpecteds = expecteds.magCurves.get(imt).get(loc);
+ var magActuals = actuals.magCurves().get(imt);
for (Double m : magActuals.keySet()) {
// if mag bin not used actuals will be null
// and expecteds will be array of zeros
--
GitLab