From 9d2be56cf692ba4f737f5add67843780c625e06e Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <nikolaus.krismer@uibk.ac.at>
Date: Sun, 1 Oct 2017 11:15:53 +0200
Subject: [PATCH] minor interface improvements
---
CHANGELOG.md | 1 +
.../it/unibz/inf/isochrone/algorithm/BreakEvenPointTest.java | 4 ++--
.../it/unibz/inf/isochrone/algorithm/tile/TileSizeTest.java | 3 ++-
.../it/unibz/inf/isochrone/plot/sample/SampleRunner.java | 5 -----
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 936896ea..58539325 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
Upcoming version:
-----------------
+ - minor interface improvements (Nikolaus Krismer)
- fixed typo in variable name (Nikolaus Krismer)
- calling algorithms clear method explicitly to free memory earlier (Nikolaus Krismer)
- added support for multiple remote repositories (as fallbacks) (Nikolaus Krismer)
diff --git a/src/performance/java/it/unibz/inf/isochrone/algorithm/BreakEvenPointTest.java b/src/performance/java/it/unibz/inf/isochrone/algorithm/BreakEvenPointTest.java
index d29aee7c..bcc252b8 100644
--- a/src/performance/java/it/unibz/inf/isochrone/algorithm/BreakEvenPointTest.java
+++ b/src/performance/java/it/unibz/inf/isochrone/algorithm/BreakEvenPointTest.java
@@ -168,7 +168,7 @@ public class BreakEvenPointTest {
LOGGER.info("More testing is needed to find break even point in dataset \"{}\" and sampleType {} (maxDuration tested: {})", datasetName, sTypeName, restrictionValue);
LOGGER.info("-----------------------------");
nextRestrictionValue = restrictionValue + searchDurationStep;
- runner = new SampleRunnerBuilder().addDataset(datasetName).addDuration(nextRestrictionValue).build(SAMPLE_PROPERTY);
+ runner = new SampleRunnerBuilder().addDatasets(datasetName).addDuration(nextRestrictionValue).build(SAMPLE_PROPERTY);
break;
case NODES:
final long dsNodeCount = getDatasetNodeCount(datasetName);
@@ -183,7 +183,7 @@ public class BreakEvenPointTest {
LOGGER.info("More testing is needed to find break even point for dataset \"{}\" and sampleType {} (%-tested: {})", datasetName, sTypeName, FORMAT_PERCENTAGE.format(pTested));
LOGGER.info("-----------------------------");
nextRestrictionValue = (long) ((pTested + searchNodeStepPercentage) * dsNodeCount) + 1;
- runner = new SampleRunnerBuilder().addDataset(datasetName).addNodes(nextRestrictionValue).build(SAMPLE_PROPERTY);
+ runner = new SampleRunnerBuilder().addDatasets(datasetName).addNodes(nextRestrictionValue).build(SAMPLE_PROPERTY);
break;
default:
nextRestrictionValue = -1;
diff --git a/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileSizeTest.java b/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileSizeTest.java
index e9281f8d..2f6fcdc9 100644
--- a/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileSizeTest.java
+++ b/src/performance/java/it/unibz/inf/isochrone/algorithm/tile/TileSizeTest.java
@@ -28,6 +28,7 @@ import it.unibz.inf.isochrone.ListenerLogging;
import it.unibz.inf.isochrone.ListenerSetup;
import it.unibz.inf.isochrone.MathHelper;
import it.unibz.inf.isochrone.SampleHelper;
+import it.unibz.inf.isochrone.TestConfiguration;
import it.unibz.inf.isochrone.TestHelper;
import it.unibz.inf.isochrone.algorithm.Algorithm;
import it.unibz.inf.isochrone.algorithm.Mine;
@@ -66,7 +67,7 @@ public class TileSizeTest {
return z0.byteValue() > z1.byteValue();
};
private static final Logger LOGGER = LogManager.getLogger(TileSizeTest.class);
- private static final int REPEAT_COUNT = 1; // TestConfiguration.DEFAULT_REPEAT_COUNT;
+ private static final int REPEAT_COUNT = TestConfiguration.DEFAULT_REPEAT_COUNT;
private static final String RESULTFILE_NAME = "build/reports/performanceTests/algorithm-tileSize";
private static final Collection<SampleProperty> SAMPLE_PROPERTIES = Arrays.asList(new SampleProperty[] {
// SampleProperty.NR_NODES_CURRENT, // commented -> since no vertex expiration is used this will be the same as NR_NODES_TOTAL
diff --git a/src/performance/java/it/unibz/inf/isochrone/plot/sample/SampleRunner.java b/src/performance/java/it/unibz/inf/isochrone/plot/sample/SampleRunner.java
index 7fe6a401..9ea9c41d 100644
--- a/src/performance/java/it/unibz/inf/isochrone/plot/sample/SampleRunner.java
+++ b/src/performance/java/it/unibz/inf/isochrone/plot/sample/SampleRunner.java
@@ -100,11 +100,6 @@ public final class SampleRunner {
// Public methods
- public SampleRunnerBuilder addDataset(final String datasetName) {
- addDataset(datasetName, ConfigAlgorithmHelper.getDatasetBuilder(datasetName));
- return this;
- }
-
public SampleRunnerBuilder addDataset(final String datasetName, final ConfigAlgorithmBuilder params) {
if (datasets == null) {
datasets = new TreeMap<>();
--
GitLab