Merge pull request #37 from hobbit-project/develop

minor but critical fixes
hobbit-project · Jun 28, 2018 · 508396b · 508396b
2 parents 435e7dd + 8066a46
commit 508396b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/required_files/run.sh b/required_files/run.sh
@@ -43,4 +43,4 @@ echo $(date +%H:%M:%S.%N | cut -b1-12)" : Virtuoso Server started successfully."
 
 # run the data generator
 echo $(date +%H:%M:%S.%N | cut -b1-12)" : Running the Data Generator..."
-java -cp /versioning/versioning.jar org.hobbit.core.run.ComponentStarter org.hobbit.benchmark.versioning.components.VersioningDataGenerator
+java -Xmx128G -cp /versioning/versioning.jar org.hobbit.core.run.ComponentStarter org.hobbit.benchmark.versioning.components.VersioningDataGenerator
diff --git a/required_files/test.properties b/required_files/test.properties
@@ -2,7 +2,7 @@
 
 dataGeneratorWorkers=1
 datasetSize=1000000
-maxGeneratedTriplesPerFile=50000
+maxGeneratedTriplesPerFile=500000
 numberOfVersions=10
 archivingStrategy=default
 generateCreativeWorksFormat=n-triples

diff --git a/src/main/java/org/hobbit/benchmark/versioning/components/VersioningDataGenerator.java b/src/main/java/org/hobbit/benchmark/versioning/components/VersioningDataGenerator.java
@@ -300,7 +300,10 @@ public void init() throws Exception {
 			// build mustache templates to create queries
 			LOGGER.info("Building SPRQL tasks...");
 			buildSPRQLQueries();
-			LOGGER.info("All SPRQL tasks built successfully.");					
+			LOGGER.info("All SPRQL tasks built successfully.");	
+
+			// load generated data in order to compute the expected answers
+			loadFirstNVersions(numberOfVersions);
 
 			// compute expected answers for all tasks
 			LOGGER.info("Computing expected answers for generated SPARQL tasks...");

diff --git a/src/main/java/org/hobbit/benchmark/versioning/components/VersioningEvaluationModule.java b/src/main/java/org/hobbit/benchmark/versioning/components/VersioningEvaluationModule.java
@@ -81,7 +81,7 @@ public void init() throws Exception {
         	is.reportSuccess(version, triplesToBeAdded, triplesToBeDeleted, triplesToBeLoaded, loadingTime);
         }
 
-        storageCost = Integer.parseInt(env.get(String.format(VersioningConstants.STORAGE_COST_VALUE))) / (1024f * 1024f);
+        storageCost = Long.parseLong(env.get(String.format(VersioningConstants.STORAGE_COST_VALUE))) / (1024f * 1024f);
 
         INITIAL_VERSION_INGESTION_SPEED = initFinalModelFromEnv(env, VersioningConstants.INITIAL_VERSION_INGESTION_SPEED);
         AVG_APPLIED_CHANGES_PS = initFinalModelFromEnv(env, VersioningConstants.AVG_APPLIED_CHANGES_PS);