From 635b4b6c3f9006847eb3d98c59cea3064f57979b Mon Sep 17 00:00:00 2001
From: ArenBabikian <aren.babikian@mail.mcgill.ca>
Date: Sat, 12 Oct 2019 23:10:19 -0400
Subject: VAMPIRE: complete data collection and code setup

---
 .../ecse/dslreasoner/vampire/icse/YakinduTest.xtend   |  16 ++++++++--------
 .../dslreasoner/vampire/icse/.YakinduTest.xtendbin    | Bin 8992 -> 8997 bytes
 .../ecse/dslreasoner/vampire/icse/YakinduTest.java    |  14 +++++++-------
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'Tests')

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
index 9121367b..26b91525 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
@@ -59,12 +59,12 @@ class YakinduTest {
 //		val queries = null
 		println("DSL loaded")
 
-		var SZ_TOP = 30
-		var SZ_BOT = 5
-		var INC = 5
-		var REPS = 1
+		var SZ_TOP = 150
+		var SZ_BOT = 150
+		var INC = 10
+		var REPS = 10
 
-		val RUNTIME = 20
+		val RUNTIME = 300
 
 		val EXACT = -1
 		if (EXACT != -1) {
@@ -82,13 +82,13 @@ class YakinduTest {
 //			,			
 //			BackendSolver::GEOIII
 //			, 
-			BackendSolver::IPROVER
+//			BackendSolver::IPROVER
 //			, 
 //			BackendSolver::PARADOX
 //			, 
 //			BackendSolver::VAMPIRE
 //			,
-//			BackendSolver::Z3
+			BackendSolver::Z3
 			)
 		
 
@@ -197,7 +197,7 @@ class YakinduTest {
 					writer.append(satOut + ",")
 					writer.append(satTime + ",")
 					writer.append(modOut + ",")
-					writer.append(modTime + ",")
+					writer.append(modTime + "")
 					writer.append("\n")
 
 //				print("(" + tTime + "/" + sTime + "s)..")
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
index cf52d6a6..b29e18b1 100644
Binary files a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin and b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin differ
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
index 1837b768..c2aaee03 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
@@ -85,11 +85,11 @@ public class YakinduTest {
       final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/Yakindu.xmi");
       final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, Patterns.instance());
       InputOutput.<String>println("DSL loaded");
-      int SZ_TOP = 30;
-      int SZ_BOT = 5;
-      int INC = 5;
-      int REPS = 1;
-      final int RUNTIME = 20;
+      int SZ_TOP = 150;
+      int SZ_BOT = 150;
+      int INC = 10;
+      int REPS = 10;
+      final int RUNTIME = 300;
       final int EXACT = (-1);
       if ((EXACT != (-1))) {
         SZ_TOP = EXACT;
@@ -98,7 +98,7 @@ public class YakinduTest {
         REPS = 10;
       }
       final ArrayList<BackendSolver> BACKENDSOLVERS = CollectionLiterals.<BackendSolver>newArrayList(
-        BackendSolver.IPROVER);
+        BackendSolver.Z3);
       String str = "";
       for (final BackendSolver solver : BACKENDSOLVERS) {
         String _str = str;
@@ -218,7 +218,7 @@ public class YakinduTest {
                   String _plus_20 = (Double.valueOf(satTime) + ",");
                   writer.append(_plus_20);
                   writer.append((modOut + ","));
-                  String _plus_21 = (Double.valueOf(modTime) + ",");
+                  String _plus_21 = (Double.valueOf(modTime) + "");
                   writer.append(_plus_21);
                   writer.append("\n");
                 }
-- 
cgit v1.2.3-54-g00ecf