Facilitate #31, close #36

2 files changed, 17 insertions, 4 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
index a9314376..ef2e0c2f 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
@@ -19,6 +19,7 @@ class FAMTest {
                 val reg = Resource.Factory.Registry.INSTANCE

                 val map = reg.extensionToFactoryMap

                 map.put("logicproblem", new XMIResourceFactoryImpl)

+                

 

                 println("Input and output workspaces are created")

 

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
index 5b49543d..25ba546a 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
@@ -48,6 +48,8 @@ class GeneralTest {
                 workspace.writeModel(problem, "Fam.logicproblem")

 

                 println("Problem created")

+                

+                var startTime = System.currentTimeMillis

 

                 var LogicResult solution

                 var LogicReasoner reasoner

@@ -90,10 +92,10 @@ class GeneralTest {
                 val vampireConfig = new VampireSolverConfiguration => [

                         // add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

-//                      it.typeScopes.minNewElements = 501

-//                      it.typeScopes.maxNewElements = 500

-//                      it.typeScopes.minNewElementsByType = typeMapMin

-//                      it.typeScopes.maxNewElementsByType = typeMapMax

+                        it.typeScopes.minNewElements = 4

+                        it.typeScopes.maxNewElements = 7

+                        it.typeScopes.minNewElementsByType = typeMapMin

+                        it.typeScopes.maxNewElementsByType = typeMapMax

                 ]

                 solution = reasoner.solve(problem, vampireConfig, workspace)

 

@@ -109,7 +111,17 @@ class GeneralTest {
                  * ]

                  * solution = reasoner.solve(problem, alloyConfig, workspace)

                  //*/

+                 

+                 

+                var totalTimeMin = (System.currentTimeMillis - startTime)/60000

+                var totalTimeSec = ((System.currentTimeMillis - startTime)/1000)% 60

+                 

                 println("Problem solved")

+                println("Time was: " + totalTimeMin + ":" + totalTimeSec)

+                

+                

+                

+                

         }

 

         def static loadMetamodel(EPackage pckg) {