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, 114 insertions, 0 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/YakinduFactory.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/YakinduFactory.java
new file mode 100644
index 00000000..53afae22
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/YakinduFactory.java
@@ -0,0 +1,114 @@
+/**

+ */

+package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu;

+

+import org.eclipse.emf.ecore.EFactory;

+

+/**

+ * <!-- begin-user-doc -->

+ * The <b>Factory</b> for the model.

+ * It provides a create method for each non-abstract class of the model.

+ * <!-- end-user-doc -->

+ * @see ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.YakinduPackage

+ * @generated

+ */

+public interface YakinduFactory extends EFactory {

+        /**

+         * The singleton instance of the factory.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        YakinduFactory eINSTANCE = ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.impl.YakinduFactoryImpl.init();

+

+        /**

+         * Returns a new object of class '<em>Region</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Region</em>'.

+         * @generated

+         */

+        Region createRegion();

+

+        /**

+         * Returns a new object of class '<em>Transition</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Transition</em>'.

+         * @generated

+         */

+        Transition createTransition();

+

+        /**

+         * Returns a new object of class '<em>Statechart</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Statechart</em>'.

+         * @generated

+         */

+        Statechart createStatechart();

+

+        /**

+         * Returns a new object of class '<em>Entry</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Entry</em>'.

+         * @generated

+         */

+        Entry createEntry();

+

+        /**

+         * Returns a new object of class '<em>Synchronization</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Synchronization</em>'.

+         * @generated

+         */

+        Synchronization createSynchronization();

+

+        /**

+         * Returns a new object of class '<em>State</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>State</em>'.

+         * @generated

+         */

+        State createState();

+

+        /**

+         * Returns a new object of class '<em>Choice</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Choice</em>'.

+         * @generated

+         */

+        Choice createChoice();

+

+        /**

+         * Returns a new object of class '<em>Exit</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Exit</em>'.

+         * @generated

+         */

+        Exit createExit();

+

+        /**

+         * Returns a new object of class '<em>Final State</em>'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return a new object of class '<em>Final State</em>'.

+         * @generated

+         */

+        FinalState createFinalState();

+

+        /**

+         * Returns the package supported by this factory.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the package supported by this factory.

+         * @generated

+         */

+        YakinduPackage getYakinduPackage();

+

+} //YakinduFactory