From a27cfd9feef621d00811abe50ae519a809963903 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 4 Jan 2022 16:17:47 -0700
Subject: [PATCH] docs and equals
---
.../usgs/earthquake/nshmp/gmm/GmmInput.java | 36 ++++++++++---------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/GmmInput.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/GmmInput.java
index 6d99ba7d..7ff0c0eb 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/GmmInput.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/GmmInput.java
@@ -208,9 +208,9 @@ public class GmmInput {
*
* <li>vsInf: true</li>
*
- * <li>z2p5: NaN</li>
+ * <li>z2p5: NaN ({@code null} when serialized)</li>
*
- * <li>z1p0: NaN</li></ul>
+ * <li>z1p0: NaN ({@code null} when serialized)</li></ul>
*
* @throws IllegalStateException if any other builder method has already
* been called without first calling {@link #build()}
@@ -595,20 +595,24 @@ public class GmmInput {
if (!(obj instanceof GmmInput)) {
return false;
}
- GmmInput gmm = (GmmInput) obj;
- Boolean z1p0Check = Double.isNaN(gmm.z1p0) ? Double.isNaN(this.z1p0) : this.z1p0 == gmm.z1p0;
- Boolean z2p5Check = Double.isNaN(gmm.z2p5) ? Double.isNaN(this.z2p5) : this.z2p5 == gmm.z2p5;
- return this.Mw == gmm.Mw &&
- this.rJB == gmm.rJB &&
- this.rRup == gmm.rRup &&
- this.rX == gmm.rX &&
- this.dip == gmm.dip &&
- this.width == gmm.width &&
- this.zTop == gmm.zTop &&
- this.zHyp == gmm.zHyp &&
- this.rake == gmm.rake &&
- this.vs30 == gmm.vs30 &&
- this.vsInf == gmm.vsInf &&
+ GmmInput in = (GmmInput) obj;
+ boolean z1p0Check = Double.isNaN(in.z1p0)
+ ? Double.isNaN(this.z1p0)
+ : this.z1p0 == in.z1p0;
+ boolean z2p5Check = Double.isNaN(in.z2p5)
+ ? Double.isNaN(this.z2p5)
+ : this.z2p5 == in.z2p5;
+ return this.Mw == in.Mw &&
+ this.rJB == in.rJB &&
+ this.rRup == in.rRup &&
+ this.rX == in.rX &&
+ this.dip == in.dip &&
+ this.width == in.width &&
+ this.zTop == in.zTop &&
+ this.zHyp == in.zHyp &&
+ this.rake == in.rake &&
+ this.vs30 == in.vs30 &&
+ this.vsInf == in.vsInf &&
z1p0Check &&
z2p5Check;
}
--
GitLab