Merge branch 'Vampire-New' into Vampire-New

Conflicts:
	Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
	Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
	Application/hu.bme.mit.inf.dslreasoner.application/xtend-gen/hu/bme/mit/inf/dslreasoner/application/validation/QueryAndMetamodelValidator.java
	Domains/Examples/ModelGenExampleFAM_plugin/model/FamMetamodel.ecore
	Domains/Examples/ModelGenExampleFAM_plugin/plugin.xml
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/META-INF/MANIFEST.MF
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/ContentInNotLive.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/DirectSupertype.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Live.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/LoopInInheritence.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/NonSymmetricOpposite.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/Opposite.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/OppositeDifferentClass.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.alloyexamples/src-gen/hu/bme/mit/inf/dslreasoner/domains/alloyexamples/PatternContent.java
	Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
	Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
	Framework/hu.bme.mit.inf.dslreasoner.logic.model/META-INF/MANIFEST.MF
	Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/Logic2AlloyLanguageMapper_TypeScopeMapping.xtend
	Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.visualisation/META-INF/MANIFEST.MF
	Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Entry.java
	Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/Synchronization.java
	Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/EntryImpl.java
	Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/impl/SynchronizationImpl.java

1 files changed, 0 insertions, 46 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