5 files changed, 58 insertions, 14 deletions

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath
index a29b9deb..de68b5f7 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/.classpath
@@ -7,6 +7,5 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

         <classpathentry kind="src" path="src"/>

-        <classpathentry kind="src" path="src-gen/"/>

         <classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/build.properties b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/build.properties
index 1eb934ae..685c072b 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/build.properties
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/build.properties
@@ -6,6 +6,5 @@ jars.compile.order = .
 source.. = src/,\

            queries/,\

            xtend-gen/,\

-           vql-gen/,\

-           src-gen/

+           vql-gen/

 output.. = bin/

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend
index 2efd6b29..59ec2ae4 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Alloy2LogicMapper.xtend
@@ -9,15 +9,15 @@ class Alloy2LogicMapper {
         public def transformOutput(LogicProblem problem, int requiredNumberOfSolution, MonitoredAlloySolution monitoredAlloySolution, Logic2AlloyLanguageMapperTrace trace, long transformationTime) {

                 val models = monitoredAlloySolution.aswers.map[it.key].toList

                 

-                if(!monitoredAlloySolution.finishedBeforeTimeout) {

-                        return createInsuficientResourcesResult => [

-                                it.problem = problem

-                                it.representation += models

-                                it.trace = trace

-                                it.statistics = transformStatistics(monitoredAlloySolution,transformationTime)

-                        ]

-                } else {

-                        if(models.last.satisfiable || requiredNumberOfSolution == -1) {

+//              if(!monitoredAlloySolution.finishedBeforeTimeout) {

+//                      return createInsuficientResourcesResult => [

+//                              it.problem = problem

+//                              it.representation += models

+//                              it.trace = trace

+//                              it.statistics = transformStatistics(monitoredAlloySolution,transformationTime)

+//                      ]

+//              } else {

+                        if((!models.isEmpty && models.last.satisfiable) || requiredNumberOfSolution == -1) {

                                 return createModelResult => [

                                         it.problem = problem

                                         it.representation += models

@@ -32,7 +32,7 @@ class Alloy2LogicMapper {
                                         it.statistics = transformStatistics(monitoredAlloySolution,transformationTime)

                                 ]

                         }

-                }

+//              }

         }

         

         def transformStatistics(MonitoredAlloySolution solution, long transformationTime) {

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend
index 3379ba20..fb094bc5 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes.xtend
@@ -254,7 +254,7 @@ class Logic2AlloyLanguageMapper_TypeMapper_FilteredTypes implements Logic2AlloyL
         }

         

         override getUndefinedSupertypeScope(int undefinedScope, Logic2AlloyLanguageMapperTrace trace) {

-                return undefinedScope + trace.typeTrace.definedElement2Declaration.size

+                if(undefinedScope == Integer.MAX_VALUE) return undefinedScope else return undefinedScope + trace.typeTrace.definedElement2Declaration.size

         }

         

         override getTypeInterpreter() {

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeScopeMapping.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeScopeMapping.xtend
index a270cb73..378c9553 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeScopeMapping.xtend
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeScopeMapping.xtend
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 package hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder

 

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

@@ -41,4 +42,49 @@ class Logic2AlloyLanguageMapper_AsConstraint implements Logic2AlloyLanguageMappe
                         ]

                 ]

         }

+=======
+package hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder
+
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.ALSDocument
+import hu.bme.mit.inf.dslreasoner.alloyLanguage.AlloyLanguageFactory
+
+interface Logic2AlloyLanguageMapper_TypeScopeMapping {
+        def void addLowerMultiplicity(ALSDocument document, Type type, int lowerMultiplicty, Logic2AlloyLanguageMapper mapper, Logic2AlloyLanguageMapperTrace trace)
+        def void addUpperMultiplicity(ALSDocument document, Type type, int upperMultiplicty, Logic2AlloyLanguageMapper mapper, Logic2AlloyLanguageMapperTrace trace)
+}
+
+class Logic2AlloyLanguageMapper_AsConstraint implements Logic2AlloyLanguageMapper_TypeScopeMapping {
+        val extension AlloyLanguageFactory factory = AlloyLanguageFactory.eINSTANCE
+        val Logic2AlloyLanguageMapper_Support support = new Logic2AlloyLanguageMapper_Support;
+        val Logic2AlloyLanguageMapper_TypeMapper typeMapper
+        
+        new(Logic2AlloyLanguageMapper_TypeMapper mapper) {
+                this.typeMapper = mapper
+        }
+        
+        override addLowerMultiplicity(ALSDocument document, Type type, int lowerMultiplicty, Logic2AlloyLanguageMapper mapper, Logic2AlloyLanguageMapperTrace trace) {
+                document.factDeclarations += createALSFactDeclaration => [
+                        it.name = support.toID(#["LowerMultiplicity",support.toID(type.name),lowerMultiplicty.toString])
+                        it.term = createALSLeq => [
+                                it.leftOperand = createALSCardinality => [
+                                        it.operand =  support.unfoldPlus(typeMapper.transformTypeReference(type,mapper,trace).map[t|createALSReference => [it.referred = t]].toList)
+                                ]
+                                it.rightOperand = createALSNumberLiteral => [it.value = lowerMultiplicty]
+                        ]
+                ]
+        }
+        
+        override addUpperMultiplicity(ALSDocument document, Type type, int upperMultiplicty, Logic2AlloyLanguageMapper mapper, Logic2AlloyLanguageMapperTrace trace) {
+                document.factDeclarations += createALSFactDeclaration => [
+                        it.name = support.toID(#["UpperMultiplicity",support.toID(type.name),upperMultiplicty.toString])
+                        it.term = createALSMeq => [
+                                it.leftOperand = createALSCardinality => [
+                                        it.operand =  support.unfoldPlus(typeMapper.transformTypeReference(type,mapper,trace).map[t|createALSReference => [it.referred = t]].toList)
+                                ]
+                                it.rightOperand = createALSNumberLiteral => [it.value = upperMultiplicty]
+                        ]
+                ]
+        }
+>>>>>>> 25a4b1b5... VAMPIRE: post-submission push
 }
\ No newline at end of file