Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update master #36

Merged
merged 6 commits into from
Jun 26, 2018
Merged

update master #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
afae5d1
Merge pull request #31 from hobbit-project/develop
vpapako Jun 15, 2018
ffe6f33
Merge pull request #33 from hobbit-project/develop
vpapako Jun 20, 2018
d7f022f
Merge pull request #35 from hobbit-project/develop
vpapako Jun 26, 2018
77b7840
fix image tags to 2.2.1
vpapako Jun 26, 2018
ae116dc
Increased version to v2.2.1
vpapako Jun 26, 2018
435e7dd
set QPS to 0 when it is NaN (only data loading took place)
vpapako Jun 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker/versioningbenchmarkcontroller.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/

Expand Down
2 changes: 1 addition & 1 deletion docker/versioningdatagenerator.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion docker/versioningevaluationmodule.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/

Expand Down
2 changes: 1 addition & 1 deletion docker/versioningtaskgenerator.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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/

Expand Down
2 changes: 1 addition & 1 deletion docker/versioningvirtuososystemadapter.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/org/hobbit/benchmark/versioning/components/VersioningBenchmarkController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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#";

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/hobbit/benchmark/versioning/components/VersioningEvaluationModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down