From 5594f6b75927de7923c2da8467219ae69d3f7c5b Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Sat, 16 Mar 2019 11:36:16 +0100 Subject: [PATCH] rename some files and allow a very small benchmark size 0 --- .../scalable/ScalableModelGenerator.java | 9 +++- .../trainbenchmark-scripts/build.gradle | 52 +++++-------------- .../src-template/GeneratorScript.groovy | 6 +-- .../train/jastadd/JastaddBenchmarkMain.java | 4 +- .../JastaddRelASTBenchmarkScenario.java | 6 +-- .../JastaddRelASTBenchmarkConfigBuilder.java | 13 ----- ...taddRelASTIncrementalBenchmarkConfig.java} | 6 +-- ...lASTIncrementalBenchmarkConfigBuilder.java | 13 +++++ .../test/RelASTSerializerIncrementalTest.java | 6 +-- 9 files changed, 47 insertions(+), 68 deletions(-) delete mode 100644 trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTBenchmarkConfigBuilder.java rename trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/{JastaddRelASTBenchmarkConfig.java => JastaddRelASTIncrementalBenchmarkConfig.java} (53%) create mode 100644 trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTIncrementalBenchmarkConfigBuilder.java diff --git a/trainbenchmark/trainbenchmark-generator/src/main/java/hu/bme/mit/trainbenchmark/generator/scalable/ScalableModelGenerator.java b/trainbenchmark/trainbenchmark-generator/src/main/java/hu/bme/mit/trainbenchmark/generator/scalable/ScalableModelGenerator.java index c77797bb1..9dde18c77 100644 --- a/trainbenchmark/trainbenchmark-generator/src/main/java/hu/bme/mit/trainbenchmark/generator/scalable/ScalableModelGenerator.java +++ b/trainbenchmark/trainbenchmark-generator/src/main/java/hu/bme/mit/trainbenchmark/generator/scalable/ScalableModelGenerator.java @@ -89,6 +89,13 @@ public class ScalableModelGenerator extends ModelGenerator { default: throw new UnsupportedOperationException("Scenario not supported."); } + + if (generatorConfig.getConfigBase().getSize() == 0) { + // scale down everything + maxRoutes = 2; + maxSwitchPositions = 2; + maxSensors = 2; + } } protected int nextRandom() { @@ -133,7 +140,7 @@ public class ScalableModelGenerator extends ModelGenerator { final Map<String, Object> routeAttributes = new HashMap<>(); routeAttributes.put(ACTIVE, true); - + final Object route = serializer.createVertex(ROUTE, routeAttributes, routeOutgoingEdges); final Object region = serializer.createVertex(REGION); diff --git a/trainbenchmark/trainbenchmark-scripts/build.gradle b/trainbenchmark/trainbenchmark-scripts/build.gradle index 3352db47c..6b07fe055 100644 --- a/trainbenchmark/trainbenchmark-scripts/build.gradle +++ b/trainbenchmark/trainbenchmark-scripts/build.gradle @@ -4,22 +4,12 @@ dependencies { compile localGroovy() compile project(':trainbenchmark-generator') compile project(':trainbenchmark-generator-emf') -// compile project(':trainbenchmark-generator-graph-neo4j') compile project(':trainbenchmark-generator-graph-tinkerpop') -// compile project(':trainbenchmark-generator-rdf') -// compile project(':trainbenchmark-generator-sql') -// compile project(':trainbenchmark-generator-rdf') compile project(':trainbenchmark-generator-json4ag') compile project(':trainbenchmark-generator-json4ag-special') compile project(':trainbenchmark-generator-relast') compile project(':trainbenchmark-generator-dot') compile project(':trainbenchmark-tool') -// compile project(':trainbenchmark-tool-blazegraph') -// compile project(':trainbenchmark-tool-drools') -// compile project(':trainbenchmark-tool-eclipseocl') -// compile project(':trainbenchmark-tool-emfapi') -// compile project(':trainbenchmark-tool-epsilon') -// compile project(':trainbenchmark-tool-ingraph') compile project(':trainbenchmark-tool-jastadd-base') compile project(':trainbenchmark-tool-jastadd-namelookup') compile project(':trainbenchmark-tool-jastadd-namelookup-base') @@ -30,11 +20,8 @@ dependencies { compile project(':trainbenchmark-tool-jastadd-specialized') compile project(':trainbenchmark-tool-jastadd-specialized-base') compile project(':trainbenchmark-tool-jastadd-specialized-incremental') -// compile project(':trainbenchmark-tool-jena') -// compile project(':trainbenchmark-tool-mysql') -// compile project(':trainbenchmark-tool-neo4j') -// compile project(':trainbenchmark-tool-rdf4j') -// compile project(':trainbenchmark-tool-sqlite') + compile project(':trainbenchmark-tool-jastadd-relast') + compile project(':trainbenchmark-tool-jastadd-relast-incremental') compile project(':trainbenchmark-tool-tinkergraph') compile project(':trainbenchmark-tool-viatra') } @@ -118,65 +105,50 @@ task qpt(dependsOn: 'classes', type: JavaExec) { } generate.dependsOn(":trainbenchmark-generator-emf:shadowJar") -//generate.dependsOn(":trainbenchmark-generator-rdf:shadowJar") -//generate.dependsOn(":trainbenchmark-generator-graph-neo4j:shadowJar") -//generate.dependsOn(":trainbenchmark-generator-graph-tinkerpop:shadowJar") generate.dependsOn(":trainbenchmark-generator-json4ag:shadowJar") generate.dependsOn(":trainbenchmark-generator-json4ag-special:shadowJar") -//generate.dependsOn(":trainbenchmark-generator-sql:shadowJar") +generate.dependsOn(":trainbenchmark-generator-relast:shadowJar") -//benchmark.dependsOn(':trainbenchmark-tool-emfapi:shadowJar') -//benchmark.dependsOn(':trainbenchmark-tool-jena:shadowJar') benchmark.dependsOn(':trainbenchmark-tool-jastadd-namelookup:shadowJar') benchmark.dependsOn(':trainbenchmark-tool-jastadd-namelookup-incremental:shadowJar') benchmark.dependsOn(':trainbenchmark-tool-jastadd-optimized:shadowJar') benchmark.dependsOn(':trainbenchmark-tool-jastadd-optimized-incremental:shadowJar') benchmark.dependsOn(':trainbenchmark-tool-jastadd-specialized:shadowJar') benchmark.dependsOn(':trainbenchmark-tool-jastadd-specialized-incremental:shadowJar') -//benchmark.dependsOn(':trainbenchmark-tool-mysql:shadowJar') -//benchmark.dependsOn(':trainbenchmark-tool-neo4j:shadowJar') -//benchmark.dependsOn(':trainbenchmark-tool-sqlite:shadowJar') +benchmark.dependsOn(':trainbenchmark-tool-jastadd-relast:shadowJar') +benchmark.dependsOn(':trainbenchmark-tool-jastadd-relast-incremental:shadowJar') benchmark.dependsOn(':trainbenchmark-tool-tinkergraph:shadowJar') benchmark.dependsOn(':trainbenchmark-tool-viatra:shadowJar') -//individualInjectBenchmark.dependsOn(':trainbenchmark-tool-emfapi:shadowJar') -//individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jena:shadowJar') individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jastadd-namelookup:shadowJar') individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jastadd-namelookup-incremental:shadowJar') individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jastadd-optimized:shadowJar') -individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jastadd-optimized-incremental:shadowJar') +individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jastadd-specialized-incremental:shadowJar') individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jastadd-specialized:shadowJar') individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jastadd-specialized-incremental:shadowJar') -//individualInjectBenchmark.dependsOn(':trainbenchmark-tool-mysql:shadowJar') -//individualInjectBenchmark.dependsOn(':trainbenchmark-tool-neo4j:shadowJar') -//individualInjectBenchmark.dependsOn(':trainbenchmark-tool-sqlite:shadowJar') +individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jastadd-relast:shadowJar') +individualInjectBenchmark.dependsOn(':trainbenchmark-tool-jastadd-relast-incremental:shadowJar') individualInjectBenchmark.dependsOn(':trainbenchmark-tool-tinkergraph:shadowJar') individualInjectBenchmark.dependsOn(':trainbenchmark-tool-viatra:shadowJar') -//individualRepairBenchmark.dependsOn(':trainbenchmark-tool-emfapi:shadowJar') -//individualRepairBenchmark.dependsOn(':trainbenchmark-tool-jena:shadowJar') individualRepairBenchmark.dependsOn(':trainbenchmark-tool-jastadd-namelookup:shadowJar') individualRepairBenchmark.dependsOn(':trainbenchmark-tool-jastadd-namelookup-incremental:shadowJar') individualRepairBenchmark.dependsOn(':trainbenchmark-tool-jastadd-optimized:shadowJar') individualRepairBenchmark.dependsOn(':trainbenchmark-tool-jastadd-optimized-incremental:shadowJar') individualRepairBenchmark.dependsOn(':trainbenchmark-tool-jastadd-specialized:shadowJar') individualRepairBenchmark.dependsOn(':trainbenchmark-tool-jastadd-specialized-incremental:shadowJar') -//individualRepairBenchmark.dependsOn(':trainbenchmark-tool-mysql:shadowJar') -//individualRepairBenchmark.dependsOn(':trainbenchmark-tool-neo4j:shadowJar') -//individualRepairBenchmark.dependsOn(':trainbenchmark-tool-sqlite:shadowJar') +individualRepairBenchmark.dependsOn(':trainbenchmark-tool-jastadd-relast:shadowJar') +individualRepairBenchmark.dependsOn(':trainbenchmark-tool-jastadd-relast-incremental:shadowJar') individualRepairBenchmark.dependsOn(':trainbenchmark-tool-tinkergraph:shadowJar') individualRepairBenchmark.dependsOn(':trainbenchmark-tool-viatra:shadowJar') -//individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-emfapi:shadowJar') -//individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-jena:shadowJar') individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-jastadd-namelookup:shadowJar') individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-jastadd-namelookup-incremental:shadowJar') individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-jastadd-optimized:shadowJar') individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-jastadd-optimized-incremental:shadowJar') individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-jastadd-specialized:shadowJar') individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-jastadd-specialized-incremental:shadowJar') -//individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-mysql:shadowJar') -//individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-neo4j:shadowJar') -//individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-sqlite:shadowJar') +individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-jastadd-relast:shadowJar') +individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-jastadd-relast-incremental:shadowJar') individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-tinkergraph:shadowJar') individualIncrementalBenchmark.dependsOn(':trainbenchmark-tool-viatra:shadowJar') \ No newline at end of file diff --git a/trainbenchmark/trainbenchmark-scripts/src-template/GeneratorScript.groovy b/trainbenchmark/trainbenchmark-scripts/src-template/GeneratorScript.groovy index 7f8d76e84..83c5a7526 100644 --- a/trainbenchmark/trainbenchmark-scripts/src-template/GeneratorScript.groovy +++ b/trainbenchmark/trainbenchmark-scripts/src-template/GeneratorScript.groovy @@ -31,7 +31,7 @@ def formats = [ for (scenario in scenarios) { formats.each { generatorConfigBuilder -> try { - for (def size = minSize; size <= maxSize; size *= 2) { + for (def size = minSize; size <= maxSize; size = size>0?size*2:1) { println("Scenario: ${scenario}, size: ${size}") def configBase = new GeneratorConfigBase(scenario, size) @@ -39,12 +39,12 @@ for (scenario in scenarios) { def exitValue = GeneratorRunner.run(config, ec) if (exitValue != 0) { - println "Timeout or error occured, skipping models for larger sizes. Error code: ${exitValue}" + println "Timeout or error occurred, skipping models for larger sizes. Error code: ${exitValue}" break } } } catch (all) { - println "Exception occured during execution." + println "Exception occurred during execution." } } } diff --git a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/JastaddBenchmarkMain.java b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/JastaddBenchmarkMain.java index c17cbc9a4..98249d03b 100644 --- a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/JastaddBenchmarkMain.java +++ b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/JastaddBenchmarkMain.java @@ -1,11 +1,11 @@ package de.tudresden.inf.st.train.jastadd; -import de.tudresden.inf.st.train.jastadd.config.JastaddRelASTBenchmarkConfig; +import de.tudresden.inf.st.train.jastadd.config.JastaddRelASTIncrementalBenchmarkConfig; import hu.bme.mit.trainbenchmark.benchmark.config.BenchmarkConfig; public class JastaddBenchmarkMain { public static void main(final String[] args) throws Exception { - final JastaddRelASTBenchmarkConfig bc = BenchmarkConfig.fromFile(args[0], JastaddRelASTBenchmarkConfig.class); + final JastaddRelASTIncrementalBenchmarkConfig bc = BenchmarkConfig.fromFile(args[0], JastaddRelASTIncrementalBenchmarkConfig.class); final JastaddRelASTBenchmarkScenario scenario = new JastaddRelASTBenchmarkScenario(bc); scenario.performBenchmark(); scenario.printTraces(); diff --git a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/JastaddRelASTBenchmarkScenario.java b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/JastaddRelASTBenchmarkScenario.java index 0fc13c828..dc0ff5548 100644 --- a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/JastaddRelASTBenchmarkScenario.java +++ b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/JastaddRelASTBenchmarkScenario.java @@ -1,11 +1,11 @@ package de.tudresden.inf.st.train.jastadd; -import de.tudresden.inf.st.train.jastadd.config.JastaddRelASTBenchmarkConfig; +import de.tudresden.inf.st.train.jastadd.config.JastaddRelASTIncrementalBenchmarkConfig; public class JastaddRelASTBenchmarkScenario extends - JastaddAbstractBenchmarkScenario<JastaddRelASTBenchmarkConfig> { + JastaddAbstractBenchmarkScenario<JastaddRelASTIncrementalBenchmarkConfig> { - public JastaddRelASTBenchmarkScenario(final JastaddRelASTBenchmarkConfig bc) throws Exception { + public JastaddRelASTBenchmarkScenario(final JastaddRelASTIncrementalBenchmarkConfig bc) throws Exception { super(bc, true); } diff --git a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTBenchmarkConfigBuilder.java b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTBenchmarkConfigBuilder.java deleted file mode 100644 index 6880451ce..000000000 --- a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTBenchmarkConfigBuilder.java +++ /dev/null @@ -1,13 +0,0 @@ -package de.tudresden.inf.st.train.jastadd.config; - -import hu.bme.mit.trainbenchmark.benchmark.config.BenchmarkConfigBuilder; - -public class JastaddRelASTBenchmarkConfigBuilder extends BenchmarkConfigBuilder<JastaddRelASTBenchmarkConfig, JastaddRelASTBenchmarkConfigBuilder> { - - @Override - public JastaddRelASTBenchmarkConfig createConfig() { - checkNotNulls(); - return new JastaddRelASTBenchmarkConfig(configBase); - } - -} diff --git a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTBenchmarkConfig.java b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTIncrementalBenchmarkConfig.java similarity index 53% rename from trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTBenchmarkConfig.java rename to trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTIncrementalBenchmarkConfig.java index f1f89ec2d..54eb70344 100644 --- a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTBenchmarkConfig.java +++ b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTIncrementalBenchmarkConfig.java @@ -2,15 +2,15 @@ package de.tudresden.inf.st.train.jastadd.config; import hu.bme.mit.trainbenchmark.benchmark.config.BenchmarkConfigBase; -public class JastaddRelASTBenchmarkConfig extends JastaddAbstractBenchmarkConfig { +public class JastaddRelASTIncrementalBenchmarkConfig extends JastaddAbstractBenchmarkConfig { - protected JastaddRelASTBenchmarkConfig(final BenchmarkConfigBase configBase) { + protected JastaddRelASTIncrementalBenchmarkConfig(final BenchmarkConfigBase configBase) { super(configBase); } @Override public String getToolName() { - return "Grammar Extension with Serialiser"; + return "Grammar Extension with Serialiser (Incremental)"; } @Override diff --git a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTIncrementalBenchmarkConfigBuilder.java b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTIncrementalBenchmarkConfigBuilder.java new file mode 100644 index 000000000..c588bd5f0 --- /dev/null +++ b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/main/java/de/tudresden/inf/st/train/jastadd/config/JastaddRelASTIncrementalBenchmarkConfigBuilder.java @@ -0,0 +1,13 @@ +package de.tudresden.inf.st.train.jastadd.config; + +import hu.bme.mit.trainbenchmark.benchmark.config.BenchmarkConfigBuilder; + +public class JastaddRelASTIncrementalBenchmarkConfigBuilder extends BenchmarkConfigBuilder<JastaddRelASTIncrementalBenchmarkConfig, JastaddRelASTIncrementalBenchmarkConfigBuilder> { + + @Override + public JastaddRelASTIncrementalBenchmarkConfig createConfig() { + checkNotNulls(); + return new JastaddRelASTIncrementalBenchmarkConfig(configBase); + } + +} diff --git a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/test/java/de/tudresden/inf/st/train/jastadd/test/RelASTSerializerIncrementalTest.java b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/test/java/de/tudresden/inf/st/train/jastadd/test/RelASTSerializerIncrementalTest.java index a4a4be6ac..2b789c6f7 100644 --- a/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/test/java/de/tudresden/inf/st/train/jastadd/test/RelASTSerializerIncrementalTest.java +++ b/trainbenchmark/trainbenchmark-tool-jastadd-relast-incremental/src/test/java/de/tudresden/inf/st/train/jastadd/test/RelASTSerializerIncrementalTest.java @@ -1,8 +1,8 @@ package de.tudresden.inf.st.train.jastadd.test; import de.tudresden.inf.st.train.jastadd.JastaddRelASTBenchmarkScenario; -import de.tudresden.inf.st.train.jastadd.config.JastaddRelASTBenchmarkConfig; -import de.tudresden.inf.st.train.jastadd.config.JastaddRelASTBenchmarkConfigBuilder; +import de.tudresden.inf.st.train.jastadd.config.JastaddRelASTIncrementalBenchmarkConfig; +import de.tudresden.inf.st.train.jastadd.config.JastaddRelASTIncrementalBenchmarkConfigBuilder; import hu.bme.mit.trainbenchmark.benchmark.config.BenchmarkConfigBase; import hu.bme.mit.trainbenchmark.benchmark.runcomponents.BenchmarkResult; import hu.bme.mit.trainbenchmark.benchmark.test.TrainBenchmarkTest; @@ -11,7 +11,7 @@ public class RelASTSerializerIncrementalTest extends TrainBenchmarkTest { @Override protected BenchmarkResult runTest(final BenchmarkConfigBase bcb) throws Exception { - final JastaddRelASTBenchmarkConfig bc = new JastaddRelASTBenchmarkConfigBuilder().setConfigBase(bcb).createConfig(); + final JastaddRelASTIncrementalBenchmarkConfig bc = new JastaddRelASTIncrementalBenchmarkConfigBuilder().setConfigBase(bcb).createConfig(); final JastaddRelASTBenchmarkScenario scenario = new JastaddRelASTBenchmarkScenario(bc); final BenchmarkResult result = scenario.performBenchmark(); return result; -- GitLab