Skip to content
Snippets Groups Projects
Unverified Commit 9d2be56c authored by User expired's avatar User expired
Browse files

minor interface improvements

parent 76f89705
No related branches found
No related tags found
No related merge requests found
Upcoming version: Upcoming version:
----------------- -----------------
- minor interface improvements (Nikolaus Krismer)
- fixed typo in variable name (Nikolaus Krismer) - fixed typo in variable name (Nikolaus Krismer)
- calling algorithms clear method explicitly to free memory earlier (Nikolaus Krismer) - calling algorithms clear method explicitly to free memory earlier (Nikolaus Krismer)
- added support for multiple remote repositories (as fallbacks) (Nikolaus Krismer) - added support for multiple remote repositories (as fallbacks) (Nikolaus Krismer)
......
...@@ -168,7 +168,7 @@ public class BreakEvenPointTest { ...@@ -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("More testing is needed to find break even point in dataset \"{}\" and sampleType {} (maxDuration tested: {})", datasetName, sTypeName, restrictionValue);
LOGGER.info("-----------------------------"); LOGGER.info("-----------------------------");
nextRestrictionValue = restrictionValue + searchDurationStep; nextRestrictionValue = restrictionValue + searchDurationStep;
runner = new SampleRunnerBuilder().addDataset(datasetName).addDuration(nextRestrictionValue).build(SAMPLE_PROPERTY); runner = new SampleRunnerBuilder().addDatasets(datasetName).addDuration(nextRestrictionValue).build(SAMPLE_PROPERTY);
break; break;
case NODES: case NODES:
final long dsNodeCount = getDatasetNodeCount(datasetName); final long dsNodeCount = getDatasetNodeCount(datasetName);
...@@ -183,7 +183,7 @@ public class BreakEvenPointTest { ...@@ -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("More testing is needed to find break even point for dataset \"{}\" and sampleType {} (%-tested: {})", datasetName, sTypeName, FORMAT_PERCENTAGE.format(pTested));
LOGGER.info("-----------------------------"); LOGGER.info("-----------------------------");
nextRestrictionValue = (long) ((pTested + searchNodeStepPercentage) * dsNodeCount) + 1; 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; break;
default: default:
nextRestrictionValue = -1; nextRestrictionValue = -1;
......
...@@ -28,6 +28,7 @@ import it.unibz.inf.isochrone.ListenerLogging; ...@@ -28,6 +28,7 @@ import it.unibz.inf.isochrone.ListenerLogging;
import it.unibz.inf.isochrone.ListenerSetup; import it.unibz.inf.isochrone.ListenerSetup;
import it.unibz.inf.isochrone.MathHelper; import it.unibz.inf.isochrone.MathHelper;
import it.unibz.inf.isochrone.SampleHelper; import it.unibz.inf.isochrone.SampleHelper;
import it.unibz.inf.isochrone.TestConfiguration;
import it.unibz.inf.isochrone.TestHelper; import it.unibz.inf.isochrone.TestHelper;
import it.unibz.inf.isochrone.algorithm.Algorithm; import it.unibz.inf.isochrone.algorithm.Algorithm;
import it.unibz.inf.isochrone.algorithm.Mine; import it.unibz.inf.isochrone.algorithm.Mine;
...@@ -66,7 +67,7 @@ public class TileSizeTest { ...@@ -66,7 +67,7 @@ public class TileSizeTest {
return z0.byteValue() > z1.byteValue(); return z0.byteValue() > z1.byteValue();
}; };
private static final Logger LOGGER = LogManager.getLogger(TileSizeTest.class); 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 String RESULTFILE_NAME = "build/reports/performanceTests/algorithm-tileSize";
private static final Collection<SampleProperty> SAMPLE_PROPERTIES = Arrays.asList(new SampleProperty[] { 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 // SampleProperty.NR_NODES_CURRENT, // commented -> since no vertex expiration is used this will be the same as NR_NODES_TOTAL
......
...@@ -100,11 +100,6 @@ public final class SampleRunner { ...@@ -100,11 +100,6 @@ public final class SampleRunner {
// Public methods // Public methods
public SampleRunnerBuilder addDataset(final String datasetName) {
addDataset(datasetName, ConfigAlgorithmHelper.getDatasetBuilder(datasetName));
return this;
}
public SampleRunnerBuilder addDataset(final String datasetName, final ConfigAlgorithmBuilder params) { public SampleRunnerBuilder addDataset(final String datasetName, final ConfigAlgorithmBuilder params) {
if (datasets == null) { if (datasets == null) {
datasets = new TreeMap<>(); datasets = new TreeMap<>();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment