Skip to content
Snippets Groups Projects

Iterables to stream

Merged Powers, Peter M. requested to merge ghsc/users/pmpowers/nshmp-lib:iterables-to-stream into main
4 files
+ 11
73
Compare changes
  • Side-by-side
  • Inline
Files
4
@@ -3,7 +3,6 @@ package gov.usgs.earthquake.nshmp.gmm;
@@ -3,7 +3,6 @@ package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.io.Resources.getResource;
import static com.google.common.io.Resources.getResource;
import static com.google.common.io.Resources.readLines;
import static com.google.common.io.Resources.readLines;
import static gov.usgs.earthquake.nshmp.Text.NEWLINE;
import static gov.usgs.earthquake.nshmp.Text.NEWLINE;
import static gov.usgs.earthquake.nshmp.Text.splitToDoubleList;
import static gov.usgs.earthquake.nshmp.Text.Delimiter.COMMA;
import static gov.usgs.earthquake.nshmp.Text.Delimiter.COMMA;
import static gov.usgs.earthquake.nshmp.Text.Delimiter.SPACE;
import static gov.usgs.earthquake.nshmp.Text.Delimiter.SPACE;
import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
@@ -34,7 +33,7 @@ import com.google.common.collect.Lists;
@@ -34,7 +33,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Maps;
import com.google.common.io.LineProcessor;
import com.google.common.io.LineProcessor;
import gov.usgs.earthquake.nshmp.Text;
import gov.usgs.earthquake.nshmp.Text.Delimiter;
import gov.usgs.earthquake.nshmp.data.DoubleData;
import gov.usgs.earthquake.nshmp.data.DoubleData;
import gov.usgs.earthquake.nshmp.gmm.GmmUtils.CeusSiteClass;
import gov.usgs.earthquake.nshmp.gmm.GmmUtils.CeusSiteClass;
import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable.Position;
import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable.Position;
@@ -655,8 +654,7 @@ final class GroundMotionTables {
@@ -655,8 +654,7 @@ final class GroundMotionTables {
String imtHeaders = line.replace("\"", "");
String imtHeaders = line.replace("\"", "");
imtHeaders = imtHeaders.substring(imtHeaders.indexOf("FS") + 3);
imtHeaders = imtHeaders.substring(imtHeaders.indexOf("FS") + 3);
List<Double> imtVals =
List<Double> imtVals = splitToDoubleList(imtHeaders, COMMA);
splitToDoubleList(imtHeaders, COMMA);
for (Double t : imtVals) {
for (Double t : imtVals) {
Imt imt = (t == -1.) ? Imt.PGV : (t == 0.) ? Imt.PGA : Imt.fromPeriod(t);
Imt imt = (t == -1.) ? Imt.PGV : (t == 0.) ? Imt.PGA : Imt.fromPeriod(t);
imtList.add(imt);
imtList.add(imt);
@@ -781,7 +779,7 @@ final class GroundMotionTables {
@@ -781,7 +779,7 @@ final class GroundMotionTables {
return true;
return true;
}
}
List<Double> values = Text.splitToDoubleList(line, SPACE);
List<Double> values = splitToDoubleList(line, SPACE);
if (values.size() == 1) {
if (values.size() == 1) {
// reset rIndex for every single mag line encountered
// reset rIndex for every single mag line encountered
@@ -841,4 +839,10 @@ final class GroundMotionTables {
@@ -841,4 +839,10 @@ final class GroundMotionTables {
return out;
return out;
}
}
 
private static List<Double> splitToDoubleList(String line, Delimiter delimiter) {
 
return delimiter.splitter().splitToStream(line)
 
.map(Double::valueOf)
 
.collect(toList());
 
}
 
}
}
Loading