spotless

Author: voj

src/main/java/nz/cri/gns/NZSHM22/opensha/ruptures/experimental/Builder.java

@@ -1,15 +1,14 @@
 package nz.cri.gns.NZSHM22.opensha.ruptures.experimental;
 
-import nz.cri.gns.NZSHM22.opensha.scripts.RupSetPropertyBackfill;
-import org.dom4j.DocumentException;
-import org.opensha.sha.earthquake.faultSysSolution.FaultSystemRupSet;
-import org.opensha.sha.earthquake.faultSysSolution.ruptures.multiRupture.RuptureMerger;
-
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.List;
+import nz.cri.gns.NZSHM22.opensha.scripts.RupSetPropertyBackfill;
+import org.dom4j.DocumentException;
+import org.opensha.sha.earthquake.faultSysSolution.FaultSystemRupSet;
+import org.opensha.sha.earthquake.faultSysSolution.ruptures.multiRupture.RuptureMerger;
 
 public class Builder {
 
@@ -19,12 +18,13 @@ public static File makeTempFile(FaultSystemRupSet rupSet) throws IOException {
         return tempFile;
     }
 
-    public static void buildJointRuptures(List<String> ruptureSets, boolean backfill) throws IOException, DocumentException {
+    public static void buildJointRuptures(List<String> ruptureSets, boolean backfill)
+            throws IOException, DocumentException {
         List<FaultSystemRupSet> rupSets = new ArrayList<>();
-        for(String fileName: ruptureSets){
-            if(backfill){
+        for (String fileName : ruptureSets) {
+            if (backfill) {
                 rupSets.add(RupSetPropertyBackfill.backfill(fileName));
-            } else{
+            } else {
                 rupSets.add(FaultSystemRupSet.load(new File(fileName)));
             }
         }
@@ -43,6 +43,5 @@ public static void buildJointRuptures(List<String> ruptureSets, boolean backfill
         ruptureMergerConfig.ruptureSet = new File(thinningConfig.ruptureSetFileName);
         ruptureMergerConfig.filterFile = new File(thinningConfig.outputFileName);
         RuptureMerger.merge(ruptureMergerConfig);
-
     }
 }

src/main/java/nz/cri/gns/NZSHM22/opensha/ruptures/experimental/RuptureAccumulator.java

@@ -139,7 +139,7 @@ public RuptureAccumulator add(FaultSystemRupSet rupSet) {
         return this;
     }
 
-    public RuptureAccumulator addRupSets(Collection<FaultSystemRupSet> rupSets){
+    public RuptureAccumulator addRupSets(Collection<FaultSystemRupSet> rupSets) {
         rupSets.forEach(this::add);
         return this;
     }

src/main/java/nz/cri/gns/NZSHM22/opensha/ruptures/experimental/Thinning.java

@@ -1,16 +1,15 @@
 package nz.cri.gns.NZSHM22.opensha.ruptures.experimental;
 
-import org.opensha.sha.earthquake.faultSysSolution.FaultSystemRupSet;
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.List;
+import org.opensha.sha.earthquake.faultSysSolution.FaultSystemRupSet;
 
 public class Thinning {
 
-    public static class Config{
+    public static class Config {
         public String ruptureSetFileName;
         public String outputFileName;
         public boolean hikurangiPosition = true;
@@ -28,21 +27,21 @@ public static void apply(Config config) throws IOException {
 
         ThinningSubduction hikurangiThinning =
                 new ThinningSubduction(rupSet, s -> s.startsWith("Hikurangi"));
-        if(config.hikurangiPosition) {
+        if (config.hikurangiPosition) {
             hikurangiThinning.filterByPosition();
         }
-        if(config.hikurangiSize != null) {
+        if (config.hikurangiSize != null) {
             hikurangiThinning.filterBySize(config.hikurangiSize);
         }
 
         System.out.println("hikurangi after thinning " + hikurangiThinning.getRuptures().size());
 
         ThinningSubduction puysegurThinning =
                 new ThinningSubduction(rupSet, s -> s.startsWith("Puysegur"));
-        if(config.puysegurPosition) {
+        if (config.puysegurPosition) {
             puysegurThinning.filterByPosition();
         }
-        if(config.puysegurSize!=null) {
+        if (config.puysegurSize != null) {
             puysegurThinning.filterBySize(config.puysegurSize);
         }
 

src/main/java/nz/cri/gns/NZSHM22/opensha/ruptures/experimental/ThinningSubduction.java

@@ -1,10 +1,6 @@
 package nz.cri.gns.NZSHM22.opensha.ruptures.experimental;
 
 import com.google.common.base.Preconditions;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.util.*;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
@@ -133,5 +129,4 @@ int getIndex() {
             return ruptureIndices.get(rupture);
         }
     }
-
 }

src/main/java/nz/cri/gns/NZSHM22/opensha/scripts/RupSetPropertyBackfill.java

@@ -39,7 +39,8 @@ public static FaultSystemRupSet backfill(String archiveFileName)
         return backfill(rupSet);
     }
 
-    public static FaultSystemRupSet backfill(FaultSystemRupSet rupSet) throws IOException, DocumentException{
+    public static FaultSystemRupSet backfill(FaultSystemRupSet rupSet)
+            throws IOException, DocumentException {
 
         // Try to get fault model from logic tree branch for crustal lookups
         NZSHM22_LogicTreeBranch branch = rupSet.getModule(NZSHM22_LogicTreeBranch.class);