From 47d4cdc9e99a58420e9a237ccf8ec66c07b3ddc0 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 18 Feb 2022 08:57:28 -0700
Subject: [PATCH] removed batch logging and timers from EqRateExport
---
.../earthquake/nshmp/calc/EqRateExport.java | 53 +++++--------------
.../earthquake/nshmp/calc/HazardExport.java | 1 -
2 files changed, 13 insertions(+), 41 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/EqRateExport.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/EqRateExport.java
index 3629306b..ab5284ed 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/EqRateExport.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/EqRateExport.java
@@ -7,13 +7,10 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.List;
-import java.util.OptionalDouble;
import java.util.function.Function;
-import java.util.logging.Logger;
import java.util.stream.Collectors;
import java.util.stream.DoubleStream;
-import com.google.common.base.Stopwatch;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -38,16 +35,12 @@ public final class EqRateExport {
private static final String RATE_FILE = "rates.csv";
private static final String PROB_FILE = "probs.csv";
- private final Logger log;
- private final Path dir;
+ private final Path out;
private final String file;
private final String valueFormat;
private final HazardModel model;
private final boolean exportSource;
- private final Stopwatch batchWatch;
- private final Stopwatch totalWatch;
- private int batchCount = 0;
private int resultCount = 0;
private final boolean namedSites;
@@ -58,13 +51,12 @@ public final class EqRateExport {
HazardModel model,
CalcConfig config,
List<Site> sites,
- Logger log) throws IOException {
+ Path out) {
// whether or not rates or probabilities have been calculated
boolean rates = config.rate.valueFormat == ValueFormat.ANNUAL_RATE;
- this.log = log;
- this.dir = HazardExport.createOutputDir(config.output.directory, OptionalDouble.empty());
+ this.out = out;
this.file = rates ? RATE_FILE : PROB_FILE;
this.valueFormat = rates ? RATE_FORMAT : PROB_FORMAT;
this.model = model;
@@ -72,9 +64,6 @@ public final class EqRateExport {
Site demoSite = sites.get(0);
this.namedSites = demoSite.name() != Site.NO_NAME;
-
- this.batchWatch = Stopwatch.createStarted();
- this.totalWatch = Stopwatch.createStarted();
}
/**
@@ -83,15 +72,16 @@ public final class EqRateExport {
* @param model being run
* @param config that specifies output options and formats
* @param sites reference to the sites to be processed (not retained)
- * @param log shared logging instance from calling class
+ * @param out results directory; this may have been been modified from
+ * {@code config.output.directory} by calling program
*/
public static EqRateExport create(
HazardModel model,
CalcConfig config,
List<Site> sites,
- Logger log) throws IOException {
+ Path out) {
- return new EqRateExport(model, config, sites, log);
+ return new EqRateExport(model, config, sites, out);
}
/**
@@ -103,22 +93,13 @@ public final class EqRateExport {
checkState(!used, "This result handler is expired");
writeRate(rate);
resultCount++;
- if (resultCount % 10 == 0) {
- batchCount++;
- log.info(String.format(
- " batch: %s in %s – %s sites in %s",
- batchCount, batchWatch, resultCount, totalWatch));
- batchWatch.reset().start();
- }
}
/**
* Flushes any remaining results, stops all timers and sets the state of this
* exporter to 'used'; no more results may be added.
*/
- public void expire() throws IOException {
- batchWatch.stop();
- totalWatch.stop();
+ public void expire() {
used = true;
}
@@ -129,19 +110,11 @@ public final class EqRateExport {
return resultCount;
}
- /**
- * A string representation of the time duration that this result handler has
- * been running.
- */
- public String elapsedTime() {
- return totalWatch.toString();
- }
-
/**
* The target output directory established by this handler.
*/
public Path outputDir() {
- return dir;
+ return out;
}
/*
@@ -171,10 +144,10 @@ public final class EqRateExport {
String emptyLine = toLine(locData, emptyValues, formatter);
/* write/append */
- Path totalFile = dir.resolve(file);
+ Path totalFile = out.resolve(file);
HazardExport.writeLine(totalFile, totalLine, APPEND);
if (exportSource) {
- Path parentDir = dir.resolve(HazardExport.TYPE_DIR);
+ Path parentDir = out.resolve(HazardExport.TYPE_DIR);
for (SourceType type : model.types()) {
Path typeFile = parentDir.resolve(type.name()).resolve(file);
String typeLine = emptyLine;
@@ -192,11 +165,11 @@ public final class EqRateExport {
Lists.newArrayList(namedSites ? "name" : null, "lon", "lat"),
demo.totalMfd.xValues().boxed().collect(Collectors.toList()));
String header = Parsing.join(headerElements, Delimiter.COMMA);
- Path totalFile = dir.resolve(file);
+ Path totalFile = out.resolve(file);
HazardExport.writeLine(totalFile, header);
if (exportSource) {
- Path parentDir = dir.resolve(HazardExport.TYPE_DIR);
+ Path parentDir = out.resolve(HazardExport.TYPE_DIR);
Files.createDirectory(parentDir);
for (SourceType type : model.types()) {
Path typeDir = parentDir.resolve(type.name());
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
index c1f29cee..805721d6 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
@@ -109,7 +109,6 @@ public final class HazardExport {
* @param sites reference to the sites to be processed (not retained)
* @param out results directory; this may have been been modified from
* {@code config.output.directory} by calling program
- * @param log shared logging instance from calling class
*/
public static HazardExport create(
HazardModel model,
--
GitLab