diff --git a/solve/src/main/jastadd/queries.jrag b/solve/src/main/jastadd/queries.jrag
index d149261f476ce6581b45818fb5291ae4a6bbcc8b..03af78e945337b4d0326202e8b4a9185136ecf03 100644
--- a/solve/src/main/jastadd/queries.jrag
+++ b/solve/src/main/jastadd/queries.jrag
@@ -1,5 +1,7 @@
aspect Queries {
+ public boolean SocialNetwork.debug = false;
+
syn int ModelElement.score() = 0;
syn java.util.Set<User> User.getCommentLikerFriends(Comment comment) circular [new java.util.HashSet<User>()];
@@ -71,7 +73,13 @@ aspect Queries {
}
}
}
- return elements[0].getId() + "|" + elements[1].getId() + "|" + elements[2].getId();
+ if (debug) {
+ return elements[0].getId() + "--" + elements[0].score() +
+ "|" + elements[1].getId() + "--" + elements[1].score() +
+ "|" + elements[2].getId() + "--" + elements[2].score();
+ } else {
+ return elements[0].getId() + "|" + elements[1].getId() + "|" + elements[2].getId();
+ }
}
syn boolean Submission.hasBetterScoreThan(Submission other) {
diff --git a/solve/src/main/java/de/tudresden/inf/st/ttc18live/AbstractLiveContestDriver.java b/solve/src/main/java/de/tudresden/inf/st/ttc18live/AbstractLiveContestDriver.java
index b4a1fbeed1d8ac97e3dac1bfb1b4d60b56903b5e..ab85a12ab54da1f1931ef5758eacfc1eb4c717ae 100644
--- a/solve/src/main/java/de/tudresden/inf/st/ttc18live/AbstractLiveContestDriver.java
+++ b/solve/src/main/java/de/tudresden/inf/st/ttc18live/AbstractLiveContestDriver.java
@@ -7,6 +7,9 @@ import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* Abstract Driver for a JastAdd solution.
@@ -15,6 +18,7 @@ import java.nio.file.Path;
*/
public abstract class AbstractLiveContestDriver {
+ private Boolean Debug;
private String ChangePath;
private String RunIndex;
private int Sequences;
@@ -31,6 +35,7 @@ public abstract class AbstractLiveContestDriver {
AbstractLiveContestDriver() {
ChangeSet = System.getenv("ChangeSet");
ChangePath = System.getenv("ChangePath");
+ Debug = Boolean.valueOf(System.getenv("Debug"));
Query = System.getenv("Query").toUpperCase();
}
@@ -112,6 +117,7 @@ public abstract class AbstractLiveContestDriver {
stopwatch = System.nanoTime();
SocialNetwork socialNetwork = LoadImpl();
+ socialNetwork.debug = Debug;
if (traceEvents) {
socialNetwork.enableTracing();
}
@@ -161,16 +167,19 @@ public abstract class AbstractLiveContestDriver {
} else {
iterationStr = Integer.toString(iteration);
}
- System.out.println(String.format("%s;%s;%s;%s;%s;%s;Time;%s", Tool, Query, ChangeSet, RunIndex, iterationStr, phase.toString(), Long.toString(stopwatch)));
+ System.out.println(String.format("%s;%s;%s;%s;%s;%s;Time;%s",
+ Tool, Query, ChangeSet, RunIndex, iterationStr, phase.toString(), Long.toString(stopwatch)));
Runtime.getRuntime().gc();
Runtime.getRuntime().gc();
Runtime.getRuntime().gc();
Runtime.getRuntime().gc();
Runtime.getRuntime().gc();
long memoryUsed = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
- System.out.println(String.format("%s;%s;%s;%s;%s;%s;Memory;%s", Tool, Query, ChangeSet, RunIndex, iterationStr, phase.toString(), Long.toString(memoryUsed)));
+ System.out.println(String.format("%s;%s;%s;%s;%s;%s;Memory;%s",
+ Tool, Query, ChangeSet, RunIndex, iterationStr, phase.toString(), Long.toString(memoryUsed)));
if (result != null) {
- System.out.println(String.format("%s;%s;%s;%s;%s;%s;Elements;%s", Tool, Query, ChangeSet, RunIndex, iterationStr, phase.toString(), result));
+ System.out.println(String.format("%s;%s;%s;%s;%s;%s;Elements;%s",
+ Tool, Query, ChangeSet, RunIndex, iterationStr, phase.toString(), result));
}
}