Fix incremental/flush, add reusable-flush, deactivate benchmark on ci

.gitlab-ci.yml

@@ -17,7 +17,7 @@ build:
   script:
     - ./gradlew --console=plain assemble
 
-testAndBenchmark:
+test:
   image: openjdk:11
   stage: test
   needs:
@@ -26,10 +26,7 @@ testAndBenchmark:
     - "[ -d ttc2018liveContest ] || git clone --depth=1 https://github.com/TransformationToolContest/ttc2018liveContest.git ttc2018liveContest"
     - ln -sf ../../../../ttc2018liveContest/models solve/src/test/resources
     - ./gradlew --console=plain test
-    - ./all-timed-benchmark.sh
   artifacts:
     when: always
     reports:
       junit: "*/build/test-results/test/**/TEST-*.xml"
-    paths:
-      - results/

all-timed-benchmark.sh

@@ -3,6 +3,6 @@ mkdir -p "results"
 query=2
 size=32
 for d in relast-* namelookup-xml-*; do
-  ./timedBenchmark.sh $d $query $size > results/results-${d}-${size}-Q${query}.csv
-  mv events-xml-${size}-Q${query}.csv results/events-${d}-${size}-Q${query}.csv
+  ./gradlew ":${d}:installDist"
+  ./timedBenchmark.sh "$d" $query $size > "results/results-${d}-${size}-Q${query}.csv"
 done

namelookup-xml-flush/build.gradle

@@ -14,8 +14,8 @@ plugins {
 
 ext.relastFiles = []
 
-apply from: '../solve/gradle-parts/base.gradle'
+apply from: '../solve/gradle-parts/01-inc-flush.gradle'
 
-apply from: '../solve/gradle-parts/inc-flush.gradle'
+apply from: '../solve/gradle-parts/02-base.gradle'
 
-apply from: '../solve/gradle-parts/rel-namelookup.gradle'
+apply from: '../solve/gradle-parts/03-rel-namelookup.gradle'

namelookup-xml-inc/build.gradle

@@ -14,8 +14,8 @@ plugins {
 
 ext.relastFiles = []
 
-apply from: '../solve/gradle-parts/base.gradle'
+apply from: '../solve/gradle-parts/01-inc-incremental.gradle'
 
-apply from: '../solve/gradle-parts/inc-incremental.gradle'
+apply from: '../solve/gradle-parts/02-base.gradle'
 
-apply from: '../solve/gradle-parts/rel-namelookup.gradle'
+apply from: '../solve/gradle-parts/03-rel-namelookup.gradle'

relast-reusable-flush/.gitignore

+../solve/.gitignore
\ No newline at end of file

relast-reusable-flush/build.gradle

+buildscript {
+    repositories.mavenCentral()
+    dependencies {
+        classpath group: 'org.jastadd', name: 'jastaddgradle', version: '1.13.3'
+    }
+}
+
+plugins {
+    id 'application'
+    id 'maven'
+    id 'java'
+    id 'idea'
+}
+
+project.ext.relastFiles = ["src/main/jastadd/base/SocialNetwork.relast",
+                   "src/main/jastadd/reusable/dg/DependencyGraph.relast",
+                   "src/main/jastadd/reusable/CommentToDG.relast"]
+
+apply from: '../solve/gradle-parts/01-inc-flush.gradle'
+
+apply from: '../solve/gradle-parts/02-base.gradle'
+
+apply from: '../solve/gradle-parts/03-rel-relast.gradle'

relast-reusable-flush/jastadd_modules

+module("solve") {
+    jastadd {
+        basedir "src/"
+        include "main/jastadd/base/**/*.ast"
+        include "main/jastadd/base/**/*.jadd"
+        include "main/jastadd/base/**/*.jrag"
+        include "main/jastadd/reusable/dg/DependencyGraphReachability.jrag"
+        include "main/jastadd/reusable/CommentToDG.jrag"
+        include "main/jastadd/reusable/queriesRefined.jrag"
+        include "gen/jastadd/**/*.ast"
+        include "gen/jastadd/**/*.jadd"
+    }
+}

relast-reusable-inc/build.gradle

@@ -16,8 +16,8 @@ project.ext.relastFiles = ["src/main/jastadd/base/SocialNetwork.relast",
                    "src/main/jastadd/reusable/dg/DependencyGraph.relast",
                    "src/main/jastadd/reusable/CommentToDG.relast"]
 
-apply from: '../solve/gradle-parts/base.gradle'
+apply from: '../solve/gradle-parts/01-inc-incremental.gradle'
 
-apply from: '../solve/gradle-parts/inc-incremental.gradle'
+apply from: '../solve/gradle-parts/02-base.gradle'
 
-apply from: '../solve/gradle-parts/rel-relast.gradle'
+apply from: '../solve/gradle-parts/03-rel-relast.gradle'

relast-xml-flush/build.gradle

@@ -14,8 +14,8 @@ plugins {
 
 ext.relastFiles = ["src/main/jastadd/base/SocialNetwork.relast"]
 
-apply from: '../solve/gradle-parts/base.gradle'
+apply from: '../solve/gradle-parts/01-inc-flush.gradle'
 
-apply from: '../solve/gradle-parts/inc-flush.gradle'
+apply from: '../solve/gradle-parts/02-base.gradle'
 
-apply from: '../solve/gradle-parts/rel-relast.gradle'
+apply from: '../solve/gradle-parts/03-rel-relast.gradle'

relast-xml-inc/build.gradle

@@ -14,8 +14,8 @@ plugins {
 
 ext.relastFiles = ["src/main/jastadd/base/SocialNetwork.relast"]
 
-apply from: '../solve/gradle-parts/base.gradle'
+apply from: '../solve/gradle-parts/01-inc-incremental.gradle'
 
-apply from: '../solve/gradle-parts/inc-incremental.gradle'
+apply from: '../solve/gradle-parts/02-base.gradle'
 
-apply from: '../solve/gradle-parts/rel-relast.gradle'
+apply from: '../solve/gradle-parts/03-rel-relast.gradle'

settings.gradle

 include ':solve'
 include ':namelookup-xml-flush'
 include ':namelookup-xml-inc'
+include ':relast-reusable-flush'
 include ':relast-reusable-inc'
 include ':relast-xml-flush'
 include ':relast-xml-inc'

solve/build.gradle

@@ -14,8 +14,8 @@ plugins {
 
 ext.relastFiles = ["src/main/jastadd/base/SocialNetwork.relast"]
 
-apply from: '../solve/gradle-parts/base.gradle'
+apply from: '../solve/gradle-parts/01-inc-incremental.gradle'
 
-apply from: '../solve/gradle-parts/inc-incremental.gradle'
+apply from: '../solve/gradle-parts/02-base.gradle'
 
-apply from: '../solve/gradle-parts/rel-relast.gradle'
+apply from: '../solve/gradle-parts/03-rel-relast.gradle'

solve/gradle-parts/01-inc-flush.gradle

+project.ext.extraJastAddOptions = [
+        '--lineColumnNumbers',
+        '--cache=all',
+        "--flush=full",
+        "--incremental=none",
+        "--tracing=api",
+]

solve/gradle-parts/01-inc-incremental.gradle

+project.ext.extraJastAddOptions = [
+        '--lineColumnNumbers',
+        '--cache=all',
+        "--flush=api",
+        "--incremental=param,debug",
+        "--tracing=api",
+]

solve/gradle-parts/base.gradle → solve/gradle-parts/02-base.gradle

@@ -74,13 +74,7 @@ jastadd {
     buildInfoDir = 'src/gen-res'
 
     // default options are: '--rewrite=cnta', '--safeLazy', '--visitCheck=false', '--cacheCycle=false'
-    extraJastAddOptions = [
-            '--lineColumnNumbers',
-            '--cache=all',
-            "--flush=api",
-            "--incremental=param,debug",
-            "--tracing=api",
-    ]
+    extraJastAddOptions = project.ext.extraJastAddOptions
 }
 
 cleanGen.doFirst {

timedBenchmark.sh

@@ -2,5 +2,4 @@
 project=$1
 query=$2
 size=$3
-./gradlew :${project}:installDist
-ChangeSet=$size ChangePath=solve/src/test/resources/models/$size/ Sequences=20 Query=Q$query java -jar $project/build/libs/solve-1.0-SNAPSHOT.jar
+ChangeSet=$size ChangePath=solve/src/test/resources/models/$size/ Sequences=20 Query=Q$query java -jar "$project/build/libs/solve-1.0-SNAPSHOT.jar"