Fixes create-sample-db script to use correct test run files

uniba-dsg · Feb 17, 2017 · 6d3e439 · 6d3e439
1 parent 173ec0f
commit 6d3e439
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/create-sample-db b/create-sample-db
@@ -5,8 +5,8 @@
 
 # BPEL
 ./betsy bpel ode sequence,WCP04-ExclusiveChoice,SA00095 # STRUCTURED_ACTIVITIES, CFPATTERN, SA
-./betsy loader load pebl.xml database/pebl.xml
+./betsy loader load test/pebl.xml database/pebl.xml
 
 # BPMN
 ./betsy bpmn activiti sequenceflow,WCP04_ExclusiveChoice,REF_1 # GATEWAYS, CFPATTERN, SA
-./betsy loader load pebl.xml database/pebl.xml
+./betsy loader load test/pebl.xml database/pebl.xml
diff --git a/loader/src/main/java/loader/PEBLMergerMain.java b/loader/src/main/java/loader/PEBLMergerMain.java
@@ -45,10 +45,12 @@ private static void merge(PEBL peblSource, PEBL peblTarget, Path newRelativeData
         // Algorithm: add elements whose id was not yet there
 
         // add metric types if not yet available
+        System.out.println("MERGING metric types");
         List<String> metricTypeIds = peblTarget.benchmark.metricTypes.stream().map(HasId::getId).collect(Collectors.toList());
         peblSource.benchmark.metricTypes.stream().filter(e -> !metricTypeIds.contains(e.getId())).forEach(e -> peblTarget.benchmark.metricTypes.add(e));
 
         // apply metrics
+        System.out.println("MERGING feature tree");
         peblSource.benchmark.capabilities.forEach(c -> {
 
             final Optional<Capability> capabilityOptional = peblTarget.benchmark.capabilities.stream().filter(x -> x.getId().equals(c.getId())).findFirst();
@@ -97,6 +99,7 @@ private static void merge(PEBL peblSource, PEBL peblTarget, Path newRelativeData
         });
 
         // add tests if not yet available
+        System.out.println("MERGING tests");
         List<String> testIds = peblTarget.benchmark.tests.stream().map(HasId::getId).collect(Collectors.toList());
         peblSource.benchmark.tests.stream().filter(e -> !testIds.contains(e.getId())).forEach(e -> {
             final List<Path> files = e.getFiles().stream().map(newRelativeDataFolder::relativize).collect(Collectors.toList());
@@ -109,10 +112,12 @@ private static void merge(PEBL peblSource, PEBL peblTarget, Path newRelativeData
         });
 
         // add engines if not yet available
+        System.out.println("MERGING engines");
         List<String> engineIds = peblTarget.result.engines.stream().map(HasId::getId).collect(Collectors.toList());
         peblSource.result.engines.stream().filter(e -> !engineIds.contains(e.getId())).forEach(e -> peblTarget.result.engines.add(e));
 
         // add test results if not yet available
+        System.out.println("MERGING test results");
         List<String> testResultIds = peblTarget.result.testResults.stream().map(HasId::getId).collect(Collectors.toList());
         peblSource.result.testResults.forEach(e -> {
             final List<Path> files = e.getFiles().stream().map(newRelativeDataFolder::relativize).collect(Collectors.toList());