Merge pull request #36 from hobbit-project/master

update master
hobbit-project · Jun 26, 2018 · 446a163 · 446a163
2 parents f2fb28f + 435e7dd
commit 446a163
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/docker/versioningbenchmarkcontroller.docker b/docker/versioningbenchmarkcontroller.docker
@@ -1,6 +1,6 @@
 FROM java
 
-ADD target/versioning-0.0.1-SNAPSHOT.jar /versioning/versioning.jar
+ADD target/spvb-2.2.1.jar /versioning/versioning.jar
 
 COPY required_files/* /versioning/
 

diff --git a/docker/versioningdatagenerator.docker b/docker/versioningdatagenerator.docker
@@ -42,7 +42,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
 ENV PATH $JAVA_HOME/bin:$PATH
 
 # benchmark
-ADD target/versioning-0.0.1-SNAPSHOT.jar /versioning/versioning.jar
+ADD target/spvb-2.2.1.jar /versioning/versioning.jar
 
 COPY required_files/ /versioning/
 

diff --git a/docker/versioningevaluationmodule.docker b/docker/versioningevaluationmodule.docker
@@ -1,6 +1,6 @@
 FROM java
 
-ADD target/versioning-0.0.1-SNAPSHOT.jar /versioning/versioning.jar
+ADD target/spvb-2.2.1.jar /versioning/versioning.jar
 
 COPY required_files/* /versioning/
 

diff --git a/docker/versioningtaskgenerator.docker b/docker/versioningtaskgenerator.docker
@@ -1,6 +1,6 @@
 FROM java
 
-ADD target/versioning-0.0.1-SNAPSHOT.jar /versioning/versioning.jar
+ADD target/spvb-2.2.1.jar /versioning/versioning.jar
 
 COPY required_files/query_templates/* /versioning/query_templates/
 

diff --git a/docker/versioningvirtuososystemadapter.docker b/docker/versioningvirtuososystemadapter.docker
@@ -42,7 +42,7 @@ ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
 ENV PATH $JAVA_HOME/bin:$PATH
 
 # benchmark
-ADD target/versioning-0.0.1-SNAPSHOT.jar /versioning/versioning.jar
+ADD target/spvb-2.2.1.jar /versioning/versioning.jar
 
 COPY system/ /versioning/
 

diff --git a/pom.xml b/pom.xml
@@ -1,12 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.hobbit.workpackage5</groupId>
-  <artifactId>versioning</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <groupId>org.hobbit</groupId>
+  <artifactId>spvb</artifactId>
+  <version>2.2.1</version>
   <packaging>jar</packaging>
-  <name>versioning</name>
-  <description>Source code for workpackage 5.2</description>
+  <name>Versioning Benchmark</name>
+  <description>SPVB source code</description>
   <url>http://maven.apache.org</url>
 
   <properties>

diff --git a/src/main/java/org/hobbit/benchmark/versioning/components/VersioningBenchmarkController.java b/src/main/java/org/hobbit/benchmark/versioning/components/VersioningBenchmarkController.java
@@ -23,9 +23,9 @@ public class VersioningBenchmarkController extends AbstractBenchmarkController {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(VersioningBenchmarkController.class);
 
-	private static final String DATA_GENERATOR_CONTAINER_IMAGE = "git.project-hobbit.eu:4567/papv/versioningdatagenerator:2.2.0";
-	private static final String TASK_GENERATOR_CONTAINER_IMAGE = "git.project-hobbit.eu:4567/papv/versioningtaskgenerator:2.2.0";
-	private static final String EVALUATION_MODULE_CONTAINER_IMAGE = "git.project-hobbit.eu:4567/papv/versioningevaluationmodule:2.2.0";
+	private static final String DATA_GENERATOR_CONTAINER_IMAGE = "git.project-hobbit.eu:4567/papv/versioningdatagenerator:2.2.1";
+	private static final String TASK_GENERATOR_CONTAINER_IMAGE = "git.project-hobbit.eu:4567/papv/versioningtaskgenerator:2.2.1";
+	private static final String EVALUATION_MODULE_CONTAINER_IMAGE = "git.project-hobbit.eu:4567/papv/versioningevaluationmodule:2.2.1";
 
 	private static final String PREFIX = "http://w3id.org/hobbit/versioning-benchmark/vocab#";
 

diff --git a/src/main/java/org/hobbit/benchmark/versioning/components/VersioningEvaluationModule.java b/src/main/java/org/hobbit/benchmark/versioning/components/VersioningEvaluationModule.java
@@ -234,8 +234,8 @@ private void computeQPS() {
 		totalQueriesCount += qts7.getRunsCount();
 		totalQueriesCount += qts8.getRunsCount();
 
-		qps = (float) totalQueriesCount / (totalQueriesExecutionTime / 1000);
-//		float QPSRounded = (float) (Math.round(QPS * 100.0) / 100.0);
+		float qps_curr = (float) totalQueriesCount / (totalQueriesExecutionTime / 1000);
+		qps = Double.isNaN(qps_curr) ? 0 : qps_curr;
 	}
 
 	@Override