Migrating Additional projects

author: OszkarSemerath <oszka@152.66.252.189> 2017-06-10 19:05:05 +0200
committer: OszkarSemerath <oszka@152.66.252.189> 2017-06-10 19:05:05 +0200
commit: 60f01f46ba232ed6416054f0a6115cb2a9b70b4e (patch)
tree: 5edf8aeb07abc51f3fec63bbd15c926e1de09552 /Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl
parent: Initial commit, migrating from SVN (diff)
download: VIATRA-Generator-60f01f46ba232ed6416054f0a6115cb2a9b70b4e.tar.gz
VIATRA-Generator-60f01f46ba232ed6416054f0a6115cb2a9b70b4e.tar.zst
VIATRA-Generator-60f01f46ba232ed6416054f0a6115cb2a9b70b4e.zip
55 files changed, 10371 insertions, 0 deletions
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AndImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AndImpl.java
new file mode 100644
index 00000000..1c36b6d6
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AndImpl.java
@@ -0,0 +1,150 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.And;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>And</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AndImpl#getOperands <em>Operands</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AndImpl extends BoolOperationImpl implements And {
+        /**
+         * The cached value of the '{@link #getOperands() <em>Operands</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOperands()
+         * @generated
+         * @ordered
+         */
+        protected EList<Term> operands;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected AndImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.AND;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Term> getOperands() {
+                if (operands == null) {
+                        operands = new EObjectContainmentEList<Term>(Term.class, this, LogiclanguagePackage.AND__OPERANDS);
+                }
+                return operands;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.AND__OPERANDS:
+                                return ((InternalEList<?>)getOperands()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.AND__OPERANDS:
+                                return getOperands();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.AND__OPERANDS:
+                                getOperands().clear();
+                                getOperands().addAll((Collection<? extends Term>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.AND__OPERANDS:
+                                getOperands().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.AND__OPERANDS:
+                                return operands != null && !operands.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+} //AndImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AssertionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AssertionImpl.java
new file mode 100644
index 00000000..254f5240
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AssertionImpl.java
@@ -0,0 +1,303 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Assertion;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.AssertionAnnotation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Assertion</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AssertionImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AssertionImpl#getName <em>Name</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.AssertionImpl#getAnnotations <em>Annotations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class AssertionImpl extends MinimalEObjectImpl.Container implements Assertion {
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected Term value;
+        /**
+         * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected static final String NAME_EDEFAULT = null;
+        /**
+         * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected String name = NAME_EDEFAULT;
+        /**
+         * The cached value of the '{@link #getAnnotations() <em>Annotations</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getAnnotations()
+         * @generated
+         * @ordered
+         */
+        protected EList<AssertionAnnotation> annotations;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected AssertionImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.ASSERTION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getValue() {
+                return value;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetValue(Term newValue, NotificationChain msgs) {
+                Term oldValue = value;
+                value = newValue;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.ASSERTION__VALUE, oldValue, newValue);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(Term newValue) {
+                if (newValue != value) {
+                        NotificationChain msgs = null;
+                        if (value != null)
+                                msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.ASSERTION__VALUE, null, msgs);
+                        if (newValue != null)
+                                msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.ASSERTION__VALUE, null, msgs);
+                        msgs = basicSetValue(newValue, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.ASSERTION__VALUE, newValue, newValue));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.ASSERTION__NAME, oldName, name));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<AssertionAnnotation> getAnnotations() {
+                if (annotations == null) {
+                        annotations = new EObjectWithInverseResolvingEList<AssertionAnnotation>(AssertionAnnotation.class, this, LogiclanguagePackage.ASSERTION__ANNOTATIONS, LogicproblemPackage.ASSERTION_ANNOTATION__TARGET);
+                }
+                return annotations;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.ASSERTION__ANNOTATIONS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getAnnotations()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.ASSERTION__VALUE:
+                                return basicSetValue(null, msgs);
+                        case LogiclanguagePackage.ASSERTION__ANNOTATIONS:
+                                return ((InternalEList<?>)getAnnotations()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.ASSERTION__VALUE:
+                                return getValue();
+                        case LogiclanguagePackage.ASSERTION__NAME:
+                                return getName();
+                        case LogiclanguagePackage.ASSERTION__ANNOTATIONS:
+                                return getAnnotations();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.ASSERTION__VALUE:
+                                setValue((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.ASSERTION__NAME:
+                                setName((String)newValue);
+                                return;
+                        case LogiclanguagePackage.ASSERTION__ANNOTATIONS:
+                                getAnnotations().clear();
+                                getAnnotations().addAll((Collection<? extends AssertionAnnotation>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.ASSERTION__VALUE:
+                                setValue((Term)null);
+                                return;
+                        case LogiclanguagePackage.ASSERTION__NAME:
+                                setName(NAME_EDEFAULT);
+                                return;
+                        case LogiclanguagePackage.ASSERTION__ANNOTATIONS:
+                                getAnnotations().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.ASSERTION__VALUE:
+                                return value != null;
+                        case LogiclanguagePackage.ASSERTION__NAME:
+                                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                        case LogiclanguagePackage.ASSERTION__ANNOTATIONS:
+                                return annotations != null && !annotations.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+                StringBuffer result = new StringBuffer(super.toString());
+                result.append(" (name: ");
+                result.append(name);
+                result.append(')');
+                return result.toString();
+        }
+} //AssertionImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AtomicTermImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AtomicTermImpl.java
new file mode 100644
index 00000000..7d5ec7d8
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/AtomicTermImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AtomicTerm;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Atomic Term</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class AtomicTermImpl extends TermImpl implements AtomicTerm {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected AtomicTermImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.ATOMIC_TERM;
+        }
+} //AtomicTermImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolLiteralImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolLiteralImpl.java
new file mode 100644
index 00000000..ea7693bb
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolLiteralImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolLiteral;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Bool Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.BoolLiteralImpl#isValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class BoolLiteralImpl extends AtomicTermImpl implements BoolLiteral {
+        /**
+         * The default value of the '{@link #isValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isValue()
+         * @generated
+         * @ordered
+         */
+        protected static final boolean VALUE_EDEFAULT = false;
+        /**
+         * The cached value of the '{@link #isValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isValue()
+         * @generated
+         * @ordered
+         */
+        protected boolean value = VALUE_EDEFAULT;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected BoolLiteralImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.BOOL_LITERAL;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isValue() {
+                return value;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(boolean newValue) {
+                boolean oldValue = value;
+                value = newValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.BOOL_LITERAL__VALUE, oldValue, value));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.BOOL_LITERAL__VALUE:
+                                return isValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.BOOL_LITERAL__VALUE:
+                                setValue((Boolean)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.BOOL_LITERAL__VALUE:
+                                setValue(VALUE_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.BOOL_LITERAL__VALUE:
+                                return value != VALUE_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+                StringBuffer result = new StringBuffer(super.toString());
+                result.append(" (value: ");
+                result.append(value);
+                result.append(')');
+                return result.toString();
+        }
+} //BoolLiteralImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolOperationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolOperationImpl.java
new file mode 100644
index 00000000..bfe635ec
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolOperationImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolOperation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Bool Operation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class BoolOperationImpl extends TermImpl implements BoolOperation {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected BoolOperationImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.BOOL_OPERATION;
+        }
+} //BoolOperationImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolTypeReferenceImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolTypeReferenceImpl.java
new file mode 100644
index 00000000..66aec0e6
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/BoolTypeReferenceImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolTypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Bool Type Reference</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class BoolTypeReferenceImpl extends PrimitiveTypeReferenceImpl implements BoolTypeReference {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected BoolTypeReferenceImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.BOOL_TYPE_REFERENCE;
+        }
+} //BoolTypeReferenceImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ComplexTypeReferenceImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ComplexTypeReferenceImpl.java
new file mode 100644
index 00000000..4473b0be
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ComplexTypeReferenceImpl.java
@@ -0,0 +1,156 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ComplexTypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Complex Type Reference</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ComplexTypeReferenceImpl#getReferred <em>Referred</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ComplexTypeReferenceImpl extends TypeReferenceImpl implements ComplexTypeReference {
+        /**
+         * The cached value of the '{@link #getReferred() <em>Referred</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getReferred()
+         * @generated
+         * @ordered
+         */
+        protected Type referred;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ComplexTypeReferenceImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.COMPLEX_TYPE_REFERENCE;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Type getReferred() {
+                if (referred != null && referred.eIsProxy()) {
+                        InternalEObject oldReferred = (InternalEObject)referred;
+                        referred = (Type)eResolveProxy(oldReferred);
+                        if (referred != oldReferred) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, LogiclanguagePackage.COMPLEX_TYPE_REFERENCE__REFERRED, oldReferred, referred));
+                        }
+                }
+                return referred;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Type basicGetReferred() {
+                return referred;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setReferred(Type newReferred) {
+                Type oldReferred = referred;
+                referred = newReferred;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.COMPLEX_TYPE_REFERENCE__REFERRED, oldReferred, referred));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.COMPLEX_TYPE_REFERENCE__REFERRED:
+                                if (resolve) return getReferred();
+                                return basicGetReferred();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.COMPLEX_TYPE_REFERENCE__REFERRED:
+                                setReferred((Type)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.COMPLEX_TYPE_REFERENCE__REFERRED:
+                                setReferred((Type)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.COMPLEX_TYPE_REFERENCE__REFERRED:
+                                return referred != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //ComplexTypeReferenceImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDeclarationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDeclarationImpl.java
new file mode 100644
index 00000000..ba9094a0
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDeclarationImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constant Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ConstantDeclarationImpl extends ConstantImpl implements ConstantDeclaration {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ConstantDeclarationImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.CONSTANT_DECLARATION;
+        }
+} //ConstantDeclarationImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDefinitionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDefinitionImpl.java
new file mode 100644
index 00000000..1114508e
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantDefinitionImpl.java
@@ -0,0 +1,236 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDefinition;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constant Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ConstantDefinitionImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ConstantDefinitionImpl#getDefines <em>Defines</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ConstantDefinitionImpl extends ConstantImpl implements ConstantDefinition {
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected Term value;
+        /**
+         * The cached value of the '{@link #getDefines() <em>Defines</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDefines()
+         * @generated
+         * @ordered
+         */
+        protected ConstantDeclaration defines;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ConstantDefinitionImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.CONSTANT_DEFINITION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getValue() {
+                return value;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetValue(Term newValue, NotificationChain msgs) {
+                Term oldValue = value;
+                value = newValue;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.CONSTANT_DEFINITION__VALUE, oldValue, newValue);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(Term newValue) {
+                if (newValue != value) {
+                        NotificationChain msgs = null;
+                        if (value != null)
+                                msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.CONSTANT_DEFINITION__VALUE, null, msgs);
+                        if (newValue != null)
+                                msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.CONSTANT_DEFINITION__VALUE, null, msgs);
+                        msgs = basicSetValue(newValue, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.CONSTANT_DEFINITION__VALUE, newValue, newValue));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ConstantDeclaration getDefines() {
+                if (defines != null && defines.eIsProxy()) {
+                        InternalEObject oldDefines = (InternalEObject)defines;
+                        defines = (ConstantDeclaration)eResolveProxy(oldDefines);
+                        if (defines != oldDefines) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, LogiclanguagePackage.CONSTANT_DEFINITION__DEFINES, oldDefines, defines));
+                        }
+                }
+                return defines;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ConstantDeclaration basicGetDefines() {
+                return defines;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setDefines(ConstantDeclaration newDefines) {
+                ConstantDeclaration oldDefines = defines;
+                defines = newDefines;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.CONSTANT_DEFINITION__DEFINES, oldDefines, defines));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT_DEFINITION__VALUE:
+                                return basicSetValue(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT_DEFINITION__VALUE:
+                                return getValue();
+                        case LogiclanguagePackage.CONSTANT_DEFINITION__DEFINES:
+                                if (resolve) return getDefines();
+                                return basicGetDefines();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT_DEFINITION__VALUE:
+                                setValue((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.CONSTANT_DEFINITION__DEFINES:
+                                setDefines((ConstantDeclaration)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT_DEFINITION__VALUE:
+                                setValue((Term)null);
+                                return;
+                        case LogiclanguagePackage.CONSTANT_DEFINITION__DEFINES:
+                                setDefines((ConstantDeclaration)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT_DEFINITION__VALUE:
+                                return value != null;
+                        case LogiclanguagePackage.CONSTANT_DEFINITION__DEFINES:
+                                return defines != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //ConstantDefinitionImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantImpl.java
new file mode 100644
index 00000000..7c34f669
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ConstantImpl.java
@@ -0,0 +1,233 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Constant;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.ConstantAnnotation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Constant</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ConstantImpl#getType <em>Type</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ConstantImpl#getAnnotations <em>Annotations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class ConstantImpl extends SymbolicDeclarationImpl implements Constant {
+        /**
+         * The cached value of the '{@link #getType() <em>Type</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getType()
+         * @generated
+         * @ordered
+         */
+        protected TypeReference type;
+        /**
+         * The cached value of the '{@link #getAnnotations() <em>Annotations</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getAnnotations()
+         * @generated
+         * @ordered
+         */
+        protected EList<ConstantAnnotation> annotations;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ConstantImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.CONSTANT;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeReference getType() {
+                return type;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetType(TypeReference newType, NotificationChain msgs) {
+                TypeReference oldType = type;
+                type = newType;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.CONSTANT__TYPE, oldType, newType);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setType(TypeReference newType) {
+                if (newType != type) {
+                        NotificationChain msgs = null;
+                        if (type != null)
+                                msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.CONSTANT__TYPE, null, msgs);
+                        if (newType != null)
+                                msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.CONSTANT__TYPE, null, msgs);
+                        msgs = basicSetType(newType, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.CONSTANT__TYPE, newType, newType));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<ConstantAnnotation> getAnnotations() {
+                if (annotations == null) {
+                        annotations = new EObjectWithInverseResolvingEList<ConstantAnnotation>(ConstantAnnotation.class, this, LogiclanguagePackage.CONSTANT__ANNOTATIONS, LogicproblemPackage.CONSTANT_ANNOTATION__TARGET);
+                }
+                return annotations;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT__ANNOTATIONS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getAnnotations()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT__TYPE:
+                                return basicSetType(null, msgs);
+                        case LogiclanguagePackage.CONSTANT__ANNOTATIONS:
+                                return ((InternalEList<?>)getAnnotations()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT__TYPE:
+                                return getType();
+                        case LogiclanguagePackage.CONSTANT__ANNOTATIONS:
+                                return getAnnotations();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT__TYPE:
+                                setType((TypeReference)newValue);
+                                return;
+                        case LogiclanguagePackage.CONSTANT__ANNOTATIONS:
+                                getAnnotations().clear();
+                                getAnnotations().addAll((Collection<? extends ConstantAnnotation>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT__TYPE:
+                                setType((TypeReference)null);
+                                return;
+                        case LogiclanguagePackage.CONSTANT__ANNOTATIONS:
+                                getAnnotations().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.CONSTANT__TYPE:
+                                return type != null;
+                        case LogiclanguagePackage.CONSTANT__ANNOTATIONS:
+                                return annotations != null && !annotations.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+} //ConstantImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DefinedElementImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DefinedElementImpl.java
new file mode 100644
index 00000000..50bdb003
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DefinedElementImpl.java
@@ -0,0 +1,161 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Defined Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.DefinedElementImpl#getDefinedInType <em>Defined In Type</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class DefinedElementImpl extends SymbolicDeclarationImpl implements DefinedElement {
+        /**
+         * The cached value of the '{@link #getDefinedInType() <em>Defined In Type</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDefinedInType()
+         * @generated
+         * @ordered
+         */
+        protected EList<TypeDefinition> definedInType;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected DefinedElementImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.DEFINED_ELEMENT;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<TypeDefinition> getDefinedInType() {
+                if (definedInType == null) {
+                        definedInType = new EObjectWithInverseResolvingEList.ManyInverse<TypeDefinition>(TypeDefinition.class, this, LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE, LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS);
+                }
+                return definedInType;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getDefinedInType()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE:
+                                return ((InternalEList<?>)getDefinedInType()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE:
+                                return getDefinedInType();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE:
+                                getDefinedInType().clear();
+                                getDefinedInType().addAll((Collection<? extends TypeDefinition>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE:
+                                getDefinedInType().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE:
+                                return definedInType != null && !definedInType.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+} //DefinedElementImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DistinctImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DistinctImpl.java
new file mode 100644
index 00000000..04636b3d
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DistinctImpl.java
@@ -0,0 +1,150 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Distinct;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Distinct</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.DistinctImpl#getOperands <em>Operands</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class DistinctImpl extends PrimitiveRelationImpl implements Distinct {
+        /**
+         * The cached value of the '{@link #getOperands() <em>Operands</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOperands()
+         * @generated
+         * @ordered
+         */
+        protected EList<Term> operands;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected DistinctImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.DISTINCT;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Term> getOperands() {
+                if (operands == null) {
+                        operands = new EObjectContainmentEList<Term>(Term.class, this, LogiclanguagePackage.DISTINCT__OPERANDS);
+                }
+                return operands;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DISTINCT__OPERANDS:
+                                return ((InternalEList<?>)getOperands()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DISTINCT__OPERANDS:
+                                return getOperands();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DISTINCT__OPERANDS:
+                                getOperands().clear();
+                                getOperands().addAll((Collection<? extends Term>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DISTINCT__OPERANDS:
+                                getOperands().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.DISTINCT__OPERANDS:
+                                return operands != null && !operands.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+} //DistinctImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DivisonImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DivisonImpl.java
new file mode 100644
index 00000000..0ce40588
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/DivisonImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Divison;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Divison</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class DivisonImpl extends IntOperationImpl implements Divison {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected DivisonImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.DIVISON;
+        }
+} //DivisonImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/EqualsImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/EqualsImpl.java
new file mode 100644
index 00000000..186f2ee6
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/EqualsImpl.java
@@ -0,0 +1,241 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Equals;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Equals</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.EqualsImpl#getLeftOperand <em>Left Operand</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.EqualsImpl#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class EqualsImpl extends PrimitiveRelationImpl implements Equals {
+        /**
+         * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLeftOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term leftOperand;
+        /**
+         * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRightOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term rightOperand;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected EqualsImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.EQUALS;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getLeftOperand() {
+                return leftOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) {
+                Term oldLeftOperand = leftOperand;
+                leftOperand = newLeftOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.EQUALS__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLeftOperand(Term newLeftOperand) {
+                if (newLeftOperand != leftOperand) {
+                        NotificationChain msgs = null;
+                        if (leftOperand != null)
+                                msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.EQUALS__LEFT_OPERAND, null, msgs);
+                        if (newLeftOperand != null)
+                                msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.EQUALS__LEFT_OPERAND, null, msgs);
+                        msgs = basicSetLeftOperand(newLeftOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.EQUALS__LEFT_OPERAND, newLeftOperand, newLeftOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getRightOperand() {
+                return rightOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) {
+                Term oldRightOperand = rightOperand;
+                rightOperand = newRightOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.EQUALS__RIGHT_OPERAND, oldRightOperand, newRightOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRightOperand(Term newRightOperand) {
+                if (newRightOperand != rightOperand) {
+                        NotificationChain msgs = null;
+                        if (rightOperand != null)
+                                msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.EQUALS__RIGHT_OPERAND, null, msgs);
+                        if (newRightOperand != null)
+                                msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.EQUALS__RIGHT_OPERAND, null, msgs);
+                        msgs = basicSetRightOperand(newRightOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.EQUALS__RIGHT_OPERAND, newRightOperand, newRightOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.EQUALS__LEFT_OPERAND:
+                                return basicSetLeftOperand(null, msgs);
+                        case LogiclanguagePackage.EQUALS__RIGHT_OPERAND:
+                                return basicSetRightOperand(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.EQUALS__LEFT_OPERAND:
+                                return getLeftOperand();
+                        case LogiclanguagePackage.EQUALS__RIGHT_OPERAND:
+                                return getRightOperand();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.EQUALS__LEFT_OPERAND:
+                                setLeftOperand((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.EQUALS__RIGHT_OPERAND:
+                                setRightOperand((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.EQUALS__LEFT_OPERAND:
+                                setLeftOperand((Term)null);
+                                return;
+                        case LogiclanguagePackage.EQUALS__RIGHT_OPERAND:
+                                setRightOperand((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.EQUALS__LEFT_OPERAND:
+                                return leftOperand != null;
+                        case LogiclanguagePackage.EQUALS__RIGHT_OPERAND:
+                                return rightOperand != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //EqualsImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ExistsImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ExistsImpl.java
new file mode 100644
index 00000000..b242cd7a
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ExistsImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Exists;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Exists</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ExistsImpl extends QuantifiedExpressionImpl implements Exists {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ExistsImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.EXISTS;
+        }
+} //ExistsImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ForallImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ForallImpl.java
new file mode 100644
index 00000000..032d104f
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ForallImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Forall;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Forall</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ForallImpl extends QuantifiedExpressionImpl implements Forall {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ForallImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.FORALL;
+        }
+} //ForallImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDeclarationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDeclarationImpl.java
new file mode 100644
index 00000000..4e683133
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDeclarationImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.FunctionDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Function Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class FunctionDeclarationImpl extends FunctionImpl implements FunctionDeclaration {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FunctionDeclarationImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.FUNCTION_DECLARATION;
+        }
+} //FunctionDeclarationImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDefinitionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDefinitionImpl.java
new file mode 100644
index 00000000..0f14289a
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionDefinitionImpl.java
@@ -0,0 +1,278 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.FunctionDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.FunctionDefinition;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Function Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.FunctionDefinitionImpl#getVariable <em>Variable</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.FunctionDefinitionImpl#getDefines <em>Defines</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.FunctionDefinitionImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class FunctionDefinitionImpl extends FunctionImpl implements FunctionDefinition {
+        /**
+         * The cached value of the '{@link #getVariable() <em>Variable</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getVariable()
+         * @generated
+         * @ordered
+         */
+        protected EList<Variable> variable;
+        /**
+         * The cached value of the '{@link #getDefines() <em>Defines</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDefines()
+         * @generated
+         * @ordered
+         */
+        protected FunctionDeclaration defines;
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected Term value;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FunctionDefinitionImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.FUNCTION_DEFINITION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Variable> getVariable() {
+                if (variable == null) {
+                        variable = new EObjectContainmentEList<Variable>(Variable.class, this, LogiclanguagePackage.FUNCTION_DEFINITION__VARIABLE);
+                }
+                return variable;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public FunctionDeclaration getDefines() {
+                if (defines != null && defines.eIsProxy()) {
+                        InternalEObject oldDefines = (InternalEObject)defines;
+                        defines = (FunctionDeclaration)eResolveProxy(oldDefines);
+                        if (defines != oldDefines) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, LogiclanguagePackage.FUNCTION_DEFINITION__DEFINES, oldDefines, defines));
+                        }
+                }
+                return defines;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public FunctionDeclaration basicGetDefines() {
+                return defines;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setDefines(FunctionDeclaration newDefines) {
+                FunctionDeclaration oldDefines = defines;
+                defines = newDefines;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.FUNCTION_DEFINITION__DEFINES, oldDefines, defines));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getValue() {
+                return value;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetValue(Term newValue, NotificationChain msgs) {
+                Term oldValue = value;
+                value = newValue;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.FUNCTION_DEFINITION__VALUE, oldValue, newValue);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(Term newValue) {
+                if (newValue != value) {
+                        NotificationChain msgs = null;
+                        if (value != null)
+                                msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.FUNCTION_DEFINITION__VALUE, null, msgs);
+                        if (newValue != null)
+                                msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.FUNCTION_DEFINITION__VALUE, null, msgs);
+                        msgs = basicSetValue(newValue, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.FUNCTION_DEFINITION__VALUE, newValue, newValue));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VARIABLE:
+                                return ((InternalEList<?>)getVariable()).basicRemove(otherEnd, msgs);
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VALUE:
+                                return basicSetValue(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VARIABLE:
+                                return getVariable();
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__DEFINES:
+                                if (resolve) return getDefines();
+                                return basicGetDefines();
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VALUE:
+                                return getValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VARIABLE:
+                                getVariable().clear();
+                                getVariable().addAll((Collection<? extends Variable>)newValue);
+                                return;
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__DEFINES:
+                                setDefines((FunctionDeclaration)newValue);
+                                return;
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VALUE:
+                                setValue((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VARIABLE:
+                                getVariable().clear();
+                                return;
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__DEFINES:
+                                setDefines((FunctionDeclaration)null);
+                                return;
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VALUE:
+                                setValue((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VARIABLE:
+                                return variable != null && !variable.isEmpty();
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__DEFINES:
+                                return defines != null;
+                        case LogiclanguagePackage.FUNCTION_DEFINITION__VALUE:
+                                return value != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //FunctionDefinitionImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionImpl.java
new file mode 100644
index 00000000..da85ae54
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/FunctionImpl.java
@@ -0,0 +1,273 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Function;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.FunctionAnnotation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Function</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.FunctionImpl#getRange <em>Range</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.FunctionImpl#getParameters <em>Parameters</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.FunctionImpl#getAnnotations <em>Annotations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class FunctionImpl extends SymbolicDeclarationImpl implements Function {
+        /**
+         * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRange()
+         * @generated
+         * @ordered
+         */
+        protected TypeReference range;
+        /**
+         * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getParameters()
+         * @generated
+         * @ordered
+         */
+        protected EList<TypeReference> parameters;
+        /**
+         * The cached value of the '{@link #getAnnotations() <em>Annotations</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getAnnotations()
+         * @generated
+         * @ordered
+         */
+        protected EList<FunctionAnnotation> annotations;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected FunctionImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.FUNCTION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeReference getRange() {
+                return range;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRange(TypeReference newRange, NotificationChain msgs) {
+                TypeReference oldRange = range;
+                range = newRange;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.FUNCTION__RANGE, oldRange, newRange);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRange(TypeReference newRange) {
+                if (newRange != range) {
+                        NotificationChain msgs = null;
+                        if (range != null)
+                                msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.FUNCTION__RANGE, null, msgs);
+                        if (newRange != null)
+                                msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.FUNCTION__RANGE, null, msgs);
+                        msgs = basicSetRange(newRange, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.FUNCTION__RANGE, newRange, newRange));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<TypeReference> getParameters() {
+                if (parameters == null) {
+                        parameters = new EObjectContainmentEList<TypeReference>(TypeReference.class, this, LogiclanguagePackage.FUNCTION__PARAMETERS);
+                }
+                return parameters;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<FunctionAnnotation> getAnnotations() {
+                if (annotations == null) {
+                        annotations = new EObjectWithInverseResolvingEList<FunctionAnnotation>(FunctionAnnotation.class, this, LogiclanguagePackage.FUNCTION__ANNOTATIONS, LogicproblemPackage.FUNCTION_ANNOTATION__TARGET);
+                }
+                return annotations;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION__ANNOTATIONS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getAnnotations()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION__RANGE:
+                                return basicSetRange(null, msgs);
+                        case LogiclanguagePackage.FUNCTION__PARAMETERS:
+                                return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
+                        case LogiclanguagePackage.FUNCTION__ANNOTATIONS:
+                                return ((InternalEList<?>)getAnnotations()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION__RANGE:
+                                return getRange();
+                        case LogiclanguagePackage.FUNCTION__PARAMETERS:
+                                return getParameters();
+                        case LogiclanguagePackage.FUNCTION__ANNOTATIONS:
+                                return getAnnotations();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION__RANGE:
+                                setRange((TypeReference)newValue);
+                                return;
+                        case LogiclanguagePackage.FUNCTION__PARAMETERS:
+                                getParameters().clear();
+                                getParameters().addAll((Collection<? extends TypeReference>)newValue);
+                                return;
+                        case LogiclanguagePackage.FUNCTION__ANNOTATIONS:
+                                getAnnotations().clear();
+                                getAnnotations().addAll((Collection<? extends FunctionAnnotation>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION__RANGE:
+                                setRange((TypeReference)null);
+                                return;
+                        case LogiclanguagePackage.FUNCTION__PARAMETERS:
+                                getParameters().clear();
+                                return;
+                        case LogiclanguagePackage.FUNCTION__ANNOTATIONS:
+                                getAnnotations().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.FUNCTION__RANGE:
+                                return range != null;
+                        case LogiclanguagePackage.FUNCTION__PARAMETERS:
+                                return parameters != null && !parameters.isEmpty();
+                        case LogiclanguagePackage.FUNCTION__ANNOTATIONS:
+                                return annotations != null && !annotations.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+} //FunctionImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IfThenElseImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IfThenElseImpl.java
new file mode 100644
index 00000000..27f1a358
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IfThenElseImpl.java
@@ -0,0 +1,307 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IfThenElse;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>If Then Else</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IfThenElseImpl#getCondition <em>Condition</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IfThenElseImpl#getIfTrue <em>If True</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IfThenElseImpl#getIfFalse <em>If False</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IfThenElseImpl extends TermImpl implements IfThenElse {
+        /**
+         * The cached value of the '{@link #getCondition() <em>Condition</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getCondition()
+         * @generated
+         * @ordered
+         */
+        protected Term condition;
+        /**
+         * The cached value of the '{@link #getIfTrue() <em>If True</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getIfTrue()
+         * @generated
+         * @ordered
+         */
+        protected Term ifTrue;
+        /**
+         * The cached value of the '{@link #getIfFalse() <em>If False</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getIfFalse()
+         * @generated
+         * @ordered
+         */
+        protected Term ifFalse;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected IfThenElseImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.IF_THEN_ELSE;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getCondition() {
+                return condition;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetCondition(Term newCondition, NotificationChain msgs) {
+                Term oldCondition = condition;
+                condition = newCondition;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IF_THEN_ELSE__CONDITION, oldCondition, newCondition);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setCondition(Term newCondition) {
+                if (newCondition != condition) {
+                        NotificationChain msgs = null;
+                        if (condition != null)
+                                msgs = ((InternalEObject)condition).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IF_THEN_ELSE__CONDITION, null, msgs);
+                        if (newCondition != null)
+                                msgs = ((InternalEObject)newCondition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IF_THEN_ELSE__CONDITION, null, msgs);
+                        msgs = basicSetCondition(newCondition, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IF_THEN_ELSE__CONDITION, newCondition, newCondition));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getIfTrue() {
+                return ifTrue;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetIfTrue(Term newIfTrue, NotificationChain msgs) {
+                Term oldIfTrue = ifTrue;
+                ifTrue = newIfTrue;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IF_THEN_ELSE__IF_TRUE, oldIfTrue, newIfTrue);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setIfTrue(Term newIfTrue) {
+                if (newIfTrue != ifTrue) {
+                        NotificationChain msgs = null;
+                        if (ifTrue != null)
+                                msgs = ((InternalEObject)ifTrue).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IF_THEN_ELSE__IF_TRUE, null, msgs);
+                        if (newIfTrue != null)
+                                msgs = ((InternalEObject)newIfTrue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IF_THEN_ELSE__IF_TRUE, null, msgs);
+                        msgs = basicSetIfTrue(newIfTrue, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IF_THEN_ELSE__IF_TRUE, newIfTrue, newIfTrue));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getIfFalse() {
+                return ifFalse;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetIfFalse(Term newIfFalse, NotificationChain msgs) {
+                Term oldIfFalse = ifFalse;
+                ifFalse = newIfFalse;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IF_THEN_ELSE__IF_FALSE, oldIfFalse, newIfFalse);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setIfFalse(Term newIfFalse) {
+                if (newIfFalse != ifFalse) {
+                        NotificationChain msgs = null;
+                        if (ifFalse != null)
+                                msgs = ((InternalEObject)ifFalse).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IF_THEN_ELSE__IF_FALSE, null, msgs);
+                        if (newIfFalse != null)
+                                msgs = ((InternalEObject)newIfFalse).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IF_THEN_ELSE__IF_FALSE, null, msgs);
+                        msgs = basicSetIfFalse(newIfFalse, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IF_THEN_ELSE__IF_FALSE, newIfFalse, newIfFalse));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IF_THEN_ELSE__CONDITION:
+                                return basicSetCondition(null, msgs);
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_TRUE:
+                                return basicSetIfTrue(null, msgs);
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_FALSE:
+                                return basicSetIfFalse(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IF_THEN_ELSE__CONDITION:
+                                return getCondition();
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_TRUE:
+                                return getIfTrue();
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_FALSE:
+                                return getIfFalse();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IF_THEN_ELSE__CONDITION:
+                                setCondition((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_TRUE:
+                                setIfTrue((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_FALSE:
+                                setIfFalse((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IF_THEN_ELSE__CONDITION:
+                                setCondition((Term)null);
+                                return;
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_TRUE:
+                                setIfTrue((Term)null);
+                                return;
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_FALSE:
+                                setIfFalse((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IF_THEN_ELSE__CONDITION:
+                                return condition != null;
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_TRUE:
+                                return ifTrue != null;
+                        case LogiclanguagePackage.IF_THEN_ELSE__IF_FALSE:
+                                return ifFalse != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //IfThenElseImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IffImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IffImpl.java
new file mode 100644
index 00000000..52c80e4a
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IffImpl.java
@@ -0,0 +1,241 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Iff;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Iff</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IffImpl#getLeftOperand <em>Left Operand</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IffImpl#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IffImpl extends BoolOperationImpl implements Iff {
+        /**
+         * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLeftOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term leftOperand;
+        /**
+         * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRightOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term rightOperand;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected IffImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.IFF;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getLeftOperand() {
+                return leftOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) {
+                Term oldLeftOperand = leftOperand;
+                leftOperand = newLeftOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IFF__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLeftOperand(Term newLeftOperand) {
+                if (newLeftOperand != leftOperand) {
+                        NotificationChain msgs = null;
+                        if (leftOperand != null)
+                                msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IFF__LEFT_OPERAND, null, msgs);
+                        if (newLeftOperand != null)
+                                msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IFF__LEFT_OPERAND, null, msgs);
+                        msgs = basicSetLeftOperand(newLeftOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IFF__LEFT_OPERAND, newLeftOperand, newLeftOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getRightOperand() {
+                return rightOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) {
+                Term oldRightOperand = rightOperand;
+                rightOperand = newRightOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IFF__RIGHT_OPERAND, oldRightOperand, newRightOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRightOperand(Term newRightOperand) {
+                if (newRightOperand != rightOperand) {
+                        NotificationChain msgs = null;
+                        if (rightOperand != null)
+                                msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IFF__RIGHT_OPERAND, null, msgs);
+                        if (newRightOperand != null)
+                                msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IFF__RIGHT_OPERAND, null, msgs);
+                        msgs = basicSetRightOperand(newRightOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IFF__RIGHT_OPERAND, newRightOperand, newRightOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IFF__LEFT_OPERAND:
+                                return basicSetLeftOperand(null, msgs);
+                        case LogiclanguagePackage.IFF__RIGHT_OPERAND:
+                                return basicSetRightOperand(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IFF__LEFT_OPERAND:
+                                return getLeftOperand();
+                        case LogiclanguagePackage.IFF__RIGHT_OPERAND:
+                                return getRightOperand();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IFF__LEFT_OPERAND:
+                                setLeftOperand((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.IFF__RIGHT_OPERAND:
+                                setRightOperand((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IFF__LEFT_OPERAND:
+                                setLeftOperand((Term)null);
+                                return;
+                        case LogiclanguagePackage.IFF__RIGHT_OPERAND:
+                                setRightOperand((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IFF__LEFT_OPERAND:
+                                return leftOperand != null;
+                        case LogiclanguagePackage.IFF__RIGHT_OPERAND:
+                                return rightOperand != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //IffImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ImplImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ImplImpl.java
new file mode 100644
index 00000000..af915e5d
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ImplImpl.java
@@ -0,0 +1,241 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Impl</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ImplImpl#getLeftOperand <em>Left Operand</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.ImplImpl#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class ImplImpl extends BoolOperationImpl implements Impl {
+        /**
+         * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLeftOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term leftOperand;
+        /**
+         * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRightOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term rightOperand;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ImplImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.IMPL;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getLeftOperand() {
+                return leftOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) {
+                Term oldLeftOperand = leftOperand;
+                leftOperand = newLeftOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IMPL__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLeftOperand(Term newLeftOperand) {
+                if (newLeftOperand != leftOperand) {
+                        NotificationChain msgs = null;
+                        if (leftOperand != null)
+                                msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IMPL__LEFT_OPERAND, null, msgs);
+                        if (newLeftOperand != null)
+                                msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IMPL__LEFT_OPERAND, null, msgs);
+                        msgs = basicSetLeftOperand(newLeftOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IMPL__LEFT_OPERAND, newLeftOperand, newLeftOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getRightOperand() {
+                return rightOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) {
+                Term oldRightOperand = rightOperand;
+                rightOperand = newRightOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IMPL__RIGHT_OPERAND, oldRightOperand, newRightOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRightOperand(Term newRightOperand) {
+                if (newRightOperand != rightOperand) {
+                        NotificationChain msgs = null;
+                        if (rightOperand != null)
+                                msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IMPL__RIGHT_OPERAND, null, msgs);
+                        if (newRightOperand != null)
+                                msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.IMPL__RIGHT_OPERAND, null, msgs);
+                        msgs = basicSetRightOperand(newRightOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.IMPL__RIGHT_OPERAND, newRightOperand, newRightOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IMPL__LEFT_OPERAND:
+                                return basicSetLeftOperand(null, msgs);
+                        case LogiclanguagePackage.IMPL__RIGHT_OPERAND:
+                                return basicSetRightOperand(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IMPL__LEFT_OPERAND:
+                                return getLeftOperand();
+                        case LogiclanguagePackage.IMPL__RIGHT_OPERAND:
+                                return getRightOperand();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IMPL__LEFT_OPERAND:
+                                setLeftOperand((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.IMPL__RIGHT_OPERAND:
+                                setRightOperand((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IMPL__LEFT_OPERAND:
+                                setLeftOperand((Term)null);
+                                return;
+                        case LogiclanguagePackage.IMPL__RIGHT_OPERAND:
+                                setRightOperand((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.IMPL__LEFT_OPERAND:
+                                return leftOperand != null;
+                        case LogiclanguagePackage.IMPL__RIGHT_OPERAND:
+                                return rightOperand != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //ImplImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/InstanceOfImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/InstanceOfImpl.java
new file mode 100644
index 00000000..9d36b076
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/InstanceOfImpl.java
@@ -0,0 +1,242 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.InstanceOf;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Instance Of</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.InstanceOfImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.InstanceOfImpl#getRange <em>Range</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class InstanceOfImpl extends TermImpl implements InstanceOf {
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected Term value;
+        /**
+         * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRange()
+         * @generated
+         * @ordered
+         */
+        protected TypeReference range;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected InstanceOfImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.INSTANCE_OF;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getValue() {
+                return value;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetValue(Term newValue, NotificationChain msgs) {
+                Term oldValue = value;
+                value = newValue;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INSTANCE_OF__VALUE, oldValue, newValue);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(Term newValue) {
+                if (newValue != value) {
+                        NotificationChain msgs = null;
+                        if (value != null)
+                                msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INSTANCE_OF__VALUE, null, msgs);
+                        if (newValue != null)
+                                msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INSTANCE_OF__VALUE, null, msgs);
+                        msgs = basicSetValue(newValue, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INSTANCE_OF__VALUE, newValue, newValue));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeReference getRange() {
+                return range;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRange(TypeReference newRange, NotificationChain msgs) {
+                TypeReference oldRange = range;
+                range = newRange;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INSTANCE_OF__RANGE, oldRange, newRange);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRange(TypeReference newRange) {
+                if (newRange != range) {
+                        NotificationChain msgs = null;
+                        if (range != null)
+                                msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INSTANCE_OF__RANGE, null, msgs);
+                        if (newRange != null)
+                                msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INSTANCE_OF__RANGE, null, msgs);
+                        msgs = basicSetRange(newRange, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INSTANCE_OF__RANGE, newRange, newRange));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INSTANCE_OF__VALUE:
+                                return basicSetValue(null, msgs);
+                        case LogiclanguagePackage.INSTANCE_OF__RANGE:
+                                return basicSetRange(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INSTANCE_OF__VALUE:
+                                return getValue();
+                        case LogiclanguagePackage.INSTANCE_OF__RANGE:
+                                return getRange();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INSTANCE_OF__VALUE:
+                                setValue((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.INSTANCE_OF__RANGE:
+                                setRange((TypeReference)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INSTANCE_OF__VALUE:
+                                setValue((Term)null);
+                                return;
+                        case LogiclanguagePackage.INSTANCE_OF__RANGE:
+                                setRange((TypeReference)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INSTANCE_OF__VALUE:
+                                return value != null;
+                        case LogiclanguagePackage.INSTANCE_OF__RANGE:
+                                return range != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //InstanceOfImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntLiteralImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntLiteralImpl.java
new file mode 100644
index 00000000..c0ec1001
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntLiteralImpl.java
@@ -0,0 +1,162 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntLiteral;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Int Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IntLiteralImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class IntLiteralImpl extends AtomicTermImpl implements IntLiteral {
+        /**
+         * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected static final int VALUE_EDEFAULT = 0;
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected int value = VALUE_EDEFAULT;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected IntLiteralImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.INT_LITERAL;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public int getValue() {
+                return value;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(int newValue) {
+                int oldValue = value;
+                value = newValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INT_LITERAL__VALUE, oldValue, value));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INT_LITERAL__VALUE:
+                                return getValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INT_LITERAL__VALUE:
+                                setValue((Integer)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INT_LITERAL__VALUE:
+                                setValue(VALUE_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INT_LITERAL__VALUE:
+                                return value != VALUE_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+                StringBuffer result = new StringBuffer(super.toString());
+                result.append(" (value: ");
+                result.append(value);
+                result.append(')');
+                return result.toString();
+        }
+} //IntLiteralImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntOperationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntOperationImpl.java
new file mode 100644
index 00000000..dab1f9ec
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntOperationImpl.java
@@ -0,0 +1,241 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Int Operation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IntOperationImpl#getLeftOperand <em>Left Operand</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.IntOperationImpl#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class IntOperationImpl extends TermImpl implements IntOperation {
+        /**
+         * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLeftOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term leftOperand;
+        /**
+         * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRightOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term rightOperand;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected IntOperationImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.INT_OPERATION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getLeftOperand() {
+                return leftOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) {
+                Term oldLeftOperand = leftOperand;
+                leftOperand = newLeftOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLeftOperand(Term newLeftOperand) {
+                if (newLeftOperand != leftOperand) {
+                        NotificationChain msgs = null;
+                        if (leftOperand != null)
+                                msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND, null, msgs);
+                        if (newLeftOperand != null)
+                                msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND, null, msgs);
+                        msgs = basicSetLeftOperand(newLeftOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND, newLeftOperand, newLeftOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getRightOperand() {
+                return rightOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) {
+                Term oldRightOperand = rightOperand;
+                rightOperand = newRightOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND, oldRightOperand, newRightOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRightOperand(Term newRightOperand) {
+                if (newRightOperand != rightOperand) {
+                        NotificationChain msgs = null;
+                        if (rightOperand != null)
+                                msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND, null, msgs);
+                        if (newRightOperand != null)
+                                msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND, null, msgs);
+                        msgs = basicSetRightOperand(newRightOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND, newRightOperand, newRightOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND:
+                                return basicSetLeftOperand(null, msgs);
+                        case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND:
+                                return basicSetRightOperand(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND:
+                                return getLeftOperand();
+                        case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND:
+                                return getRightOperand();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND:
+                                setLeftOperand((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND:
+                                setRightOperand((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND:
+                                setLeftOperand((Term)null);
+                                return;
+                        case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND:
+                                setRightOperand((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.INT_OPERATION__LEFT_OPERAND:
+                                return leftOperand != null;
+                        case LogiclanguagePackage.INT_OPERATION__RIGHT_OPERAND:
+                                return rightOperand != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //IntOperationImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntTypeReferenceImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntTypeReferenceImpl.java
new file mode 100644
index 00000000..fc40a3ae
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/IntTypeReferenceImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntTypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Int Type Reference</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class IntTypeReferenceImpl extends PrimitiveTypeReferenceImpl implements IntTypeReference {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected IntTypeReferenceImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.INT_TYPE_REFERENCE;
+        }
+} //IntTypeReferenceImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessOrEqualThanImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessOrEqualThanImpl.java
new file mode 100644
index 00000000..4213ad37
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessOrEqualThanImpl.java
@@ -0,0 +1,241 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LessOrEqualThan;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Less Or Equal Than</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LessOrEqualThanImpl#getLeftOperand <em>Left Operand</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LessOrEqualThanImpl#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LessOrEqualThanImpl extends PrimitiveRelationImpl implements LessOrEqualThan {
+        /**
+         * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLeftOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term leftOperand;
+        /**
+         * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRightOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term rightOperand;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected LessOrEqualThanImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.LESS_OR_EQUAL_THAN;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getLeftOperand() {
+                return leftOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) {
+                Term oldLeftOperand = leftOperand;
+                leftOperand = newLeftOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.LESS_OR_EQUAL_THAN__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLeftOperand(Term newLeftOperand) {
+                if (newLeftOperand != leftOperand) {
+                        NotificationChain msgs = null;
+                        if (leftOperand != null)
+                                msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.LESS_OR_EQUAL_THAN__LEFT_OPERAND, null, msgs);
+                        if (newLeftOperand != null)
+                                msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.LESS_OR_EQUAL_THAN__LEFT_OPERAND, null, msgs);
+                        msgs = basicSetLeftOperand(newLeftOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.LESS_OR_EQUAL_THAN__LEFT_OPERAND, newLeftOperand, newLeftOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getRightOperand() {
+                return rightOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) {
+                Term oldRightOperand = rightOperand;
+                rightOperand = newRightOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.LESS_OR_EQUAL_THAN__RIGHT_OPERAND, oldRightOperand, newRightOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRightOperand(Term newRightOperand) {
+                if (newRightOperand != rightOperand) {
+                        NotificationChain msgs = null;
+                        if (rightOperand != null)
+                                msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.LESS_OR_EQUAL_THAN__RIGHT_OPERAND, null, msgs);
+                        if (newRightOperand != null)
+                                msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.LESS_OR_EQUAL_THAN__RIGHT_OPERAND, null, msgs);
+                        msgs = basicSetRightOperand(newRightOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.LESS_OR_EQUAL_THAN__RIGHT_OPERAND, newRightOperand, newRightOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__LEFT_OPERAND:
+                                return basicSetLeftOperand(null, msgs);
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                return basicSetRightOperand(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__LEFT_OPERAND:
+                                return getLeftOperand();
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                return getRightOperand();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__LEFT_OPERAND:
+                                setLeftOperand((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                setRightOperand((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__LEFT_OPERAND:
+                                setLeftOperand((Term)null);
+                                return;
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                setRightOperand((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__LEFT_OPERAND:
+                                return leftOperand != null;
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                return rightOperand != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //LessOrEqualThanImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessThanImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessThanImpl.java
new file mode 100644
index 00000000..8a36abdd
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LessThanImpl.java
@@ -0,0 +1,241 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LessThan;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Less Than</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LessThanImpl#getLeftOperand <em>Left Operand</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.LessThanImpl#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class LessThanImpl extends PrimitiveRelationImpl implements LessThan {
+        /**
+         * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLeftOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term leftOperand;
+        /**
+         * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRightOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term rightOperand;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected LessThanImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.LESS_THAN;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getLeftOperand() {
+                return leftOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) {
+                Term oldLeftOperand = leftOperand;
+                leftOperand = newLeftOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.LESS_THAN__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLeftOperand(Term newLeftOperand) {
+                if (newLeftOperand != leftOperand) {
+                        NotificationChain msgs = null;
+                        if (leftOperand != null)
+                                msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.LESS_THAN__LEFT_OPERAND, null, msgs);
+                        if (newLeftOperand != null)
+                                msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.LESS_THAN__LEFT_OPERAND, null, msgs);
+                        msgs = basicSetLeftOperand(newLeftOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.LESS_THAN__LEFT_OPERAND, newLeftOperand, newLeftOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getRightOperand() {
+                return rightOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) {
+                Term oldRightOperand = rightOperand;
+                rightOperand = newRightOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.LESS_THAN__RIGHT_OPERAND, oldRightOperand, newRightOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRightOperand(Term newRightOperand) {
+                if (newRightOperand != rightOperand) {
+                        NotificationChain msgs = null;
+                        if (rightOperand != null)
+                                msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.LESS_THAN__RIGHT_OPERAND, null, msgs);
+                        if (newRightOperand != null)
+                                msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.LESS_THAN__RIGHT_OPERAND, null, msgs);
+                        msgs = basicSetRightOperand(newRightOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.LESS_THAN__RIGHT_OPERAND, newRightOperand, newRightOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_THAN__LEFT_OPERAND:
+                                return basicSetLeftOperand(null, msgs);
+                        case LogiclanguagePackage.LESS_THAN__RIGHT_OPERAND:
+                                return basicSetRightOperand(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_THAN__LEFT_OPERAND:
+                                return getLeftOperand();
+                        case LogiclanguagePackage.LESS_THAN__RIGHT_OPERAND:
+                                return getRightOperand();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_THAN__LEFT_OPERAND:
+                                setLeftOperand((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.LESS_THAN__RIGHT_OPERAND:
+                                setRightOperand((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_THAN__LEFT_OPERAND:
+                                setLeftOperand((Term)null);
+                                return;
+                        case LogiclanguagePackage.LESS_THAN__RIGHT_OPERAND:
+                                setRightOperand((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.LESS_THAN__LEFT_OPERAND:
+                                return leftOperand != null;
+                        case LogiclanguagePackage.LESS_THAN__RIGHT_OPERAND:
+                                return rightOperand != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //LessThanImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java
new file mode 100644
index 00000000..876947e4
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguageFactoryImpl.java
@@ -0,0 +1,524 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.*;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class LogiclanguageFactoryImpl extends EFactoryImpl implements LogiclanguageFactory {
+        /**
+         * Creates the default factory implementation.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static LogiclanguageFactory init() {
+                try {
+                        LogiclanguageFactory theLogiclanguageFactory = (LogiclanguageFactory)EPackage.Registry.INSTANCE.getEFactory(LogiclanguagePackage.eNS_URI);
+                        if (theLogiclanguageFactory != null) {
+                                return theLogiclanguageFactory;
+                        }
+                }
+                catch (Exception exception) {
+                        EcorePlugin.INSTANCE.log(exception);
+                }
+                return new LogiclanguageFactoryImpl();
+        }
+        /**
+         * Creates an instance of the factory.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LogiclanguageFactoryImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EObject create(EClass eClass) {
+                switch (eClass.getClassifierID()) {
+                        case LogiclanguagePackage.DEFINED_ELEMENT: return createDefinedElement();
+                        case LogiclanguagePackage.TYPE_DEFINITION: return createTypeDefinition();
+                        case LogiclanguagePackage.COMPLEX_TYPE_REFERENCE: return createComplexTypeReference();
+                        case LogiclanguagePackage.INT_TYPE_REFERENCE: return createIntTypeReference();
+                        case LogiclanguagePackage.BOOL_TYPE_REFERENCE: return createBoolTypeReference();
+                        case LogiclanguagePackage.REAL_TYPE_REFERENCE: return createRealTypeReference();
+                        case LogiclanguagePackage.SYMBOLIC_VALUE: return createSymbolicValue();
+                        case LogiclanguagePackage.INT_LITERAL: return createIntLiteral();
+                        case LogiclanguagePackage.BOOL_LITERAL: return createBoolLiteral();
+                        case LogiclanguagePackage.REAL_LITERAL: return createRealLiteral();
+                        case LogiclanguagePackage.VARIABLE: return createVariable();
+                        case LogiclanguagePackage.EXISTS: return createExists();
+                        case LogiclanguagePackage.FORALL: return createForall();
+                        case LogiclanguagePackage.AND: return createAnd();
+                        case LogiclanguagePackage.OR: return createOr();
+                        case LogiclanguagePackage.IMPL: return createImpl();
+                        case LogiclanguagePackage.NOT: return createNot();
+                        case LogiclanguagePackage.IFF: return createIff();
+                        case LogiclanguagePackage.EQUALS: return createEquals();
+                        case LogiclanguagePackage.DISTINCT: return createDistinct();
+                        case LogiclanguagePackage.LESS_THAN: return createLessThan();
+                        case LogiclanguagePackage.MORE_THAN: return createMoreThan();
+                        case LogiclanguagePackage.LESS_OR_EQUAL_THAN: return createLessOrEqualThan();
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN: return createMoreOrEqualThan();
+                        case LogiclanguagePackage.PLUS: return createPlus();
+                        case LogiclanguagePackage.MINUS: return createMinus();
+                        case LogiclanguagePackage.MULTIPLY: return createMultiply();
+                        case LogiclanguagePackage.DIVISON: return createDivison();
+                        case LogiclanguagePackage.MOD: return createMod();
+                        case LogiclanguagePackage.ASSERTION: return createAssertion();
+                        case LogiclanguagePackage.CONSTANT_DEFINITION: return createConstantDefinition();
+                        case LogiclanguagePackage.RELATION_DEFINITION: return createRelationDefinition();
+                        case LogiclanguagePackage.FUNCTION_DEFINITION: return createFunctionDefinition();
+                        case LogiclanguagePackage.IF_THEN_ELSE: return createIfThenElse();
+                        case LogiclanguagePackage.CONSTANT_DECLARATION: return createConstantDeclaration();
+                        case LogiclanguagePackage.RELATION_DECLARATION: return createRelationDeclaration();
+                        case LogiclanguagePackage.FUNCTION_DECLARATION: return createFunctionDeclaration();
+                        case LogiclanguagePackage.TYPE_DECLARATION: return createTypeDeclaration();
+                        case LogiclanguagePackage.UNKNOWN_BECAUSE_UNINTERPRETED: return createUnknownBecauseUninterpreted();
+                        case LogiclanguagePackage.INSTANCE_OF: return createInstanceOf();
+                        default:
+                                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+                }
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public DefinedElement createDefinedElement() {
+                DefinedElementImpl definedElement = new DefinedElementImpl();
+                return definedElement;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeDefinition createTypeDefinition() {
+                TypeDefinitionImpl typeDefinition = new TypeDefinitionImpl();
+                return typeDefinition;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ComplexTypeReference createComplexTypeReference() {
+                ComplexTypeReferenceImpl complexTypeReference = new ComplexTypeReferenceImpl();
+                return complexTypeReference;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public IntTypeReference createIntTypeReference() {
+                IntTypeReferenceImpl intTypeReference = new IntTypeReferenceImpl();
+                return intTypeReference;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public BoolTypeReference createBoolTypeReference() {
+                BoolTypeReferenceImpl boolTypeReference = new BoolTypeReferenceImpl();
+                return boolTypeReference;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public RealTypeReference createRealTypeReference() {
+                RealTypeReferenceImpl realTypeReference = new RealTypeReferenceImpl();
+                return realTypeReference;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public SymbolicValue createSymbolicValue() {
+                SymbolicValueImpl symbolicValue = new SymbolicValueImpl();
+                return symbolicValue;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public IntLiteral createIntLiteral() {
+                IntLiteralImpl intLiteral = new IntLiteralImpl();
+                return intLiteral;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public BoolLiteral createBoolLiteral() {
+                BoolLiteralImpl boolLiteral = new BoolLiteralImpl();
+                return boolLiteral;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public RealLiteral createRealLiteral() {
+                RealLiteralImpl realLiteral = new RealLiteralImpl();
+                return realLiteral;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Variable createVariable() {
+                VariableImpl variable = new VariableImpl();
+                return variable;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Exists createExists() {
+                ExistsImpl exists = new ExistsImpl();
+                return exists;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Forall createForall() {
+                ForallImpl forall = new ForallImpl();
+                return forall;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public And createAnd() {
+                AndImpl and = new AndImpl();
+                return and;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Or createOr() {
+                OrImpl or = new OrImpl();
+                return or;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Impl createImpl() {
+                ImplImpl impl = new ImplImpl();
+                return impl;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Not createNot() {
+                NotImpl not = new NotImpl();
+                return not;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Iff createIff() {
+                IffImpl iff = new IffImpl();
+                return iff;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Equals createEquals() {
+                EqualsImpl equals = new EqualsImpl();
+                return equals;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Distinct createDistinct() {
+                DistinctImpl distinct = new DistinctImpl();
+                return distinct;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LessThan createLessThan() {
+                LessThanImpl lessThan = new LessThanImpl();
+                return lessThan;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public MoreThan createMoreThan() {
+                MoreThanImpl moreThan = new MoreThanImpl();
+                return moreThan;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LessOrEqualThan createLessOrEqualThan() {
+                LessOrEqualThanImpl lessOrEqualThan = new LessOrEqualThanImpl();
+                return lessOrEqualThan;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public MoreOrEqualThan createMoreOrEqualThan() {
+                MoreOrEqualThanImpl moreOrEqualThan = new MoreOrEqualThanImpl();
+                return moreOrEqualThan;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Plus createPlus() {
+                PlusImpl plus = new PlusImpl();
+                return plus;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Minus createMinus() {
+                MinusImpl minus = new MinusImpl();
+                return minus;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Multiply createMultiply() {
+                MultiplyImpl multiply = new MultiplyImpl();
+                return multiply;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Divison createDivison() {
+                DivisonImpl divison = new DivisonImpl();
+                return divison;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Mod createMod() {
+                ModImpl mod = new ModImpl();
+                return mod;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Assertion createAssertion() {
+                AssertionImpl assertion = new AssertionImpl();
+                return assertion;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ConstantDefinition createConstantDefinition() {
+                ConstantDefinitionImpl constantDefinition = new ConstantDefinitionImpl();
+                return constantDefinition;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public RelationDefinition createRelationDefinition() {
+                RelationDefinitionImpl relationDefinition = new RelationDefinitionImpl();
+                return relationDefinition;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public FunctionDefinition createFunctionDefinition() {
+                FunctionDefinitionImpl functionDefinition = new FunctionDefinitionImpl();
+                return functionDefinition;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public IfThenElse createIfThenElse() {
+                IfThenElseImpl ifThenElse = new IfThenElseImpl();
+                return ifThenElse;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public ConstantDeclaration createConstantDeclaration() {
+                ConstantDeclarationImpl constantDeclaration = new ConstantDeclarationImpl();
+                return constantDeclaration;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public RelationDeclaration createRelationDeclaration() {
+                RelationDeclarationImpl relationDeclaration = new RelationDeclarationImpl();
+                return relationDeclaration;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public FunctionDeclaration createFunctionDeclaration() {
+                FunctionDeclarationImpl functionDeclaration = new FunctionDeclarationImpl();
+                return functionDeclaration;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeDeclaration createTypeDeclaration() {
+                TypeDeclarationImpl typeDeclaration = new TypeDeclarationImpl();
+                return typeDeclaration;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public UnknownBecauseUninterpreted createUnknownBecauseUninterpreted() {
+                UnknownBecauseUninterpretedImpl unknownBecauseUninterpreted = new UnknownBecauseUninterpretedImpl();
+                return unknownBecauseUninterpreted;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public InstanceOf createInstanceOf() {
+                InstanceOfImpl instanceOf = new InstanceOfImpl();
+                return instanceOf;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LogiclanguagePackage getLogiclanguagePackage() {
+                return (LogiclanguagePackage)getEPackage();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @deprecated
+         * @generated
+         */
+        @Deprecated
+        public static LogiclanguagePackage getPackage() {
+                return LogiclanguagePackage.eINSTANCE;
+        }
+} //LogiclanguageFactoryImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
new file mode 100644
index 00000000..b73d679d
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/LogiclanguagePackageImpl.java
@@ -0,0 +1,2032 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.And;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Assertion;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.AtomicTerm;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolLiteral;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolOperation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.BoolTypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ComplexTypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Constant;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.ConstantDefinition;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Distinct;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Divison;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Equals;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Exists;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Forall;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Function;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.FunctionDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.FunctionDefinition;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IfThenElse;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Iff;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.InstanceOf;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntLiteral;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntOperation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.IntTypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LessOrEqualThan;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LessThan;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguageFactory;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Minus;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Mod;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.MoreOrEqualThan;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.MoreThan;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Multiply;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Not;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Or;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Plus;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.PrimitiveRelation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.PrimitiveTypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.QuantifiedExpression;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealLiteral;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealTypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TermDescription;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDescriptor;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.UnknownBecauseUninterpreted;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.impl.LogicproblemPackageImpl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicresultPackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.impl.LogicresultPackageImpl;
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class LogiclanguagePackageImpl extends EPackageImpl implements LogiclanguagePackage {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass typeEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass definedElementEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass typeDefinitionEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass typeReferenceEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass complexTypeReferenceEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass primitiveTypeReferenceEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass intTypeReferenceEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass boolTypeReferenceEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass realTypeReferenceEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass functionEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass termEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass symbolicDeclarationEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass symbolicValueEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass atomicTermEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass intLiteralEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass boolLiteralEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass realLiteralEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass variableEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass quantifiedExpressionEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass existsEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass forallEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass boolOperationEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass andEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass orEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass implEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass notEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass iffEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass primitiveRelationEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass equalsEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass distinctEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass lessThanEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass moreThanEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass lessOrEqualThanEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass moreOrEqualThanEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass intOperationEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass plusEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass minusEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass multiplyEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass divisonEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass modEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass typeDescriptorEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass termDescriptionEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass assertionEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass relationEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass constantEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass constantDefinitionEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass relationDefinitionEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass functionDefinitionEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass ifThenElseEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass constantDeclarationEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass relationDeclarationEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass functionDeclarationEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass typeDeclarationEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass unknownBecauseUninterpretedEClass = null;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass instanceOfEClass = null;
+        /**
+         * Creates an instance of the model <b>Package</b>, registered with
+         * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+         * package URI value.
+         * <p>Note: the correct way to create the package is via the static
+         * factory method {@link #init init()}, which also performs
+         * initialization of the package, or returns the registered package,
+         * if one already exists.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.eclipse.emf.ecore.EPackage.Registry
+         * @see hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage#eNS_URI
+         * @see #init()
+         * @generated
+         */
+        private LogiclanguagePackageImpl() {
+                super(eNS_URI, LogiclanguageFactory.eINSTANCE);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private static boolean isInited = false;
+        /**
+         * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+         * 
+         * <p>This method is used to initialize {@link LogiclanguagePackage#eINSTANCE} when that field is accessed.
+         * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #eNS_URI
+         * @see #createPackageContents()
+         * @see #initializePackageContents()
+         * @generated
+         */
+        public static LogiclanguagePackage init() {
+                if (isInited) return (LogiclanguagePackage)EPackage.Registry.INSTANCE.getEPackage(LogiclanguagePackage.eNS_URI);
+                // Obtain or create and register package
+                LogiclanguagePackageImpl theLogiclanguagePackage = (LogiclanguagePackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof LogiclanguagePackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new LogiclanguagePackageImpl());
+                isInited = true;
+                // Obtain or create and register interdependencies
+                LogicproblemPackageImpl theLogicproblemPackage = (LogicproblemPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI) instanceof LogicproblemPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI) : LogicproblemPackage.eINSTANCE);
+                LogicresultPackageImpl theLogicresultPackage = (LogicresultPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI) instanceof LogicresultPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(LogicresultPackage.eNS_URI) : LogicresultPackage.eINSTANCE);
+                // Create package meta-data objects
+                theLogiclanguagePackage.createPackageContents();
+                theLogicproblemPackage.createPackageContents();
+                theLogicresultPackage.createPackageContents();
+                // Initialize created meta-data
+                theLogiclanguagePackage.initializePackageContents();
+                theLogicproblemPackage.initializePackageContents();
+                theLogicresultPackage.initializePackageContents();
+                // Mark meta-data to indicate it can't be changed
+                theLogiclanguagePackage.freeze();
+  
+                // Update the registry and return the package
+                EPackage.Registry.INSTANCE.put(LogiclanguagePackage.eNS_URI, theLogiclanguagePackage);
+                return theLogiclanguagePackage;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getType() {
+                return typeEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getType_Name() {
+                return (EAttribute)typeEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getType_Subtypes() {
+                return (EReference)typeEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getType_Supertypes() {
+                return (EReference)typeEClass.getEStructuralFeatures().get(2);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getType_IsAbstract() {
+                return (EAttribute)typeEClass.getEStructuralFeatures().get(3);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getDefinedElement() {
+                return definedElementEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getDefinedElement_DefinedInType() {
+                return (EReference)definedElementEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTypeDefinition() {
+                return typeDefinitionEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getTypeDefinition_Elements() {
+                return (EReference)typeDefinitionEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getTypeDefinition_Defines() {
+                return (EReference)typeDefinitionEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTypeReference() {
+                return typeReferenceEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getComplexTypeReference() {
+                return complexTypeReferenceEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getComplexTypeReference_Referred() {
+                return (EReference)complexTypeReferenceEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getPrimitiveTypeReference() {
+                return primitiveTypeReferenceEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getIntTypeReference() {
+                return intTypeReferenceEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getBoolTypeReference() {
+                return boolTypeReferenceEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRealTypeReference() {
+                return realTypeReferenceEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getFunction() {
+                return functionEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunction_Range() {
+                return (EReference)functionEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunction_Parameters() {
+                return (EReference)functionEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunction_Annotations() {
+                return (EReference)functionEClass.getEStructuralFeatures().get(2);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTerm() {
+                return termEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getSymbolicDeclaration() {
+                return symbolicDeclarationEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getSymbolicDeclaration_Name() {
+                return (EAttribute)symbolicDeclarationEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getSymbolicValue() {
+                return symbolicValueEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getSymbolicValue_SymbolicReference() {
+                return (EReference)symbolicValueEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getSymbolicValue_ParameterSubstitutions() {
+                return (EReference)symbolicValueEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAtomicTerm() {
+                return atomicTermEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getIntLiteral() {
+                return intLiteralEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getIntLiteral_Value() {
+                return (EAttribute)intLiteralEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getBoolLiteral() {
+                return boolLiteralEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getBoolLiteral_Value() {
+                return (EAttribute)boolLiteralEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRealLiteral() {
+                return realLiteralEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getRealLiteral_Value() {
+                return (EAttribute)realLiteralEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getVariable() {
+                return variableEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getVariable_Range() {
+                return (EReference)variableEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getQuantifiedExpression() {
+                return quantifiedExpressionEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getQuantifiedExpression_QuantifiedVariables() {
+                return (EReference)quantifiedExpressionEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getQuantifiedExpression_Expression() {
+                return (EReference)quantifiedExpressionEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getExists() {
+                return existsEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getForall() {
+                return forallEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getBoolOperation() {
+                return boolOperationEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAnd() {
+                return andEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAnd_Operands() {
+                return (EReference)andEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getOr() {
+                return orEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getOr_Operands() {
+                return (EReference)orEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getImpl() {
+                return implEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getImpl_LeftOperand() {
+                return (EReference)implEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getImpl_RightOperand() {
+                return (EReference)implEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getNot() {
+                return notEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getNot_Operand() {
+                return (EReference)notEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getIff() {
+                return iffEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getIff_LeftOperand() {
+                return (EReference)iffEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getIff_RightOperand() {
+                return (EReference)iffEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getPrimitiveRelation() {
+                return primitiveRelationEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getEquals() {
+                return equalsEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getEquals_LeftOperand() {
+                return (EReference)equalsEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getEquals_RightOperand() {
+                return (EReference)equalsEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getDistinct() {
+                return distinctEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getDistinct_Operands() {
+                return (EReference)distinctEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getLessThan() {
+                return lessThanEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getLessThan_LeftOperand() {
+                return (EReference)lessThanEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getLessThan_RightOperand() {
+                return (EReference)lessThanEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getMoreThan() {
+                return moreThanEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getMoreThan_LeftOperand() {
+                return (EReference)moreThanEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getMoreThan_RightOperand() {
+                return (EReference)moreThanEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getLessOrEqualThan() {
+                return lessOrEqualThanEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getLessOrEqualThan_LeftOperand() {
+                return (EReference)lessOrEqualThanEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getLessOrEqualThan_RightOperand() {
+                return (EReference)lessOrEqualThanEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getMoreOrEqualThan() {
+                return moreOrEqualThanEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getMoreOrEqualThan_LeftOperand() {
+                return (EReference)moreOrEqualThanEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getMoreOrEqualThan_RightOperand() {
+                return (EReference)moreOrEqualThanEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getIntOperation() {
+                return intOperationEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getIntOperation_LeftOperand() {
+                return (EReference)intOperationEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getIntOperation_RightOperand() {
+                return (EReference)intOperationEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getPlus() {
+                return plusEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getMinus() {
+                return minusEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getMultiply() {
+                return multiplyEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getDivison() {
+                return divisonEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getMod() {
+                return modEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTypeDescriptor() {
+                return typeDescriptorEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTermDescription() {
+                return termDescriptionEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getAssertion() {
+                return assertionEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAssertion_Value() {
+                return (EReference)assertionEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EAttribute getAssertion_Name() {
+                return (EAttribute)assertionEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getAssertion_Annotations() {
+                return (EReference)assertionEClass.getEStructuralFeatures().get(2);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRelation() {
+                return relationEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getRelation_Parameters() {
+                return (EReference)relationEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getRelation_Annotations() {
+                return (EReference)relationEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getConstant() {
+                return constantEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getConstant_Type() {
+                return (EReference)constantEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getConstant_Annotations() {
+                return (EReference)constantEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getConstantDefinition() {
+                return constantDefinitionEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getConstantDefinition_Value() {
+                return (EReference)constantDefinitionEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getConstantDefinition_Defines() {
+                return (EReference)constantDefinitionEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRelationDefinition() {
+                return relationDefinitionEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getRelationDefinition_Variables() {
+                return (EReference)relationDefinitionEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getRelationDefinition_Value() {
+                return (EReference)relationDefinitionEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getRelationDefinition_Defines() {
+                return (EReference)relationDefinitionEClass.getEStructuralFeatures().get(2);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getFunctionDefinition() {
+                return functionDefinitionEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunctionDefinition_Variable() {
+                return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunctionDefinition_Defines() {
+                return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getFunctionDefinition_Value() {
+                return (EReference)functionDefinitionEClass.getEStructuralFeatures().get(2);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getIfThenElse() {
+                return ifThenElseEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getIfThenElse_Condition() {
+                return (EReference)ifThenElseEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getIfThenElse_IfTrue() {
+                return (EReference)ifThenElseEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getIfThenElse_IfFalse() {
+                return (EReference)ifThenElseEClass.getEStructuralFeatures().get(2);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getConstantDeclaration() {
+                return constantDeclarationEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getRelationDeclaration() {
+                return relationDeclarationEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getFunctionDeclaration() {
+                return functionDeclarationEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getTypeDeclaration() {
+                return typeDeclarationEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getUnknownBecauseUninterpreted() {
+                return unknownBecauseUninterpretedEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EClass getInstanceOf() {
+                return instanceOfEClass;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getInstanceOf_Value() {
+                return (EReference)instanceOfEClass.getEStructuralFeatures().get(0);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EReference getInstanceOf_Range() {
+                return (EReference)instanceOfEClass.getEStructuralFeatures().get(1);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public LogiclanguageFactory getLogiclanguageFactory() {
+                return (LogiclanguageFactory)getEFactoryInstance();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isCreated = false;
+        /**
+         * Creates the meta-model objects for the package.  This method is
+         * guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void createPackageContents() {
+                if (isCreated) return;
+                isCreated = true;
+                // Create classes and their features
+                typeEClass = createEClass(TYPE);
+                createEAttribute(typeEClass, TYPE__NAME);
+                createEReference(typeEClass, TYPE__SUBTYPES);
+                createEReference(typeEClass, TYPE__SUPERTYPES);
+                createEAttribute(typeEClass, TYPE__IS_ABSTRACT);
+                definedElementEClass = createEClass(DEFINED_ELEMENT);
+                createEReference(definedElementEClass, DEFINED_ELEMENT__DEFINED_IN_TYPE);
+                typeDefinitionEClass = createEClass(TYPE_DEFINITION);
+                createEReference(typeDefinitionEClass, TYPE_DEFINITION__ELEMENTS);
+                createEReference(typeDefinitionEClass, TYPE_DEFINITION__DEFINES);
+                typeReferenceEClass = createEClass(TYPE_REFERENCE);
+                complexTypeReferenceEClass = createEClass(COMPLEX_TYPE_REFERENCE);
+                createEReference(complexTypeReferenceEClass, COMPLEX_TYPE_REFERENCE__REFERRED);
+                primitiveTypeReferenceEClass = createEClass(PRIMITIVE_TYPE_REFERENCE);
+                intTypeReferenceEClass = createEClass(INT_TYPE_REFERENCE);
+                boolTypeReferenceEClass = createEClass(BOOL_TYPE_REFERENCE);
+                realTypeReferenceEClass = createEClass(REAL_TYPE_REFERENCE);
+                functionEClass = createEClass(FUNCTION);
+                createEReference(functionEClass, FUNCTION__RANGE);
+                createEReference(functionEClass, FUNCTION__PARAMETERS);
+                createEReference(functionEClass, FUNCTION__ANNOTATIONS);
+                termEClass = createEClass(TERM);
+                symbolicDeclarationEClass = createEClass(SYMBOLIC_DECLARATION);
+                createEAttribute(symbolicDeclarationEClass, SYMBOLIC_DECLARATION__NAME);
+                symbolicValueEClass = createEClass(SYMBOLIC_VALUE);
+                createEReference(symbolicValueEClass, SYMBOLIC_VALUE__SYMBOLIC_REFERENCE);
+                createEReference(symbolicValueEClass, SYMBOLIC_VALUE__PARAMETER_SUBSTITUTIONS);
+                atomicTermEClass = createEClass(ATOMIC_TERM);
+                intLiteralEClass = createEClass(INT_LITERAL);
+                createEAttribute(intLiteralEClass, INT_LITERAL__VALUE);
+                boolLiteralEClass = createEClass(BOOL_LITERAL);
+                createEAttribute(boolLiteralEClass, BOOL_LITERAL__VALUE);
+                realLiteralEClass = createEClass(REAL_LITERAL);
+                createEAttribute(realLiteralEClass, REAL_LITERAL__VALUE);
+                variableEClass = createEClass(VARIABLE);
+                createEReference(variableEClass, VARIABLE__RANGE);
+                quantifiedExpressionEClass = createEClass(QUANTIFIED_EXPRESSION);
+                createEReference(quantifiedExpressionEClass, QUANTIFIED_EXPRESSION__QUANTIFIED_VARIABLES);
+                createEReference(quantifiedExpressionEClass, QUANTIFIED_EXPRESSION__EXPRESSION);
+                existsEClass = createEClass(EXISTS);
+                forallEClass = createEClass(FORALL);
+                boolOperationEClass = createEClass(BOOL_OPERATION);
+                andEClass = createEClass(AND);
+                createEReference(andEClass, AND__OPERANDS);
+                orEClass = createEClass(OR);
+                createEReference(orEClass, OR__OPERANDS);
+                implEClass = createEClass(IMPL);
+                createEReference(implEClass, IMPL__LEFT_OPERAND);
+                createEReference(implEClass, IMPL__RIGHT_OPERAND);
+                notEClass = createEClass(NOT);
+                createEReference(notEClass, NOT__OPERAND);
+                iffEClass = createEClass(IFF);
+                createEReference(iffEClass, IFF__LEFT_OPERAND);
+                createEReference(iffEClass, IFF__RIGHT_OPERAND);
+                primitiveRelationEClass = createEClass(PRIMITIVE_RELATION);
+                equalsEClass = createEClass(EQUALS);
+                createEReference(equalsEClass, EQUALS__LEFT_OPERAND);
+                createEReference(equalsEClass, EQUALS__RIGHT_OPERAND);
+                distinctEClass = createEClass(DISTINCT);
+                createEReference(distinctEClass, DISTINCT__OPERANDS);
+                lessThanEClass = createEClass(LESS_THAN);
+                createEReference(lessThanEClass, LESS_THAN__LEFT_OPERAND);
+                createEReference(lessThanEClass, LESS_THAN__RIGHT_OPERAND);
+                moreThanEClass = createEClass(MORE_THAN);
+                createEReference(moreThanEClass, MORE_THAN__LEFT_OPERAND);
+                createEReference(moreThanEClass, MORE_THAN__RIGHT_OPERAND);
+                lessOrEqualThanEClass = createEClass(LESS_OR_EQUAL_THAN);
+                createEReference(lessOrEqualThanEClass, LESS_OR_EQUAL_THAN__LEFT_OPERAND);
+                createEReference(lessOrEqualThanEClass, LESS_OR_EQUAL_THAN__RIGHT_OPERAND);
+                moreOrEqualThanEClass = createEClass(MORE_OR_EQUAL_THAN);
+                createEReference(moreOrEqualThanEClass, MORE_OR_EQUAL_THAN__LEFT_OPERAND);
+                createEReference(moreOrEqualThanEClass, MORE_OR_EQUAL_THAN__RIGHT_OPERAND);
+                intOperationEClass = createEClass(INT_OPERATION);
+                createEReference(intOperationEClass, INT_OPERATION__LEFT_OPERAND);
+                createEReference(intOperationEClass, INT_OPERATION__RIGHT_OPERAND);
+                plusEClass = createEClass(PLUS);
+                minusEClass = createEClass(MINUS);
+                multiplyEClass = createEClass(MULTIPLY);
+                divisonEClass = createEClass(DIVISON);
+                modEClass = createEClass(MOD);
+                typeDescriptorEClass = createEClass(TYPE_DESCRIPTOR);
+                termDescriptionEClass = createEClass(TERM_DESCRIPTION);
+                assertionEClass = createEClass(ASSERTION);
+                createEReference(assertionEClass, ASSERTION__VALUE);
+                createEAttribute(assertionEClass, ASSERTION__NAME);
+                createEReference(assertionEClass, ASSERTION__ANNOTATIONS);
+                relationEClass = createEClass(RELATION);
+                createEReference(relationEClass, RELATION__PARAMETERS);
+                createEReference(relationEClass, RELATION__ANNOTATIONS);
+                constantEClass = createEClass(CONSTANT);
+                createEReference(constantEClass, CONSTANT__TYPE);
+                createEReference(constantEClass, CONSTANT__ANNOTATIONS);
+                constantDefinitionEClass = createEClass(CONSTANT_DEFINITION);
+                createEReference(constantDefinitionEClass, CONSTANT_DEFINITION__VALUE);
+                createEReference(constantDefinitionEClass, CONSTANT_DEFINITION__DEFINES);
+                relationDefinitionEClass = createEClass(RELATION_DEFINITION);
+                createEReference(relationDefinitionEClass, RELATION_DEFINITION__VARIABLES);
+                createEReference(relationDefinitionEClass, RELATION_DEFINITION__VALUE);
+                createEReference(relationDefinitionEClass, RELATION_DEFINITION__DEFINES);
+                functionDefinitionEClass = createEClass(FUNCTION_DEFINITION);
+                createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__VARIABLE);
+                createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__DEFINES);
+                createEReference(functionDefinitionEClass, FUNCTION_DEFINITION__VALUE);
+                ifThenElseEClass = createEClass(IF_THEN_ELSE);
+                createEReference(ifThenElseEClass, IF_THEN_ELSE__CONDITION);
+                createEReference(ifThenElseEClass, IF_THEN_ELSE__IF_TRUE);
+                createEReference(ifThenElseEClass, IF_THEN_ELSE__IF_FALSE);
+                constantDeclarationEClass = createEClass(CONSTANT_DECLARATION);
+                relationDeclarationEClass = createEClass(RELATION_DECLARATION);
+                functionDeclarationEClass = createEClass(FUNCTION_DECLARATION);
+                typeDeclarationEClass = createEClass(TYPE_DECLARATION);
+                unknownBecauseUninterpretedEClass = createEClass(UNKNOWN_BECAUSE_UNINTERPRETED);
+                instanceOfEClass = createEClass(INSTANCE_OF);
+                createEReference(instanceOfEClass, INSTANCE_OF__VALUE);
+                createEReference(instanceOfEClass, INSTANCE_OF__RANGE);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private boolean isInitialized = false;
+        /**
+         * Complete the initialization of the package and its meta-model.  This
+         * method is guarded to have no affect on any invocation but its first.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void initializePackageContents() {
+                if (isInitialized) return;
+                isInitialized = true;
+                // Initialize package
+                setName(eNAME);
+                setNsPrefix(eNS_PREFIX);
+                setNsURI(eNS_URI);
+                // Obtain other dependent packages
+                LogicproblemPackage theLogicproblemPackage = (LogicproblemPackage)EPackage.Registry.INSTANCE.getEPackage(LogicproblemPackage.eNS_URI);
+                // Create type parameters
+                // Set bounds for type parameters
+                // Add supertypes to classes
+                typeEClass.getESuperTypes().add(this.getTypeDescriptor());
+                definedElementEClass.getESuperTypes().add(this.getSymbolicDeclaration());
+                typeDefinitionEClass.getESuperTypes().add(this.getType());
+                typeReferenceEClass.getESuperTypes().add(this.getTypeDescriptor());
+                complexTypeReferenceEClass.getESuperTypes().add(this.getTypeReference());
+                primitiveTypeReferenceEClass.getESuperTypes().add(this.getTypeReference());
+                intTypeReferenceEClass.getESuperTypes().add(this.getPrimitiveTypeReference());
+                boolTypeReferenceEClass.getESuperTypes().add(this.getPrimitiveTypeReference());
+                realTypeReferenceEClass.getESuperTypes().add(this.getPrimitiveTypeReference());
+                functionEClass.getESuperTypes().add(this.getSymbolicDeclaration());
+                termEClass.getESuperTypes().add(this.getTermDescription());
+                symbolicDeclarationEClass.getESuperTypes().add(this.getTermDescription());
+                symbolicValueEClass.getESuperTypes().add(this.getTerm());
+                atomicTermEClass.getESuperTypes().add(this.getTerm());
+                intLiteralEClass.getESuperTypes().add(this.getAtomicTerm());
+                boolLiteralEClass.getESuperTypes().add(this.getAtomicTerm());
+                realLiteralEClass.getESuperTypes().add(this.getAtomicTerm());
+                variableEClass.getESuperTypes().add(this.getSymbolicDeclaration());
+                quantifiedExpressionEClass.getESuperTypes().add(this.getTerm());
+                existsEClass.getESuperTypes().add(this.getQuantifiedExpression());
+                forallEClass.getESuperTypes().add(this.getQuantifiedExpression());
+                boolOperationEClass.getESuperTypes().add(this.getTerm());
+                andEClass.getESuperTypes().add(this.getBoolOperation());
+                orEClass.getESuperTypes().add(this.getBoolOperation());
+                implEClass.getESuperTypes().add(this.getBoolOperation());
+                notEClass.getESuperTypes().add(this.getBoolOperation());
+                iffEClass.getESuperTypes().add(this.getBoolOperation());
+                primitiveRelationEClass.getESuperTypes().add(this.getTerm());
+                equalsEClass.getESuperTypes().add(this.getPrimitiveRelation());
+                distinctEClass.getESuperTypes().add(this.getPrimitiveRelation());
+                lessThanEClass.getESuperTypes().add(this.getPrimitiveRelation());
+                moreThanEClass.getESuperTypes().add(this.getPrimitiveRelation());
+                lessOrEqualThanEClass.getESuperTypes().add(this.getPrimitiveRelation());
+                moreOrEqualThanEClass.getESuperTypes().add(this.getPrimitiveRelation());
+                intOperationEClass.getESuperTypes().add(this.getTerm());
+                plusEClass.getESuperTypes().add(this.getIntOperation());
+                minusEClass.getESuperTypes().add(this.getIntOperation());
+                multiplyEClass.getESuperTypes().add(this.getIntOperation());
+                divisonEClass.getESuperTypes().add(this.getIntOperation());
+                modEClass.getESuperTypes().add(this.getIntOperation());
+                relationEClass.getESuperTypes().add(this.getSymbolicDeclaration());
+                constantEClass.getESuperTypes().add(this.getSymbolicDeclaration());
+                constantDefinitionEClass.getESuperTypes().add(this.getConstant());
+                relationDefinitionEClass.getESuperTypes().add(this.getRelation());
+                functionDefinitionEClass.getESuperTypes().add(this.getFunction());
+                ifThenElseEClass.getESuperTypes().add(this.getTerm());
+                constantDeclarationEClass.getESuperTypes().add(this.getConstant());
+                relationDeclarationEClass.getESuperTypes().add(this.getRelation());
+                functionDeclarationEClass.getESuperTypes().add(this.getFunction());
+                typeDeclarationEClass.getESuperTypes().add(this.getType());
+                unknownBecauseUninterpretedEClass.getESuperTypes().add(this.getTerm());
+                instanceOfEClass.getESuperTypes().add(this.getTerm());
+                // Initialize classes, features, and operations; add parameters
+                initEClass(typeEClass, Type.class, "Type", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getType_Name(), ecorePackage.getEString(), "name", null, 1, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getType_Subtypes(), this.getType(), this.getType_Supertypes(), "subtypes", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getType_Supertypes(), this.getType(), this.getType_Subtypes(), "supertypes", null, 0, -1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getType_IsAbstract(), ecorePackage.getEBoolean(), "isAbstract", null, 1, 1, Type.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(definedElementEClass, DefinedElement.class, "DefinedElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getDefinedElement_DefinedInType(), this.getTypeDefinition(), this.getTypeDefinition_Elements(), "definedInType", null, 1, -1, DefinedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(typeDefinitionEClass, TypeDefinition.class, "TypeDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getTypeDefinition_Elements(), this.getDefinedElement(), this.getDefinedElement_DefinedInType(), "elements", null, 0, -1, TypeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getTypeDefinition_Defines(), this.getTypeDeclaration(), null, "defines", null, 0, 1, TypeDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(typeReferenceEClass, TypeReference.class, "TypeReference", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(complexTypeReferenceEClass, ComplexTypeReference.class, "ComplexTypeReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getComplexTypeReference_Referred(), this.getType(), null, "referred", null, 0, 1, ComplexTypeReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(primitiveTypeReferenceEClass, PrimitiveTypeReference.class, "PrimitiveTypeReference", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(intTypeReferenceEClass, IntTypeReference.class, "IntTypeReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(boolTypeReferenceEClass, BoolTypeReference.class, "BoolTypeReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(realTypeReferenceEClass, RealTypeReference.class, "RealTypeReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(functionEClass, Function.class, "Function", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getFunction_Range(), this.getTypeReference(), null, "range", null, 1, 1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getFunction_Parameters(), this.getTypeReference(), null, "parameters", null, 0, -1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getFunction_Annotations(), theLogicproblemPackage.getFunctionAnnotation(), theLogicproblemPackage.getFunctionAnnotation_Target(), "annotations", null, 0, -1, Function.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(termEClass, Term.class, "Term", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(symbolicDeclarationEClass, SymbolicDeclaration.class, "SymbolicDeclaration", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getSymbolicDeclaration_Name(), ecorePackage.getEString(), "name", null, 1, 1, SymbolicDeclaration.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(symbolicValueEClass, SymbolicValue.class, "SymbolicValue", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getSymbolicValue_SymbolicReference(), this.getSymbolicDeclaration(), null, "symbolicReference", null, 0, 1, SymbolicValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getSymbolicValue_ParameterSubstitutions(), this.getTerm(), null, "parameterSubstitutions", null, 0, -1, SymbolicValue.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(atomicTermEClass, AtomicTerm.class, "AtomicTerm", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(intLiteralEClass, IntLiteral.class, "IntLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getIntLiteral_Value(), ecorePackage.getEInt(), "value", null, 0, 1, IntLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(boolLiteralEClass, BoolLiteral.class, "BoolLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getBoolLiteral_Value(), ecorePackage.getEBoolean(), "value", null, 0, 1, BoolLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(realLiteralEClass, RealLiteral.class, "RealLiteral", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEAttribute(getRealLiteral_Value(), ecorePackage.getEBigDecimal(), "value", null, 0, 1, RealLiteral.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(variableEClass, Variable.class, "Variable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getVariable_Range(), this.getTypeReference(), null, "range", null, 1, 1, Variable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(quantifiedExpressionEClass, QuantifiedExpression.class, "QuantifiedExpression", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getQuantifiedExpression_QuantifiedVariables(), this.getVariable(), null, "quantifiedVariables", null, 0, -1, QuantifiedExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getQuantifiedExpression_Expression(), this.getTerm(), null, "expression", null, 0, 1, QuantifiedExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(existsEClass, Exists.class, "Exists", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(forallEClass, Forall.class, "Forall", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(boolOperationEClass, BoolOperation.class, "BoolOperation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(andEClass, And.class, "And", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getAnd_Operands(), this.getTerm(), null, "operands", null, 0, -1, And.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(orEClass, Or.class, "Or", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getOr_Operands(), this.getTerm(), null, "operands", null, 0, -1, Or.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(implEClass, Impl.class, "Impl", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getImpl_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, Impl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getImpl_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, Impl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(notEClass, Not.class, "Not", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getNot_Operand(), this.getTerm(), null, "operand", null, 0, 1, Not.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(iffEClass, Iff.class, "Iff", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getIff_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, Iff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getIff_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, Iff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(primitiveRelationEClass, PrimitiveRelation.class, "PrimitiveRelation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(equalsEClass, Equals.class, "Equals", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getEquals_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, Equals.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getEquals_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, Equals.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(distinctEClass, Distinct.class, "Distinct", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getDistinct_Operands(), this.getTerm(), null, "operands", null, 0, -1, Distinct.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(lessThanEClass, LessThan.class, "LessThan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getLessThan_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, LessThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getLessThan_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, LessThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(moreThanEClass, MoreThan.class, "MoreThan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getMoreThan_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, MoreThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getMoreThan_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, MoreThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(lessOrEqualThanEClass, LessOrEqualThan.class, "LessOrEqualThan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getLessOrEqualThan_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, LessOrEqualThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getLessOrEqualThan_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, LessOrEqualThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(moreOrEqualThanEClass, MoreOrEqualThan.class, "MoreOrEqualThan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getMoreOrEqualThan_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, MoreOrEqualThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getMoreOrEqualThan_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, MoreOrEqualThan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(intOperationEClass, IntOperation.class, "IntOperation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getIntOperation_LeftOperand(), this.getTerm(), null, "leftOperand", null, 0, 1, IntOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getIntOperation_RightOperand(), this.getTerm(), null, "rightOperand", null, 0, 1, IntOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(plusEClass, Plus.class, "Plus", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(minusEClass, Minus.class, "Minus", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(multiplyEClass, Multiply.class, "Multiply", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(divisonEClass, Divison.class, "Divison", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(modEClass, Mod.class, "Mod", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(typeDescriptorEClass, TypeDescriptor.class, "TypeDescriptor", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(termDescriptionEClass, TermDescription.class, "TermDescription", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(assertionEClass, Assertion.class, "Assertion", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getAssertion_Value(), this.getTerm(), null, "value", null, 1, 1, Assertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getAssertion_Name(), ecorePackage.getEString(), "name", null, 1, 1, Assertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getAssertion_Annotations(), theLogicproblemPackage.getAssertionAnnotation(), theLogicproblemPackage.getAssertionAnnotation_Target(), "annotations", null, 0, -1, Assertion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getRelation_Parameters(), this.getTypeReference(), null, "parameters", null, 0, -1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getRelation_Annotations(), theLogicproblemPackage.getRelationAnnotation(), theLogicproblemPackage.getRelationAnnotation_Target(), "annotations", null, 0, -1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(constantEClass, Constant.class, "Constant", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getConstant_Type(), this.getTypeReference(), null, "type", null, 1, 1, Constant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getConstant_Annotations(), theLogicproblemPackage.getConstantAnnotation(), theLogicproblemPackage.getConstantAnnotation_Target(), "annotations", null, 0, -1, Constant.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(constantDefinitionEClass, ConstantDefinition.class, "ConstantDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getConstantDefinition_Value(), this.getTerm(), null, "value", null, 1, 1, ConstantDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getConstantDefinition_Defines(), this.getConstantDeclaration(), null, "defines", null, 0, 1, ConstantDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(relationDefinitionEClass, RelationDefinition.class, "RelationDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getRelationDefinition_Variables(), this.getVariable(), null, "variables", null, 0, -1, RelationDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getRelationDefinition_Value(), this.getTerm(), null, "value", null, 1, 1, RelationDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getRelationDefinition_Defines(), this.getRelationDeclaration(), null, "defines", null, 0, 1, RelationDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(functionDefinitionEClass, FunctionDefinition.class, "FunctionDefinition", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getFunctionDefinition_Variable(), this.getVariable(), null, "variable", null, 0, -1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getFunctionDefinition_Defines(), this.getFunctionDeclaration(), null, "defines", null, 0, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getFunctionDefinition_Value(), this.getTerm(), null, "value", null, 1, 1, FunctionDefinition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(ifThenElseEClass, IfThenElse.class, "IfThenElse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getIfThenElse_Condition(), this.getTerm(), null, "condition", null, 1, 1, IfThenElse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getIfThenElse_IfTrue(), this.getTerm(), null, "ifTrue", null, 1, 1, IfThenElse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getIfThenElse_IfFalse(), this.getTerm(), null, "ifFalse", null, 1, 1, IfThenElse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEClass(constantDeclarationEClass, ConstantDeclaration.class, "ConstantDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(relationDeclarationEClass, RelationDeclaration.class, "RelationDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(functionDeclarationEClass, FunctionDeclaration.class, "FunctionDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(typeDeclarationEClass, TypeDeclaration.class, "TypeDeclaration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(unknownBecauseUninterpretedEClass, UnknownBecauseUninterpreted.class, "UnknownBecauseUninterpreted", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEClass(instanceOfEClass, InstanceOf.class, "InstanceOf", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+                initEReference(getInstanceOf_Value(), this.getTerm(), null, "value", null, 1, 1, InstanceOf.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getInstanceOf_Range(), this.getTypeReference(), null, "range", null, 1, 1, InstanceOf.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                // Create resource
+                createResource(eNS_URI);
+        }
+} //LogiclanguagePackageImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinusImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinusImpl.java
new file mode 100644
index 00000000..28c21b08
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MinusImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Minus;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Minus</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class MinusImpl extends IntOperationImpl implements Minus {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected MinusImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.MINUS;
+        }
+} //MinusImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ModImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ModImpl.java
new file mode 100644
index 00000000..bab8d326
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/ModImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Mod;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Mod</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class ModImpl extends IntOperationImpl implements Mod {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected ModImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.MOD;
+        }
+} //ModImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreOrEqualThanImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreOrEqualThanImpl.java
new file mode 100644
index 00000000..8ebf0ccf
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreOrEqualThanImpl.java
@@ -0,0 +1,241 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.MoreOrEqualThan;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>More Or Equal Than</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MoreOrEqualThanImpl#getLeftOperand <em>Left Operand</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MoreOrEqualThanImpl#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MoreOrEqualThanImpl extends PrimitiveRelationImpl implements MoreOrEqualThan {
+        /**
+         * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLeftOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term leftOperand;
+        /**
+         * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRightOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term rightOperand;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected MoreOrEqualThanImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.MORE_OR_EQUAL_THAN;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getLeftOperand() {
+                return leftOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) {
+                Term oldLeftOperand = leftOperand;
+                leftOperand = newLeftOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.MORE_OR_EQUAL_THAN__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLeftOperand(Term newLeftOperand) {
+                if (newLeftOperand != leftOperand) {
+                        NotificationChain msgs = null;
+                        if (leftOperand != null)
+                                msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.MORE_OR_EQUAL_THAN__LEFT_OPERAND, null, msgs);
+                        if (newLeftOperand != null)
+                                msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.MORE_OR_EQUAL_THAN__LEFT_OPERAND, null, msgs);
+                        msgs = basicSetLeftOperand(newLeftOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.MORE_OR_EQUAL_THAN__LEFT_OPERAND, newLeftOperand, newLeftOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getRightOperand() {
+                return rightOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) {
+                Term oldRightOperand = rightOperand;
+                rightOperand = newRightOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.MORE_OR_EQUAL_THAN__RIGHT_OPERAND, oldRightOperand, newRightOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRightOperand(Term newRightOperand) {
+                if (newRightOperand != rightOperand) {
+                        NotificationChain msgs = null;
+                        if (rightOperand != null)
+                                msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.MORE_OR_EQUAL_THAN__RIGHT_OPERAND, null, msgs);
+                        if (newRightOperand != null)
+                                msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.MORE_OR_EQUAL_THAN__RIGHT_OPERAND, null, msgs);
+                        msgs = basicSetRightOperand(newRightOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.MORE_OR_EQUAL_THAN__RIGHT_OPERAND, newRightOperand, newRightOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__LEFT_OPERAND:
+                                return basicSetLeftOperand(null, msgs);
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                return basicSetRightOperand(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__LEFT_OPERAND:
+                                return getLeftOperand();
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                return getRightOperand();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__LEFT_OPERAND:
+                                setLeftOperand((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                setRightOperand((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__LEFT_OPERAND:
+                                setLeftOperand((Term)null);
+                                return;
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                setRightOperand((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__LEFT_OPERAND:
+                                return leftOperand != null;
+                        case LogiclanguagePackage.MORE_OR_EQUAL_THAN__RIGHT_OPERAND:
+                                return rightOperand != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //MoreOrEqualThanImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreThanImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreThanImpl.java
new file mode 100644
index 00000000..a7756650
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MoreThanImpl.java
@@ -0,0 +1,241 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.MoreThan;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>More Than</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MoreThanImpl#getLeftOperand <em>Left Operand</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.MoreThanImpl#getRightOperand <em>Right Operand</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class MoreThanImpl extends PrimitiveRelationImpl implements MoreThan {
+        /**
+         * The cached value of the '{@link #getLeftOperand() <em>Left Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getLeftOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term leftOperand;
+        /**
+         * The cached value of the '{@link #getRightOperand() <em>Right Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRightOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term rightOperand;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected MoreThanImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.MORE_THAN;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getLeftOperand() {
+                return leftOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetLeftOperand(Term newLeftOperand, NotificationChain msgs) {
+                Term oldLeftOperand = leftOperand;
+                leftOperand = newLeftOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.MORE_THAN__LEFT_OPERAND, oldLeftOperand, newLeftOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setLeftOperand(Term newLeftOperand) {
+                if (newLeftOperand != leftOperand) {
+                        NotificationChain msgs = null;
+                        if (leftOperand != null)
+                                msgs = ((InternalEObject)leftOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.MORE_THAN__LEFT_OPERAND, null, msgs);
+                        if (newLeftOperand != null)
+                                msgs = ((InternalEObject)newLeftOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.MORE_THAN__LEFT_OPERAND, null, msgs);
+                        msgs = basicSetLeftOperand(newLeftOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.MORE_THAN__LEFT_OPERAND, newLeftOperand, newLeftOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getRightOperand() {
+                return rightOperand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRightOperand(Term newRightOperand, NotificationChain msgs) {
+                Term oldRightOperand = rightOperand;
+                rightOperand = newRightOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.MORE_THAN__RIGHT_OPERAND, oldRightOperand, newRightOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRightOperand(Term newRightOperand) {
+                if (newRightOperand != rightOperand) {
+                        NotificationChain msgs = null;
+                        if (rightOperand != null)
+                                msgs = ((InternalEObject)rightOperand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.MORE_THAN__RIGHT_OPERAND, null, msgs);
+                        if (newRightOperand != null)
+                                msgs = ((InternalEObject)newRightOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.MORE_THAN__RIGHT_OPERAND, null, msgs);
+                        msgs = basicSetRightOperand(newRightOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.MORE_THAN__RIGHT_OPERAND, newRightOperand, newRightOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_THAN__LEFT_OPERAND:
+                                return basicSetLeftOperand(null, msgs);
+                        case LogiclanguagePackage.MORE_THAN__RIGHT_OPERAND:
+                                return basicSetRightOperand(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_THAN__LEFT_OPERAND:
+                                return getLeftOperand();
+                        case LogiclanguagePackage.MORE_THAN__RIGHT_OPERAND:
+                                return getRightOperand();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_THAN__LEFT_OPERAND:
+                                setLeftOperand((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.MORE_THAN__RIGHT_OPERAND:
+                                setRightOperand((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_THAN__LEFT_OPERAND:
+                                setLeftOperand((Term)null);
+                                return;
+                        case LogiclanguagePackage.MORE_THAN__RIGHT_OPERAND:
+                                setRightOperand((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.MORE_THAN__LEFT_OPERAND:
+                                return leftOperand != null;
+                        case LogiclanguagePackage.MORE_THAN__RIGHT_OPERAND:
+                                return rightOperand != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //MoreThanImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MultiplyImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MultiplyImpl.java
new file mode 100644
index 00000000..50797800
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/MultiplyImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Multiply;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Multiply</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class MultiplyImpl extends IntOperationImpl implements Multiply {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected MultiplyImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.MULTIPLY;
+        }
+} //MultiplyImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NotImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NotImpl.java
new file mode 100644
index 00000000..74c4dd6f
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/NotImpl.java
@@ -0,0 +1,175 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Not;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Not</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.NotImpl#getOperand <em>Operand</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class NotImpl extends BoolOperationImpl implements Not {
+        /**
+         * The cached value of the '{@link #getOperand() <em>Operand</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOperand()
+         * @generated
+         * @ordered
+         */
+        protected Term operand;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected NotImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.NOT;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getOperand() {
+                return operand;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetOperand(Term newOperand, NotificationChain msgs) {
+                Term oldOperand = operand;
+                operand = newOperand;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.NOT__OPERAND, oldOperand, newOperand);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setOperand(Term newOperand) {
+                if (newOperand != operand) {
+                        NotificationChain msgs = null;
+                        if (operand != null)
+                                msgs = ((InternalEObject)operand).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.NOT__OPERAND, null, msgs);
+                        if (newOperand != null)
+                                msgs = ((InternalEObject)newOperand).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.NOT__OPERAND, null, msgs);
+                        msgs = basicSetOperand(newOperand, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.NOT__OPERAND, newOperand, newOperand));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.NOT__OPERAND:
+                                return basicSetOperand(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.NOT__OPERAND:
+                                return getOperand();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.NOT__OPERAND:
+                                setOperand((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.NOT__OPERAND:
+                                setOperand((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.NOT__OPERAND:
+                                return operand != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //NotImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/OrImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/OrImpl.java
new file mode 100644
index 00000000..9ef8357a
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/OrImpl.java
@@ -0,0 +1,150 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Or;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Or</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.OrImpl#getOperands <em>Operands</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class OrImpl extends BoolOperationImpl implements Or {
+        /**
+         * The cached value of the '{@link #getOperands() <em>Operands</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getOperands()
+         * @generated
+         * @ordered
+         */
+        protected EList<Term> operands;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected OrImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.OR;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Term> getOperands() {
+                if (operands == null) {
+                        operands = new EObjectContainmentEList<Term>(Term.class, this, LogiclanguagePackage.OR__OPERANDS);
+                }
+                return operands;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.OR__OPERANDS:
+                                return ((InternalEList<?>)getOperands()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.OR__OPERANDS:
+                                return getOperands();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.OR__OPERANDS:
+                                getOperands().clear();
+                                getOperands().addAll((Collection<? extends Term>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.OR__OPERANDS:
+                                getOperands().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.OR__OPERANDS:
+                                return operands != null && !operands.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+} //OrImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PlusImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PlusImpl.java
new file mode 100644
index 00000000..c9d0d591
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PlusImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Plus;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Plus</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class PlusImpl extends IntOperationImpl implements Plus {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected PlusImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.PLUS;
+        }
+} //PlusImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PrimitiveRelationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PrimitiveRelationImpl.java
new file mode 100644
index 00000000..a9e521c5
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PrimitiveRelationImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.PrimitiveRelation;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Primitive Relation</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class PrimitiveRelationImpl extends TermImpl implements PrimitiveRelation {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected PrimitiveRelationImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.PRIMITIVE_RELATION;
+        }
+} //PrimitiveRelationImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PrimitiveTypeReferenceImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PrimitiveTypeReferenceImpl.java
new file mode 100644
index 00000000..2e0d56c9
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/PrimitiveTypeReferenceImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.PrimitiveTypeReference;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Primitive Type Reference</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class PrimitiveTypeReferenceImpl extends TypeReferenceImpl implements PrimitiveTypeReference {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected PrimitiveTypeReferenceImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.PRIMITIVE_TYPE_REFERENCE;
+        }
+} //PrimitiveTypeReferenceImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/QuantifiedExpressionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/QuantifiedExpressionImpl.java
new file mode 100644
index 00000000..dad2d1af
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/QuantifiedExpressionImpl.java
@@ -0,0 +1,220 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.QuantifiedExpression;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Quantified Expression</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.QuantifiedExpressionImpl#getQuantifiedVariables <em>Quantified Variables</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.QuantifiedExpressionImpl#getExpression <em>Expression</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class QuantifiedExpressionImpl extends TermImpl implements QuantifiedExpression {
+        /**
+         * The cached value of the '{@link #getQuantifiedVariables() <em>Quantified Variables</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getQuantifiedVariables()
+         * @generated
+         * @ordered
+         */
+        protected EList<Variable> quantifiedVariables;
+        /**
+         * The cached value of the '{@link #getExpression() <em>Expression</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getExpression()
+         * @generated
+         * @ordered
+         */
+        protected Term expression;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected QuantifiedExpressionImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.QUANTIFIED_EXPRESSION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Variable> getQuantifiedVariables() {
+                if (quantifiedVariables == null) {
+                        quantifiedVariables = new EObjectContainmentEList<Variable>(Variable.class, this, LogiclanguagePackage.QUANTIFIED_EXPRESSION__QUANTIFIED_VARIABLES);
+                }
+                return quantifiedVariables;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getExpression() {
+                return expression;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetExpression(Term newExpression, NotificationChain msgs) {
+                Term oldExpression = expression;
+                expression = newExpression;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.QUANTIFIED_EXPRESSION__EXPRESSION, oldExpression, newExpression);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setExpression(Term newExpression) {
+                if (newExpression != expression) {
+                        NotificationChain msgs = null;
+                        if (expression != null)
+                                msgs = ((InternalEObject)expression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.QUANTIFIED_EXPRESSION__EXPRESSION, null, msgs);
+                        if (newExpression != null)
+                                msgs = ((InternalEObject)newExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.QUANTIFIED_EXPRESSION__EXPRESSION, null, msgs);
+                        msgs = basicSetExpression(newExpression, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.QUANTIFIED_EXPRESSION__EXPRESSION, newExpression, newExpression));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__QUANTIFIED_VARIABLES:
+                                return ((InternalEList<?>)getQuantifiedVariables()).basicRemove(otherEnd, msgs);
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__EXPRESSION:
+                                return basicSetExpression(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__QUANTIFIED_VARIABLES:
+                                return getQuantifiedVariables();
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__EXPRESSION:
+                                return getExpression();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__QUANTIFIED_VARIABLES:
+                                getQuantifiedVariables().clear();
+                                getQuantifiedVariables().addAll((Collection<? extends Variable>)newValue);
+                                return;
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__EXPRESSION:
+                                setExpression((Term)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__QUANTIFIED_VARIABLES:
+                                getQuantifiedVariables().clear();
+                                return;
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__EXPRESSION:
+                                setExpression((Term)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__QUANTIFIED_VARIABLES:
+                                return quantifiedVariables != null && !quantifiedVariables.isEmpty();
+                        case LogiclanguagePackage.QUANTIFIED_EXPRESSION__EXPRESSION:
+                                return expression != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //QuantifiedExpressionImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java
new file mode 100644
index 00000000..54594606
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealLiteralImpl.java
@@ -0,0 +1,164 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealLiteral;
+import java.math.BigDecimal;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Real Literal</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.RealLiteralImpl#getValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class RealLiteralImpl extends AtomicTermImpl implements RealLiteral {
+        /**
+         * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected static final BigDecimal VALUE_EDEFAULT = null;
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected BigDecimal value = VALUE_EDEFAULT;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RealLiteralImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.REAL_LITERAL;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public BigDecimal getValue() {
+                return value;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(BigDecimal newValue) {
+                BigDecimal oldValue = value;
+                value = newValue;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.REAL_LITERAL__VALUE, oldValue, value));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.REAL_LITERAL__VALUE:
+                                return getValue();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.REAL_LITERAL__VALUE:
+                                setValue((BigDecimal)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.REAL_LITERAL__VALUE:
+                                setValue(VALUE_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.REAL_LITERAL__VALUE:
+                                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+                }
+                return super.eIsSet(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+                StringBuffer result = new StringBuffer(super.toString());
+                result.append(" (value: ");
+                result.append(value);
+                result.append(')');
+                return result.toString();
+        }
+} //RealLiteralImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealTypeReferenceImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealTypeReferenceImpl.java
new file mode 100644
index 00000000..8c12c66c
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RealTypeReferenceImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RealTypeReference;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Real Type Reference</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RealTypeReferenceImpl extends PrimitiveTypeReferenceImpl implements RealTypeReference {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RealTypeReferenceImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.REAL_TYPE_REFERENCE;
+        }
+} //RealTypeReferenceImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDeclarationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDeclarationImpl.java
new file mode 100644
index 00000000..22b588ab
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDeclarationImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Relation Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class RelationDeclarationImpl extends RelationImpl implements RelationDeclaration {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RelationDeclarationImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.RELATION_DECLARATION;
+        }
+} //RelationDeclarationImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDefinitionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDefinitionImpl.java
new file mode 100644
index 00000000..017518eb
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationDefinitionImpl.java
@@ -0,0 +1,280 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.RelationDefinition;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Relation Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.RelationDefinitionImpl#getVariables <em>Variables</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.RelationDefinitionImpl#getValue <em>Value</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.RelationDefinitionImpl#getDefines <em>Defines</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class RelationDefinitionImpl extends RelationImpl implements RelationDefinition {
+        /**
+         * The cached value of the '{@link #getVariables() <em>Variables</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getVariables()
+         * @generated
+         * @ordered
+         */
+        protected EList<Variable> variables;
+        /**
+         * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getValue()
+         * @generated
+         * @ordered
+         */
+        protected Term value;
+        /**
+         * The cached value of the '{@link #getDefines() <em>Defines</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDefines()
+         * @generated
+         * @ordered
+         */
+        protected RelationDeclaration defines;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RelationDefinitionImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.RELATION_DEFINITION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Variable> getVariables() {
+                if (variables == null) {
+                        variables = new EObjectContainmentEList<Variable>(Variable.class, this, LogiclanguagePackage.RELATION_DEFINITION__VARIABLES);
+                }
+                return variables;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public Term getValue() {
+                return value;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetValue(Term newValue, NotificationChain msgs) {
+                Term oldValue = value;
+                value = newValue;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.RELATION_DEFINITION__VALUE, oldValue, newValue);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setValue(Term newValue) {
+                if (newValue != value) {
+                        NotificationChain msgs = null;
+                        if (value != null)
+                                msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.RELATION_DEFINITION__VALUE, null, msgs);
+                        if (newValue != null)
+                                msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.RELATION_DEFINITION__VALUE, null, msgs);
+                        msgs = basicSetValue(newValue, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.RELATION_DEFINITION__VALUE, newValue, newValue));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public RelationDeclaration getDefines() {
+                if (defines != null && defines.eIsProxy()) {
+                        InternalEObject oldDefines = (InternalEObject)defines;
+                        defines = (RelationDeclaration)eResolveProxy(oldDefines);
+                        if (defines != oldDefines) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, LogiclanguagePackage.RELATION_DEFINITION__DEFINES, oldDefines, defines));
+                        }
+                }
+                return defines;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public RelationDeclaration basicGetDefines() {
+                return defines;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setDefines(RelationDeclaration newDefines) {
+                RelationDeclaration oldDefines = defines;
+                defines = newDefines;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.RELATION_DEFINITION__DEFINES, oldDefines, defines));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION_DEFINITION__VARIABLES:
+                                return ((InternalEList<?>)getVariables()).basicRemove(otherEnd, msgs);
+                        case LogiclanguagePackage.RELATION_DEFINITION__VALUE:
+                                return basicSetValue(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION_DEFINITION__VARIABLES:
+                                return getVariables();
+                        case LogiclanguagePackage.RELATION_DEFINITION__VALUE:
+                                return getValue();
+                        case LogiclanguagePackage.RELATION_DEFINITION__DEFINES:
+                                if (resolve) return getDefines();
+                                return basicGetDefines();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION_DEFINITION__VARIABLES:
+                                getVariables().clear();
+                                getVariables().addAll((Collection<? extends Variable>)newValue);
+                                return;
+                        case LogiclanguagePackage.RELATION_DEFINITION__VALUE:
+                                setValue((Term)newValue);
+                                return;
+                        case LogiclanguagePackage.RELATION_DEFINITION__DEFINES:
+                                setDefines((RelationDeclaration)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION_DEFINITION__VARIABLES:
+                                getVariables().clear();
+                                return;
+                        case LogiclanguagePackage.RELATION_DEFINITION__VALUE:
+                                setValue((Term)null);
+                                return;
+                        case LogiclanguagePackage.RELATION_DEFINITION__DEFINES:
+                                setDefines((RelationDeclaration)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION_DEFINITION__VARIABLES:
+                                return variables != null && !variables.isEmpty();
+                        case LogiclanguagePackage.RELATION_DEFINITION__VALUE:
+                                return value != null;
+                        case LogiclanguagePackage.RELATION_DEFINITION__DEFINES:
+                                return defines != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //RelationDefinitionImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationImpl.java
new file mode 100644
index 00000000..a0127ab8
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/RelationImpl.java
@@ -0,0 +1,204 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Relation;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicproblemPackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.RelationAnnotation;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Relation</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.RelationImpl#getParameters <em>Parameters</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.RelationImpl#getAnnotations <em>Annotations</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class RelationImpl extends SymbolicDeclarationImpl implements Relation {
+        /**
+         * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getParameters()
+         * @generated
+         * @ordered
+         */
+        protected EList<TypeReference> parameters;
+        /**
+         * The cached value of the '{@link #getAnnotations() <em>Annotations</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getAnnotations()
+         * @generated
+         * @ordered
+         */
+        protected EList<RelationAnnotation> annotations;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected RelationImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.RELATION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<TypeReference> getParameters() {
+                if (parameters == null) {
+                        parameters = new EObjectContainmentEList<TypeReference>(TypeReference.class, this, LogiclanguagePackage.RELATION__PARAMETERS);
+                }
+                return parameters;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<RelationAnnotation> getAnnotations() {
+                if (annotations == null) {
+                        annotations = new EObjectWithInverseResolvingEList<RelationAnnotation>(RelationAnnotation.class, this, LogiclanguagePackage.RELATION__ANNOTATIONS, LogicproblemPackage.RELATION_ANNOTATION__TARGET);
+                }
+                return annotations;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION__ANNOTATIONS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getAnnotations()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION__PARAMETERS:
+                                return ((InternalEList<?>)getParameters()).basicRemove(otherEnd, msgs);
+                        case LogiclanguagePackage.RELATION__ANNOTATIONS:
+                                return ((InternalEList<?>)getAnnotations()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION__PARAMETERS:
+                                return getParameters();
+                        case LogiclanguagePackage.RELATION__ANNOTATIONS:
+                                return getAnnotations();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION__PARAMETERS:
+                                getParameters().clear();
+                                getParameters().addAll((Collection<? extends TypeReference>)newValue);
+                                return;
+                        case LogiclanguagePackage.RELATION__ANNOTATIONS:
+                                getAnnotations().clear();
+                                getAnnotations().addAll((Collection<? extends RelationAnnotation>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION__PARAMETERS:
+                                getParameters().clear();
+                                return;
+                        case LogiclanguagePackage.RELATION__ANNOTATIONS:
+                                getAnnotations().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.RELATION__PARAMETERS:
+                                return parameters != null && !parameters.isEmpty();
+                        case LogiclanguagePackage.RELATION__ANNOTATIONS:
+                                return annotations != null && !annotations.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+} //RelationImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicDeclarationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicDeclarationImpl.java
new file mode 100644
index 00000000..1f28cbd7
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicDeclarationImpl.java
@@ -0,0 +1,161 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicDeclaration;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Symbolic Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.SymbolicDeclarationImpl#getName <em>Name</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class SymbolicDeclarationImpl extends MinimalEObjectImpl.Container implements SymbolicDeclaration {
+        /**
+         * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected static final String NAME_EDEFAULT = null;
+        /**
+         * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected String name = NAME_EDEFAULT;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected SymbolicDeclarationImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.SYMBOLIC_DECLARATION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.SYMBOLIC_DECLARATION__NAME, oldName, name));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.SYMBOLIC_DECLARATION__NAME:
+                                return getName();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.SYMBOLIC_DECLARATION__NAME:
+                                setName((String)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.SYMBOLIC_DECLARATION__NAME:
+                                setName(NAME_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.SYMBOLIC_DECLARATION__NAME:
+                                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                }
+                return super.eIsSet(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+                StringBuffer result = new StringBuffer(super.toString());
+                result.append(" (name: ");
+                result.append(name);
+                result.append(')');
+                return result.toString();
+        }
+} //SymbolicDeclarationImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicValueImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicValueImpl.java
new file mode 100644
index 00000000..59e1a7d3
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/SymbolicValueImpl.java
@@ -0,0 +1,214 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.SymbolicValue;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Symbolic Value</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.SymbolicValueImpl#getSymbolicReference <em>Symbolic Reference</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.SymbolicValueImpl#getParameterSubstitutions <em>Parameter Substitutions</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class SymbolicValueImpl extends TermImpl implements SymbolicValue {
+        /**
+         * The cached value of the '{@link #getSymbolicReference() <em>Symbolic Reference</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSymbolicReference()
+         * @generated
+         * @ordered
+         */
+        protected SymbolicDeclaration symbolicReference;
+        /**
+         * The cached value of the '{@link #getParameterSubstitutions() <em>Parameter Substitutions</em>}' containment reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getParameterSubstitutions()
+         * @generated
+         * @ordered
+         */
+        protected EList<Term> parameterSubstitutions;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected SymbolicValueImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.SYMBOLIC_VALUE;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public SymbolicDeclaration getSymbolicReference() {
+                if (symbolicReference != null && symbolicReference.eIsProxy()) {
+                        InternalEObject oldSymbolicReference = (InternalEObject)symbolicReference;
+                        symbolicReference = (SymbolicDeclaration)eResolveProxy(oldSymbolicReference);
+                        if (symbolicReference != oldSymbolicReference) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, LogiclanguagePackage.SYMBOLIC_VALUE__SYMBOLIC_REFERENCE, oldSymbolicReference, symbolicReference));
+                        }
+                }
+                return symbolicReference;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public SymbolicDeclaration basicGetSymbolicReference() {
+                return symbolicReference;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setSymbolicReference(SymbolicDeclaration newSymbolicReference) {
+                SymbolicDeclaration oldSymbolicReference = symbolicReference;
+                symbolicReference = newSymbolicReference;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.SYMBOLIC_VALUE__SYMBOLIC_REFERENCE, oldSymbolicReference, symbolicReference));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Term> getParameterSubstitutions() {
+                if (parameterSubstitutions == null) {
+                        parameterSubstitutions = new EObjectContainmentEList<Term>(Term.class, this, LogiclanguagePackage.SYMBOLIC_VALUE__PARAMETER_SUBSTITUTIONS);
+                }
+                return parameterSubstitutions;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.SYMBOLIC_VALUE__PARAMETER_SUBSTITUTIONS:
+                                return ((InternalEList<?>)getParameterSubstitutions()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.SYMBOLIC_VALUE__SYMBOLIC_REFERENCE:
+                                if (resolve) return getSymbolicReference();
+                                return basicGetSymbolicReference();
+                        case LogiclanguagePackage.SYMBOLIC_VALUE__PARAMETER_SUBSTITUTIONS:
+                                return getParameterSubstitutions();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.SYMBOLIC_VALUE__SYMBOLIC_REFERENCE:
+                                setSymbolicReference((SymbolicDeclaration)newValue);
+                                return;
+                        case LogiclanguagePackage.SYMBOLIC_VALUE__PARAMETER_SUBSTITUTIONS:
+                                getParameterSubstitutions().clear();
+                                getParameterSubstitutions().addAll((Collection<? extends Term>)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.SYMBOLIC_VALUE__SYMBOLIC_REFERENCE:
+                                setSymbolicReference((SymbolicDeclaration)null);
+                                return;
+                        case LogiclanguagePackage.SYMBOLIC_VALUE__PARAMETER_SUBSTITUTIONS:
+                                getParameterSubstitutions().clear();
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.SYMBOLIC_VALUE__SYMBOLIC_REFERENCE:
+                                return symbolicReference != null;
+                        case LogiclanguagePackage.SYMBOLIC_VALUE__PARAMETER_SUBSTITUTIONS:
+                                return parameterSubstitutions != null && !parameterSubstitutions.isEmpty();
+                }
+                return super.eIsSet(featureID);
+        }
+} //SymbolicValueImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TermImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TermImpl.java
new file mode 100644
index 00000000..e3a9eec4
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TermImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Term;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Term</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class TermImpl extends MinimalEObjectImpl.Container implements Term {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected TermImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.TERM;
+        }
+} //TermImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDeclarationImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDeclarationImpl.java
new file mode 100644
index 00000000..dfcf17dc
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDeclarationImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Type Declaration</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class TypeDeclarationImpl extends TypeImpl implements TypeDeclaration {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected TypeDeclarationImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.TYPE_DECLARATION;
+        }
+} //TypeDeclarationImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDefinitionImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDefinitionImpl.java
new file mode 100644
index 00000000..02b2ec52
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeDefinitionImpl.java
@@ -0,0 +1,225 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.DefinedElement;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDeclaration;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeDefinition;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Type Definition</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TypeDefinitionImpl#getElements <em>Elements</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TypeDefinitionImpl#getDefines <em>Defines</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TypeDefinitionImpl extends TypeImpl implements TypeDefinition {
+        /**
+         * The cached value of the '{@link #getElements() <em>Elements</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getElements()
+         * @generated
+         * @ordered
+         */
+        protected EList<DefinedElement> elements;
+        /**
+         * The cached value of the '{@link #getDefines() <em>Defines</em>}' reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getDefines()
+         * @generated
+         * @ordered
+         */
+        protected TypeDeclaration defines;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected TypeDefinitionImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.TYPE_DEFINITION;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<DefinedElement> getElements() {
+                if (elements == null) {
+                        elements = new EObjectWithInverseResolvingEList.ManyInverse<DefinedElement>(DefinedElement.class, this, LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS, LogiclanguagePackage.DEFINED_ELEMENT__DEFINED_IN_TYPE);
+                }
+                return elements;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeDeclaration getDefines() {
+                if (defines != null && defines.eIsProxy()) {
+                        InternalEObject oldDefines = (InternalEObject)defines;
+                        defines = (TypeDeclaration)eResolveProxy(oldDefines);
+                        if (defines != oldDefines) {
+                                if (eNotificationRequired())
+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, LogiclanguagePackage.TYPE_DEFINITION__DEFINES, oldDefines, defines));
+                        }
+                }
+                return defines;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeDeclaration basicGetDefines() {
+                return defines;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setDefines(TypeDeclaration newDefines) {
+                TypeDeclaration oldDefines = defines;
+                defines = newDefines;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.TYPE_DEFINITION__DEFINES, oldDefines, defines));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getElements()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS:
+                                return ((InternalEList<?>)getElements()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS:
+                                return getElements();
+                        case LogiclanguagePackage.TYPE_DEFINITION__DEFINES:
+                                if (resolve) return getDefines();
+                                return basicGetDefines();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS:
+                                getElements().clear();
+                                getElements().addAll((Collection<? extends DefinedElement>)newValue);
+                                return;
+                        case LogiclanguagePackage.TYPE_DEFINITION__DEFINES:
+                                setDefines((TypeDeclaration)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS:
+                                getElements().clear();
+                                return;
+                        case LogiclanguagePackage.TYPE_DEFINITION__DEFINES:
+                                setDefines((TypeDeclaration)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE_DEFINITION__ELEMENTS:
+                                return elements != null && !elements.isEmpty();
+                        case LogiclanguagePackage.TYPE_DEFINITION__DEFINES:
+                                return defines != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //TypeDefinitionImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeImpl.java
new file mode 100644
index 00000000..f51d7ef5
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeImpl.java
@@ -0,0 +1,325 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;
+import java.util.Collection;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Type</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TypeImpl#getName <em>Name</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TypeImpl#getSubtypes <em>Subtypes</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TypeImpl#getSupertypes <em>Supertypes</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.TypeImpl#isIsAbstract <em>Is Abstract</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public abstract class TypeImpl extends MinimalEObjectImpl.Container implements Type {
+        /**
+         * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected static final String NAME_EDEFAULT = null;
+        /**
+         * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getName()
+         * @generated
+         * @ordered
+         */
+        protected String name = NAME_EDEFAULT;
+        /**
+         * The cached value of the '{@link #getSubtypes() <em>Subtypes</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSubtypes()
+         * @generated
+         * @ordered
+         */
+        protected EList<Type> subtypes;
+        /**
+         * The cached value of the '{@link #getSupertypes() <em>Supertypes</em>}' reference list.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getSupertypes()
+         * @generated
+         * @ordered
+         */
+        protected EList<Type> supertypes;
+        /**
+         * The default value of the '{@link #isIsAbstract() <em>Is Abstract</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isIsAbstract()
+         * @generated
+         * @ordered
+         */
+        protected static final boolean IS_ABSTRACT_EDEFAULT = false;
+        /**
+         * The cached value of the '{@link #isIsAbstract() <em>Is Abstract</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #isIsAbstract()
+         * @generated
+         * @ordered
+         */
+        protected boolean isAbstract = IS_ABSTRACT_EDEFAULT;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected TypeImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.TYPE;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String getName() {
+                return name;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setName(String newName) {
+                String oldName = name;
+                name = newName;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.TYPE__NAME, oldName, name));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Type> getSubtypes() {
+                if (subtypes == null) {
+                        subtypes = new EObjectWithInverseResolvingEList.ManyInverse<Type>(Type.class, this, LogiclanguagePackage.TYPE__SUBTYPES, LogiclanguagePackage.TYPE__SUPERTYPES);
+                }
+                return subtypes;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public EList<Type> getSupertypes() {
+                if (supertypes == null) {
+                        supertypes = new EObjectWithInverseResolvingEList.ManyInverse<Type>(Type.class, this, LogiclanguagePackage.TYPE__SUPERTYPES, LogiclanguagePackage.TYPE__SUBTYPES);
+                }
+                return supertypes;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public boolean isIsAbstract() {
+                return isAbstract;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setIsAbstract(boolean newIsAbstract) {
+                boolean oldIsAbstract = isAbstract;
+                isAbstract = newIsAbstract;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.TYPE__IS_ABSTRACT, oldIsAbstract, isAbstract));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE__SUBTYPES:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSubtypes()).basicAdd(otherEnd, msgs);
+                        case LogiclanguagePackage.TYPE__SUPERTYPES:
+                                return ((InternalEList<InternalEObject>)(InternalEList<?>)getSupertypes()).basicAdd(otherEnd, msgs);
+                }
+                return super.eInverseAdd(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE__SUBTYPES:
+                                return ((InternalEList<?>)getSubtypes()).basicRemove(otherEnd, msgs);
+                        case LogiclanguagePackage.TYPE__SUPERTYPES:
+                                return ((InternalEList<?>)getSupertypes()).basicRemove(otherEnd, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE__NAME:
+                                return getName();
+                        case LogiclanguagePackage.TYPE__SUBTYPES:
+                                return getSubtypes();
+                        case LogiclanguagePackage.TYPE__SUPERTYPES:
+                                return getSupertypes();
+                        case LogiclanguagePackage.TYPE__IS_ABSTRACT:
+                                return isIsAbstract();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @SuppressWarnings("unchecked")
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE__NAME:
+                                setName((String)newValue);
+                                return;
+                        case LogiclanguagePackage.TYPE__SUBTYPES:
+                                getSubtypes().clear();
+                                getSubtypes().addAll((Collection<? extends Type>)newValue);
+                                return;
+                        case LogiclanguagePackage.TYPE__SUPERTYPES:
+                                getSupertypes().clear();
+                                getSupertypes().addAll((Collection<? extends Type>)newValue);
+                                return;
+                        case LogiclanguagePackage.TYPE__IS_ABSTRACT:
+                                setIsAbstract((Boolean)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE__NAME:
+                                setName(NAME_EDEFAULT);
+                                return;
+                        case LogiclanguagePackage.TYPE__SUBTYPES:
+                                getSubtypes().clear();
+                                return;
+                        case LogiclanguagePackage.TYPE__SUPERTYPES:
+                                getSupertypes().clear();
+                                return;
+                        case LogiclanguagePackage.TYPE__IS_ABSTRACT:
+                                setIsAbstract(IS_ABSTRACT_EDEFAULT);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.TYPE__NAME:
+                                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+                        case LogiclanguagePackage.TYPE__SUBTYPES:
+                                return subtypes != null && !subtypes.isEmpty();
+                        case LogiclanguagePackage.TYPE__SUPERTYPES:
+                                return supertypes != null && !supertypes.isEmpty();
+                        case LogiclanguagePackage.TYPE__IS_ABSTRACT:
+                                return isAbstract != IS_ABSTRACT_EDEFAULT;
+                }
+                return super.eIsSet(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public String toString() {
+                if (eIsProxy()) return super.toString();
+                StringBuffer result = new StringBuffer(super.toString());
+                result.append(" (name: ");
+                result.append(name);
+                result.append(", isAbstract: ");
+                result.append(isAbstract);
+                result.append(')');
+                return result.toString();
+        }
+} //TypeImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeReferenceImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeReferenceImpl.java
new file mode 100644
index 00000000..c8e8b782
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/TypeReferenceImpl.java
@@ -0,0 +1,39 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Type Reference</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class TypeReferenceImpl extends MinimalEObjectImpl.Container implements TypeReference {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected TypeReferenceImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.TYPE_REFERENCE;
+        }
+} //TypeReferenceImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/UnknownBecauseUninterpretedImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/UnknownBecauseUninterpretedImpl.java
new file mode 100644
index 00000000..af7e9a11
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/UnknownBecauseUninterpretedImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.UnknownBecauseUninterpreted;
+import org.eclipse.emf.ecore.EClass;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Unknown Because Uninterpreted</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class UnknownBecauseUninterpretedImpl extends TermImpl implements UnknownBecauseUninterpreted {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected UnknownBecauseUninterpretedImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.UNKNOWN_BECAUSE_UNINTERPRETED;
+        }
+} //UnknownBecauseUninterpretedImpl
diff --git a/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/VariableImpl.java b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/VariableImpl.java
new file mode 100644
index 00000000..5e862b9f
--- /dev/null
+++ b/Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl/VariableImpl.java
@@ -0,0 +1,175 @@
+/**
+ */
+package hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.LogiclanguagePackage;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.TypeReference;
+import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Variable;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Variable</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.impl.VariableImpl#getRange <em>Range</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class VariableImpl extends SymbolicDeclarationImpl implements Variable {
+        /**
+         * The cached value of the '{@link #getRange() <em>Range</em>}' containment reference.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getRange()
+         * @generated
+         * @ordered
+         */
+        protected TypeReference range;
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected VariableImpl() {
+                super();
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return LogiclanguagePackage.Literals.VARIABLE;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public TypeReference getRange() {
+                return range;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public NotificationChain basicSetRange(TypeReference newRange, NotificationChain msgs) {
+                TypeReference oldRange = range;
+                range = newRange;
+                if (eNotificationRequired()) {
+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.VARIABLE__RANGE, oldRange, newRange);
+                        if (msgs == null) msgs = notification; else msgs.add(notification);
+                }
+                return msgs;
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public void setRange(TypeReference newRange) {
+                if (newRange != range) {
+                        NotificationChain msgs = null;
+                        if (range != null)
+                                msgs = ((InternalEObject)range).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.VARIABLE__RANGE, null, msgs);
+                        if (newRange != null)
+                                msgs = ((InternalEObject)newRange).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - LogiclanguagePackage.VARIABLE__RANGE, null, msgs);
+                        msgs = basicSetRange(newRange, msgs);
+                        if (msgs != null) msgs.dispatch();
+                }
+                else if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, LogiclanguagePackage.VARIABLE__RANGE, newRange, newRange));
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+                switch (featureID) {
+                        case LogiclanguagePackage.VARIABLE__RANGE:
+                                return basicSetRange(null, msgs);
+                }
+                return super.eInverseRemove(otherEnd, featureID, msgs);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public Object eGet(int featureID, boolean resolve, boolean coreType) {
+                switch (featureID) {
+                        case LogiclanguagePackage.VARIABLE__RANGE:
+                                return getRange();
+                }
+                return super.eGet(featureID, resolve, coreType);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eSet(int featureID, Object newValue) {
+                switch (featureID) {
+                        case LogiclanguagePackage.VARIABLE__RANGE:
+                                setRange((TypeReference)newValue);
+                                return;
+                }
+                super.eSet(featureID, newValue);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void eUnset(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.VARIABLE__RANGE:
+                                setRange((TypeReference)null);
+                                return;
+                }
+                super.eUnset(featureID);
+        }
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public boolean eIsSet(int featureID) {
+                switch (featureID) {
+                        case LogiclanguagePackage.VARIABLE__RANGE:
+                                return range != null;
+                }
+                return super.eIsSet(featureID);
+        }
+} //VariableImpl
author	OszkarSemerath <oszka@152.66.252.189>	2017-06-10 19:05:05 +0200
committer	OszkarSemerath <oszka@152.66.252.189>	2017-06-10 19:05:05 +0200
commit	60f01f46ba232ed6416054f0a6115cb2a9b70b4e (patch)
tree	5edf8aeb07abc51f3fec63bbd15c926e1de09552 /Framework/hu.bme.mit.inf.dslreasoner.logic.model/ecore-gen/hu/bme/mit/inf/dslreasoner/logic/model/logiclanguage/impl
parent	Initial commit, migrating from SVN (diff)
download	VIATRA-Generator-60f01f46ba232ed6416054f0a6115cb2a9b70b4e.tar.gz VIATRA-Generator-60f01f46ba232ed6416054f0a6115cb2a9b70b4e.tar.zst VIATRA-Generator-60f01f46ba232ed6416054f0a6115cb2a9b70b4e.zip