VAMPIRE: close #22, improve test structure for #39, .vql file trouble

12 files changed, 18 insertions, 65 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
index 55d90ac7..2cecdaac 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
index 8eeb2d28..a34ab846 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
index ab6aaf6e..a18fd1a5 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
index cd75a66c..0969c84c 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
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 1b920064..f0af3ba5 100644
--- 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
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
index 820dd354..7019f162 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
@@ -1,9 +1,9 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

+import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage;

+import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

-import com.google.common.collect.Iterables;

-import functionalarchitecture.FunctionalarchitecturePackage;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;

@@ -17,27 +17,11 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore;
 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

-import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

 import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.resource.Resource;

-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

 import org.eclipse.xtend2.lib.StringConcatenation;

-import org.eclipse.xtext.xbase.lib.CollectionLiterals;

 import org.eclipse.xtext.xbase.lib.Exceptions;

-import org.eclipse.xtext.xbase.lib.Functions.Function1;

 import org.eclipse.xtext.xbase.lib.InputOutput;

-import org.eclipse.xtext.xbase.lib.IterableExtensions;

-import org.eclipse.xtext.xbase.lib.IteratorExtensions;

-import org.eclipse.xtext.xbase.lib.ListExtensions;

 import org.eclipse.xtext.xbase.lib.ObjectExtensions;

 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;

 

@@ -49,12 +33,13 @@ public class EcoreTest {
       _builder.append("initialModels/");

       final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

       StringConcatenation _builder_1 = new StringConcatenation();

-      _builder_1.append("output/FAMTest/");

+      _builder_1.append("output/FEcoreTest/");

       final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

       workspace.initAndClear();

       InputOutput.<String>println("Input and output workspaces are created");

-      final EcoreMetamodelDescriptor metamodel = EcoreTest.loadMetamodel();

-      final List<EObject> partialModel = EcoreTest.loadPartialModel(inputs);

+      final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE);

+      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi");

+      final Object queries = null;

       InputOutput.<String>println("DSL loaded");

       final Ecore2Logic ecore2Logic = new Ecore2Logic();

       final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic);

@@ -80,38 +65,4 @@ public class EcoreTest {
       throw Exceptions.sneakyThrow(_e);

     }

   }

-  

-  private static EcoreMetamodelDescriptor loadMetamodel() {

-    final FunctionalarchitecturePackage pckg = FunctionalarchitecturePackage.eINSTANCE;

-    final List<EClass> classes = IterableExtensions.<EClass>toList(Iterables.<EClass>filter(pckg.getEClassifiers(), EClass.class));

-    final List<EEnum> enums = IterableExtensions.<EEnum>toList(Iterables.<EEnum>filter(pckg.getEClassifiers(), EEnum.class));

-    final Function1<EEnum, EList<EEnumLiteral>> _function = (EEnum it) -> {

-      return it.getELiterals();

-    };

-    final List<EEnumLiteral> literals = IterableExtensions.<EEnumLiteral>toList(Iterables.<EEnumLiteral>concat(ListExtensions.<EEnum, EList<EEnumLiteral>>map(enums, _function)));

-    final Function1<EClass, EList<EReference>> _function_1 = (EClass it) -> {

-      return it.getEReferences();

-    };

-    final List<EReference> references = IterableExtensions.<EReference>toList(Iterables.<EReference>concat(ListExtensions.<EClass, EList<EReference>>map(classes, _function_1)));

-    final Function1<EClass, EList<EAttribute>> _function_2 = (EClass it) -> {

-      return it.getEAttributes();

-    };

-    final List<EAttribute> attributes = IterableExtensions.<EAttribute>toList(Iterables.<EAttribute>concat(ListExtensions.<EClass, EList<EAttribute>>map(classes, _function_2)));

-    return new EcoreMetamodelDescriptor(classes, Collections.<EClass>unmodifiableSet(CollectionLiterals.<EClass>newHashSet()), false, enums, literals, references, attributes);

-  }

-  

-  private static List<EObject> loadPartialModel(final ReasonerWorkspace inputs) {

-    List<EObject> _xblockexpression = null;

-    {

-      Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();

-      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();

-      _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl);

-      _xblockexpression = IteratorExtensions.<EObject>toList(inputs.<EObject>readModel(EObject.class, "FamInstance.xmi").eResource().getAllContents());

-    }

-    return _xblockexpression;

-  }

-  

-  private static Object loadQueries(final EcoreMetamodelDescriptor metamodel) {

-    return null;

-  }

 }

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
index 5fc2a391..08f1b4a7 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
@@ -1,7 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

 import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

 import functionalarchitecture.Function;

@@ -18,7 +17,6 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

-import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

 import java.util.HashMap;

@@ -53,12 +51,13 @@ public class FAMTest {
       map.put("logicproblem", _xMIResourceFactoryImpl);

       InputOutput.<String>println("Input and output workspaces are created");

       final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE);

-      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi");

-      final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance());

+      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "FAM/FaModel.xmi");

+      final Object queries = null;

       InputOutput.<String>println("DSL loaded");

       Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

       final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

       LogicProblem problem = modelGenerationProblem.getOutput();

+      problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput();

       workspace.writeModel(problem, "Fam.logicproblem");

       InputOutput.<String>println("Problem created");

       long startTime = System.currentTimeMillis();

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
index eedec995..f7f8a5ee 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
@@ -2,6 +2,7 @@ package ca.mcgill.ecse.dslreasoner.vampire.icse;
 

 import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage;

 import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

+import ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;

@@ -15,6 +16,7 @@ import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

+import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

 import java.util.HashMap;

@@ -40,7 +42,7 @@ public class FileSystemTest {
       _builder.append("initialModels/");

       final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

       StringConcatenation _builder_1 = new StringConcatenation();

-      _builder_1.append("output/FAMTest/");

+      _builder_1.append("output/FileSystemTest/");

       final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

       workspace.initAndClear();

       final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;

@@ -50,11 +52,12 @@ public class FileSystemTest {
       InputOutput.<String>println("Input and output workspaces are created");

       final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE);

       final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi");

+      final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance());

       InputOutput.<String>println("DSL loaded");

       Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

       final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

       LogicProblem problem = modelGenerationProblem.getOutput();

-      workspace.writeModel(problem, "Fam.logicproblem");

+      workspace.writeModel(problem, "FileSystem.logicproblem");

       InputOutput.<String>println("Problem created");

       long startTime = System.currentTimeMillis();

       LogicReasoner reasoner = null;

@@ -67,8 +70,8 @@ public class FileSystemTest {
       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

       final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

         it.documentationLevel = DocumentationLevel.FULL;

-        it.typeScopes.minNewElements = 4;

-        it.typeScopes.maxNewElements = 5;

+        it.typeScopes.minNewElements = 40;

+        it.typeScopes.maxNewElements = 59;

         int _size = typeMapMin.size();

         boolean _notEquals = (_size != 0);

         if (_notEquals) {

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 81079764..3a322ee0 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
@@ -68,8 +68,8 @@ public class YakinduTest {
       VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

       final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

         it.documentationLevel = DocumentationLevel.FULL;

-        it.typeScopes.minNewElements = 20;

-        it.typeScopes.maxNewElements = 30;

+        it.typeScopes.minNewElements = 53;

+        it.typeScopes.maxNewElements = 53;

         int _size = typeMapMin.size();

         boolean _notEquals = (_size != 0);

         if (_notEquals) {

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
index 29f8df00..c5ed4b90 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
index 72d33e5d..21fdd9b7 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
index e9c4c0a4..b1887ff2 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin