2 files changed, 0 insertions, 50 deletions

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 378c9553..a270cb73 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,4 +1,3 @@
-<<<<<<< HEAD
 package hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder

 

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

@@ -42,49 +41,4 @@ 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
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
index 57f52730..fea5cc00 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
@@ -27,12 +27,8 @@ Require-Bundle: com.google.guava,
  org.apache.batik.util.gui;bundle-version="[1.6.0,1.6.1]",

  org.apache.xerces;bundle-version="2.9.0",

  org.w3c.dom.svg;bundle-version="1.1.0",

-<<<<<<< HEAD

- org.w3c.css.sac;bundle-version="1.3.1"

-=======

  org.w3c.css.sac;bundle-version="1.3.1",

  org.eclipse.m2e.maven.runtime.slf4j.simple

->>>>>>> 4d27f278... VAMPIRE: last commit

 Import-Package: com.eclipsesource.v8;version="4.6.0",

  com.eclipsesource.v8.debug;version="4.6.0",

  com.eclipsesource.v8.utils;version="4.6.0",