Add gitignore, commit everything

2 files changed, 6 insertions, 110 deletions

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 86c9092a..1559ee3f 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
@@ -4,11 +4,11 @@ import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver
 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration

 import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory

 import functionalarchitecture.Function

+import functionalarchitecture.FunctionalInterface

+import functionalarchitecture.FunctionalOutput

 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

 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type

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

@@ -30,8 +30,7 @@ import org.eclipse.emf.ecore.EReference
 import org.eclipse.emf.ecore.resource.Resource

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

 import org.eclipse.viatra.query.runtime.api.IQueryGroup

-import org.eclipse.emf.ecore.EClassifier

-import functionalarchitecture.FunctionalOutput

+import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

 

 class GeneralTest {

         def static String createAndSolveProblem(EcoreMetamodelDescriptor metamodel, List<EObject> partialModel,

@@ -67,7 +66,7 @@ class GeneralTest {
                         list2MapMin.get(Function.simpleName)

                 ), 1)

                 typeMapMin.put(ecore2Logic.TypeofEClass(modelGenerationProblem.trace, 

-                        list2MapMin.get(functionalarchitecture.FunctionalInterface.simpleName)

+                        list2MapMin.get(FunctionalInterface.simpleName)

                 ), 2)

                 typeMapMin.put(ecore2Logic.TypeofEClass(modelGenerationProblem.trace, 

                         list2MapMin.get(FunctionalOutput.simpleName)

@@ -80,7 +79,7 @@ class GeneralTest {
                 ), 5)

                 typeMapMax.put(ecore2Logic.TypeofEClass(

                         modelGenerationProblem.trace,

-                        list2MapMax.get(functionalarchitecture.FunctionalInterface.simpleName)

+                        list2MapMax.get(FunctionalInterface.simpleName)

                 ), 2)

                 typeMapMax.put(ecore2Logic.TypeofEClass(

                         modelGenerationProblem.trace,

@@ -92,7 +91,7 @@ class GeneralTest {
                         // add configuration things, in config file first

                         it.documentationLevel = DocumentationLevel::FULL

                         it.typeScopes.minNewElements = 6

-                        it.typeScopes.maxNewElements = 8

+                        it.typeScopes.maxNewElements = 40

                         it.typeScopes.minNewElementsByType = typeMapMin

                         it.typeScopes.maxNewElementsByType = typeMapMax

                 ]

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icseTests/FAMTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icseTests/FAMTest.xtend
deleted file mode 100644
index a8b4dcfb..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icseTests/FAMTest.xtend
+++ /dev/null
@@ -1,103 +0,0 @@
-package ca.mcgill.ecse.dslreasoner.vampire.test

-

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

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

-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.EcoreMetamodelDescriptor

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner

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

-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.List

-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

-

-class DslTest {

-        def static void main(String[] args) {

-                val inputs = new FileSystemWorkspace('''initialModels/''', "")

-                val workspace = new FileSystemWorkspace('''outputDslModels/''', "")

-                workspace.initAndClear

-

-                println("Input and output workspaces are created")

-

-                val metamodel = loadMetamodel()

-                val partialModel = loadPartialModel(inputs)

-//              val queries = loadQueries(metamodel)

-

-                println("DSL loaded")

-                

-                val Ecore2Logic ecore2Logic = new Ecore2Logic

-                val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic)

-                val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)

-                val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic

-                

-                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel,new Ecore2LogicConfiguration())

-//              val modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem,partialModel)

-//              val validModelExtensionProblem = viatra2Logic.transformQueries(queries,modelGenerationProblem,new Viatra2LogicConfiguration)

-                

-                val logicProblem = modelGenerationProblem.output

-//              val logicProblem = modelExtensionProblem.output

-//              val logicProblem = validModelExtensionProblem.output

-                

-                

-                println("Problem created")

-                

-                var LogicResult solution

-                var LogicReasoner reasoner

-                //*

-                reasoner = new VampireSolver

-                val vampireConfig = new VampireSolverConfiguration => [

-                        //add configuration things, in config file first

-                        it.writeToFile = false

-                ]

-                

-                solution = reasoner.solve(logicProblem, vampireConfig,  workspace)

-                

-                println("Problem solved")

-                

-                

-        }

-

-        def private static loadMetamodel() {

-                //FAM

-                val pckg = FunctionalarchitecturePackage.eINSTANCE

-                val List<EClass> classes = pckg.EClassifiers.filter(EClass).toList

-                val List<EEnum> enums = pckg.EClassifiers.filter(EEnum).toList

-                val List<EEnumLiteral> literals = enums.map[getELiterals].flatten.toList

-                val List<EReference> references = classes.map[getEReferences].flatten.toList

-                val List<EAttribute> attributes = classes.map[getEAttributes].flatten.toList

-                return new EcoreMetamodelDescriptor(classes,#{},false,enums,literals,references,attributes)

-        }

-

-        def private static loadPartialModel(ReasonerWorkspace inputs) {

-                Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());

-                inputs.readModel(EObject,"FunctionalArchitectureModel.xmi").eResource.allContents.toList

-//              inputs.readModel(EObject,"FAM.xmi").eResource.allContents.toList

-        }

-

-//      def private static loadQueries(EcoreMetamodelDescriptor metamodel) {

-//              val i = hu.bme.mit.inf.dslreasoner.domains.transima.fam.patterns.Pattern.instance

-//              val patterns = i.specifications.toList

-//              val wfPatterns = patterns.filter[it.allAnnotations.exists[it.name== "Constraint"]].toSet

-//              val derivedFeatures = new LinkedHashMap

-//              derivedFeatures.put(i.type,metamodel.attributes.filter[it.name == "type"].head)

-//              derivedFeatures.put(i.model,metamodel.references.filter[it.name == "model"].head)

-//              val res = new ViatraQuerySetDescriptor(

-//                      patterns,

-//                      wfPatterns,

-//                      derivedFeatures

-//              )

-//              return res

-//      }

-}