updated contral lang classes

.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>HintCOProject</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

HintCO/examples/case_study_double_loop_better_proactive.xmi

@@ -48,7 +48,7 @@
           declaration="//@csuDeclarations.1/@ports.2"
           valueFrom="//@candidates.0/@cosimunits.0/@ports.1">
         <adaptation
-            xsi:type="hintco:InterpolationAdaptation"/>
+            xsi:type="hintco:ExtrapolationAdaptation"/>
       </ports>
       <ports
           xsi:type="hintco:OutputPortInstance"

HintCO/src/ua/ansymo/hintco/ModelStorage.xtend

@@ -35,8 +35,9 @@ class ModelStorage {
 	}
 	
 	def doContractEMFSetup() {
-		if (!EPackage.Registry.INSTANCE.containsKey("http://www.uantwerpen.be/cosys/ContractLang")) {
-			EPackage.Registry.INSTANCE.put("http://www.uantwerpen.be/cosys/ContractLang", ContractLangPackage.eINSTANCE);
+		val reg = EPackage.Registry.INSTANCE
+		if (!reg.containsKey(ContractLangPackage.eNS_URI)) {
+			reg.put(ContractLangPackage.eNS_URI, ContractLangPackage.eINSTANCE);
 		}
 	}
 	

be.uantwerpen.cosys.ContractLang/build.properties

@@ -3,7 +3,9 @@
 bin.includes = .,\
                META-INF/,\
                plugin.xml,\
-               plugin.properties
+               plugin.properties,\
+               src/,\
+               bin/
 jars.compile.order = .
-source.. = src-gen/
+source.. = src/
 output.. = bin/

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/AbsencePattern.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Absence Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.AbsencePattern#getTime <em>Time</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAbsencePattern()
- * @model
- * @generated
- */
-public interface AbsencePattern extends Occurrence {
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAbsencePattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AbsencePattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-} // AbsencePattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Absence Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.AbsencePattern#getTime <em>Time</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAbsencePattern()
+ * @model
+ * @generated
+ */
+public interface AbsencePattern extends Occurrence
+{
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAbsencePattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AbsencePattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+} // AbsencePattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/AbsoluteValue.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Absolute Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.AbsoluteValue#getVar <em>Var</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAbsoluteValue()
- * @model
- * @generated
- */
-public interface AbsoluteValue extends VarOrVarOp {
-	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Var</em>' containment reference.
-	 * @see #setVar(VarOrVarOp)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAbsoluteValue_Var()
-	 * @model containment="true"
-	 * @generated
-	 */
-	VarOrVarOp getVar();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AbsoluteValue#getVar <em>Var</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Var</em>' containment reference.
-	 * @see #getVar()
-	 * @generated
-	 */
-	void setVar(VarOrVarOp value);
-
-} // AbsoluteValue
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Absolute Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.AbsoluteValue#getVar <em>Var</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAbsoluteValue()
+ * @model
+ * @generated
+ */
+public interface AbsoluteValue extends VarOrVarOp
+{
+  /**
+   * Returns the value of the '<em><b>Var</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Var</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Var</em>' containment reference.
+   * @see #setVar(VarOrVarOp)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAbsoluteValue_Var()
+   * @model containment="true"
+   * @generated
+   */
+  VarOrVarOp getVar();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AbsoluteValue#getVar <em>Var</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Var</em>' containment reference.
+   * @see #getVar()
+   * @generated
+   */
+  void setVar(VarOrVarOp value);
+
+} // AbsoluteValue

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Action.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Action</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAction()
- * @model
- * @generated
- */
-public interface Action extends EObject {
-} // Action
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Action</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAction()
+ * @model
+ * @generated
+ */
+public interface Action extends EObject
+{
+} // Action

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/AfterScope.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>After Scope</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.AfterScope#getEvent <em>Event</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterScope()
- * @model
- * @generated
- */
-public interface AfterScope extends Scope {
-	/**
-	 * Returns the value of the '<em><b>Event</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Event</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Event</em>' reference.
-	 * @see #setEvent(Event)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterScope_Event()
-	 * @model
-	 * @generated
-	 */
-	Event getEvent();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AfterScope#getEvent <em>Event</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Event</em>' reference.
-	 * @see #getEvent()
-	 * @generated
-	 */
-	void setEvent(Event value);
-
-} // AfterScope
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>After Scope</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.AfterScope#getEvent <em>Event</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterScope()
+ * @model
+ * @generated
+ */
+public interface AfterScope extends Scope
+{
+  /**
+   * Returns the value of the '<em><b>Event</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Event</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Event</em>' reference.
+   * @see #setEvent(Event)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterScope_Event()
+   * @model
+   * @generated
+   */
+  Event getEvent();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AfterScope#getEvent <em>Event</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Event</em>' reference.
+   * @see #getEvent()
+   * @generated
+   */
+  void setEvent(Event value);
+
+} // AfterScope

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/AfterUntilScope.java

@@ -1,77 +1,78 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>After Until Scope</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.AfterUntilScope#getFirst <em>First</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.AfterUntilScope#getSecond <em>Second</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterUntilScope()
- * @model
- * @generated
- */
-public interface AfterUntilScope extends Scope {
-	/**
-	 * Returns the value of the '<em><b>First</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First</em>' reference.
-	 * @see #setFirst(Event)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterUntilScope_First()
-	 * @model
-	 * @generated
-	 */
-	Event getFirst();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AfterUntilScope#getFirst <em>First</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First</em>' reference.
-	 * @see #getFirst()
-	 * @generated
-	 */
-	void setFirst(Event value);
-
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' reference.
-	 * @see #setSecond(Event)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterUntilScope_Second()
-	 * @model
-	 * @generated
-	 */
-	Event getSecond();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AfterUntilScope#getSecond <em>Second</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' reference.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	void setSecond(Event value);
-
-} // AfterUntilScope
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>After Until Scope</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.AfterUntilScope#getFirst <em>First</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.AfterUntilScope#getSecond <em>Second</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterUntilScope()
+ * @model
+ * @generated
+ */
+public interface AfterUntilScope extends Scope
+{
+  /**
+   * Returns the value of the '<em><b>First</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>First</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>First</em>' reference.
+   * @see #setFirst(Event)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterUntilScope_First()
+   * @model
+   * @generated
+   */
+  Event getFirst();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AfterUntilScope#getFirst <em>First</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>First</em>' reference.
+   * @see #getFirst()
+   * @generated
+   */
+  void setFirst(Event value);
+
+  /**
+   * Returns the value of the '<em><b>Second</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Second</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Second</em>' reference.
+   * @see #setSecond(Event)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAfterUntilScope_Second()
+   * @model
+   * @generated
+   */
+  Event getSecond();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AfterUntilScope#getSecond <em>Second</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Second</em>' reference.
+   * @see #getSecond()
+   * @generated
+   */
+  void setSecond(Event value);
+
+} // AfterUntilScope

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/AndExpression.java

@@ -1,77 +1,78 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>And Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.AndExpression#getArg0 <em>Arg0</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.AndExpression#getArg1 <em>Arg1</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAndExpression()
- * @model
- * @generated
- */
-public interface AndExpression extends Expression {
-	/**
-	 * Returns the value of the '<em><b>Arg0</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Arg0</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Arg0</em>' containment reference.
-	 * @see #setArg0(Expression)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAndExpression_Arg0()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Expression getArg0();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AndExpression#getArg0 <em>Arg0</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Arg0</em>' containment reference.
-	 * @see #getArg0()
-	 * @generated
-	 */
-	void setArg0(Expression value);
-
-	/**
-	 * Returns the value of the '<em><b>Arg1</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Arg1</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Arg1</em>' containment reference.
-	 * @see #setArg1(Expression)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAndExpression_Arg1()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Expression getArg1();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AndExpression#getArg1 <em>Arg1</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Arg1</em>' containment reference.
-	 * @see #getArg1()
-	 * @generated
-	 */
-	void setArg1(Expression value);
-
-} // AndExpression
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>And Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.AndExpression#getArg0 <em>Arg0</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.AndExpression#getArg1 <em>Arg1</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAndExpression()
+ * @model
+ * @generated
+ */
+public interface AndExpression extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Arg0</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Arg0</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Arg0</em>' containment reference.
+   * @see #setArg0(Expression)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAndExpression_Arg0()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getArg0();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AndExpression#getArg0 <em>Arg0</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Arg0</em>' containment reference.
+   * @see #getArg0()
+   * @generated
+   */
+  void setArg0(Expression value);
+
+  /**
+   * Returns the value of the '<em><b>Arg1</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Arg1</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Arg1</em>' containment reference.
+   * @see #setArg1(Expression)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAndExpression_Arg1()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getArg1();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AndExpression#getArg1 <em>Arg1</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Arg1</em>' containment reference.
+   * @see #getArg1()
+   * @generated
+   */
+  void setArg1(Expression value);
+
+} // AndExpression

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/AssignAction.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Assign Action</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.AssignAction#getVar <em>Var</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAssignAction()
- * @model
- * @generated
- */
-public interface AssignAction extends Action {
-	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Var</em>' containment reference.
-	 * @see #setVar(VarOrVarOp)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAssignAction_Var()
-	 * @model containment="true"
-	 * @generated
-	 */
-	VarOrVarOp getVar();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AssignAction#getVar <em>Var</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Var</em>' containment reference.
-	 * @see #getVar()
-	 * @generated
-	 */
-	void setVar(VarOrVarOp value);
-
-} // AssignAction
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Assign Action</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.AssignAction#getVar <em>Var</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAssignAction()
+ * @model
+ * @generated
+ */
+public interface AssignAction extends Action
+{
+  /**
+   * Returns the value of the '<em><b>Var</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Var</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Var</em>' containment reference.
+   * @see #setVar(VarOrVarOp)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAssignAction_Var()
+   * @model containment="true"
+   * @generated
+   */
+  VarOrVarOp getVar();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.AssignAction#getVar <em>Var</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Var</em>' containment reference.
+   * @see #getVar()
+   * @generated
+   */
+  void setVar(VarOrVarOp value);
+
+} // AssignAction

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Average.java

@@ -1,77 +1,78 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Average</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Average#getVar <em>Var</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Average#getDuration <em>Duration</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAverage()
- * @model
- * @generated
- */
-public interface Average extends VarOrVarOp {
-	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Var</em>' containment reference.
-	 * @see #setVar(VarOrVarOp)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAverage_Var()
-	 * @model containment="true"
-	 * @generated
-	 */
-	VarOrVarOp getVar();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Average#getVar <em>Var</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Var</em>' containment reference.
-	 * @see #getVar()
-	 * @generated
-	 */
-	void setVar(VarOrVarOp value);
-
-	/**
-	 * Returns the value of the '<em><b>Duration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Duration</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Duration</em>' containment reference.
-	 * @see #setDuration(SingleTime)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAverage_Duration()
-	 * @model containment="true"
-	 * @generated
-	 */
-	SingleTime getDuration();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Average#getDuration <em>Duration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration</em>' containment reference.
-	 * @see #getDuration()
-	 * @generated
-	 */
-	void setDuration(SingleTime value);
-
-} // Average
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Average</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Average#getVar <em>Var</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Average#getDuration <em>Duration</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAverage()
+ * @model
+ * @generated
+ */
+public interface Average extends VarOrVarOp
+{
+  /**
+   * Returns the value of the '<em><b>Var</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Var</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Var</em>' containment reference.
+   * @see #setVar(VarOrVarOp)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAverage_Var()
+   * @model containment="true"
+   * @generated
+   */
+  VarOrVarOp getVar();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Average#getVar <em>Var</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Var</em>' containment reference.
+   * @see #getVar()
+   * @generated
+   */
+  void setVar(VarOrVarOp value);
+
+  /**
+   * Returns the value of the '<em><b>Duration</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Duration</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Duration</em>' containment reference.
+   * @see #setDuration(SingleTime)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getAverage_Duration()
+   * @model containment="true"
+   * @generated
+   */
+  SingleTime getDuration();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Average#getDuration <em>Duration</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Duration</em>' containment reference.
+   * @see #getDuration()
+   * @generated
+   */
+  void setDuration(SingleTime value);
+
+} // Average

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/BeforeScope.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Before Scope</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.BeforeScope#getEvent <em>Event</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBeforeScope()
- * @model
- * @generated
- */
-public interface BeforeScope extends Scope {
-	/**
-	 * Returns the value of the '<em><b>Event</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Event</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Event</em>' reference.
-	 * @see #setEvent(Event)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBeforeScope_Event()
-	 * @model
-	 * @generated
-	 */
-	Event getEvent();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BeforeScope#getEvent <em>Event</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Event</em>' reference.
-	 * @see #getEvent()
-	 * @generated
-	 */
-	void setEvent(Event value);
-
-} // BeforeScope
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Before Scope</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.BeforeScope#getEvent <em>Event</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBeforeScope()
+ * @model
+ * @generated
+ */
+public interface BeforeScope extends Scope
+{
+  /**
+   * Returns the value of the '<em><b>Event</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Event</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Event</em>' reference.
+   * @see #setEvent(Event)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBeforeScope_Event()
+   * @model
+   * @generated
+   */
+  Event getEvent();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BeforeScope#getEvent <em>Event</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Event</em>' reference.
+   * @see #getEvent()
+   * @generated
+   */
+  void setEvent(Event value);
+
+} // BeforeScope

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/BetweenScope.java

@@ -1,77 +1,78 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Between Scope</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.BetweenScope#getFirst <em>First</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.BetweenScope#getSecond <em>Second</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBetweenScope()
- * @model
- * @generated
- */
-public interface BetweenScope extends Scope {
-	/**
-	 * Returns the value of the '<em><b>First</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First</em>' reference.
-	 * @see #setFirst(Event)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBetweenScope_First()
-	 * @model
-	 * @generated
-	 */
-	Event getFirst();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BetweenScope#getFirst <em>First</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First</em>' reference.
-	 * @see #getFirst()
-	 * @generated
-	 */
-	void setFirst(Event value);
-
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' reference.
-	 * @see #setSecond(Event)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBetweenScope_Second()
-	 * @model
-	 * @generated
-	 */
-	Event getSecond();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BetweenScope#getSecond <em>Second</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' reference.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	void setSecond(Event value);
-
-} // BetweenScope
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Between Scope</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.BetweenScope#getFirst <em>First</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.BetweenScope#getSecond <em>Second</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBetweenScope()
+ * @model
+ * @generated
+ */
+public interface BetweenScope extends Scope
+{
+  /**
+   * Returns the value of the '<em><b>First</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>First</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>First</em>' reference.
+   * @see #setFirst(Event)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBetweenScope_First()
+   * @model
+   * @generated
+   */
+  Event getFirst();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BetweenScope#getFirst <em>First</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>First</em>' reference.
+   * @see #getFirst()
+   * @generated
+   */
+  void setFirst(Event value);
+
+  /**
+   * Returns the value of the '<em><b>Second</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Second</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Second</em>' reference.
+   * @see #setSecond(Event)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBetweenScope_Second()
+   * @model
+   * @generated
+   */
+  Event getSecond();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BetweenScope#getSecond <em>Second</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Second</em>' reference.
+   * @see #getSecond()
+   * @generated
+   */
+  void setSecond(Event value);
+
+} // BetweenScope

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/BoundedExistencePattern.java

@@ -1,77 +1,78 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bounded Existence Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.BoundedExistencePattern#getN <em>N</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.BoundedExistencePattern#getTime <em>Time</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBoundedExistencePattern()
- * @model
- * @generated
- */
-public interface BoundedExistencePattern extends Occurrence {
-	/**
-	 * Returns the value of the '<em><b>N</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>N</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>N</em>' attribute.
-	 * @see #setN(int)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBoundedExistencePattern_N()
-	 * @model
-	 * @generated
-	 */
-	int getN();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BoundedExistencePattern#getN <em>N</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>N</em>' attribute.
-	 * @see #getN()
-	 * @generated
-	 */
-	void setN(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBoundedExistencePattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BoundedExistencePattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-} // BoundedExistencePattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Bounded Existence Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.BoundedExistencePattern#getN <em>N</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.BoundedExistencePattern#getTime <em>Time</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBoundedExistencePattern()
+ * @model
+ * @generated
+ */
+public interface BoundedExistencePattern extends Occurrence
+{
+  /**
+   * Returns the value of the '<em><b>N</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>N</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>N</em>' attribute.
+   * @see #setN(int)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBoundedExistencePattern_N()
+   * @model
+   * @generated
+   */
+  int getN();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BoundedExistencePattern#getN <em>N</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>N</em>' attribute.
+   * @see #getN()
+   * @generated
+   */
+  void setN(int value);
+
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getBoundedExistencePattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.BoundedExistencePattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+} // BoundedExistencePattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Constraint.java

@@ -1,51 +1,52 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Constraint#getStatement <em>Statement</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getConstraint()
- * @model
- * @generated
- */
-public interface Constraint extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statement</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statement</em>' reference.
-	 * @see #setStatement(Statement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getConstraint_Statement()
-	 * @model
-	 * @generated
-	 */
-	Statement getStatement();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Constraint#getStatement <em>Statement</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Statement</em>' reference.
-	 * @see #getStatement()
-	 * @generated
-	 */
-	void setStatement(Statement value);
-
-} // Constraint
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Constraint</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Constraint#getStatement <em>Statement</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getConstraint()
+ * @model
+ * @generated
+ */
+public interface Constraint extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Statement</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statement</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statement</em>' reference.
+   * @see #setStatement(Statement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getConstraint_Statement()
+   * @model
+   * @generated
+   */
+  Statement getStatement();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Constraint#getStatement <em>Statement</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Statement</em>' reference.
+   * @see #getStatement()
+   * @generated
+   */
+  void setStatement(Statement value);
+
+} // Constraint

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Contract.java

@@ -1,178 +1,179 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Contract</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getName <em>Name</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getDescription <em>Description</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getStatements <em>Statements</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getScope <em>Scope</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getPattern <em>Pattern</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getAction <em>Action</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract()
- * @model
- * @generated
- */
-public interface Contract extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Statements</b></em>' containment reference list.
-	 * The list contents are of type {@link be.uantwerpen.cosys.contractLang.Statement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statements</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statements</em>' containment reference list.
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Statements()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Statement> getStatements();
-
-	/**
-	 * Returns the value of the '<em><b>Scope</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Scope</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Scope</em>' containment reference.
-	 * @see #setScope(Scope)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Scope()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Scope getScope();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getScope <em>Scope</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Scope</em>' containment reference.
-	 * @see #getScope()
-	 * @generated
-	 */
-	void setScope(Scope value);
-
-	/**
-	 * Returns the value of the '<em><b>Pattern</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pattern</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pattern</em>' containment reference.
-	 * @see #setPattern(Pattern)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Pattern()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Pattern getPattern();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getPattern <em>Pattern</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Pattern</em>' containment reference.
-	 * @see #getPattern()
-	 * @generated
-	 */
-	void setPattern(Pattern value);
-
-	/**
-	 * Returns the value of the '<em><b>Action</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Action</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Action</em>' containment reference.
-	 * @see #setAction(Action)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Action()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Action getAction();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getAction <em>Action</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Action</em>' containment reference.
-	 * @see #getAction()
-	 * @generated
-	 */
-	void setAction(Action value);
-
-} // Contract
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Contract</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getName <em>Name</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getDescription <em>Description</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getStatements <em>Statements</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getScope <em>Scope</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getPattern <em>Pattern</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Contract#getAction <em>Action</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract()
+ * @model
+ * @generated
+ */
+public interface Contract extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Name()
+   * @model
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Description</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Description</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Description</em>' attribute.
+   * @see #setDescription(String)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Description()
+   * @model
+   * @generated
+   */
+  String getDescription();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getDescription <em>Description</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Description</em>' attribute.
+   * @see #getDescription()
+   * @generated
+   */
+  void setDescription(String value);
+
+  /**
+   * Returns the value of the '<em><b>Statements</b></em>' containment reference list.
+   * The list contents are of type {@link be.uantwerpen.cosys.contractLang.Statement}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statements</em>' containment reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statements</em>' containment reference list.
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Statements()
+   * @model containment="true"
+   * @generated
+   */
+  EList<Statement> getStatements();
+
+  /**
+   * Returns the value of the '<em><b>Scope</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Scope</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Scope</em>' containment reference.
+   * @see #setScope(Scope)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Scope()
+   * @model containment="true"
+   * @generated
+   */
+  Scope getScope();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getScope <em>Scope</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Scope</em>' containment reference.
+   * @see #getScope()
+   * @generated
+   */
+  void setScope(Scope value);
+
+  /**
+   * Returns the value of the '<em><b>Pattern</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Pattern</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Pattern</em>' containment reference.
+   * @see #setPattern(Pattern)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Pattern()
+   * @model containment="true"
+   * @generated
+   */
+  Pattern getPattern();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getPattern <em>Pattern</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Pattern</em>' containment reference.
+   * @see #getPattern()
+   * @generated
+   */
+  void setPattern(Pattern value);
+
+  /**
+   * Returns the value of the '<em><b>Action</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Action</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Action</em>' containment reference.
+   * @see #setAction(Action)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContract_Action()
+   * @model containment="true"
+   * @generated
+   */
+  Action getAction();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Contract#getAction <em>Action</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Action</em>' containment reference.
+   * @see #getAction()
+   * @generated
+   */
+  void setAction(Action value);
+
+} // Contract

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ContractRef.java

@@ -1,51 +1,52 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Contract Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ContractRef#getContract <em>Contract</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractRef()
- * @model
- * @generated
- */
-public interface ContractRef extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Contract</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Contract</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contract</em>' reference.
-	 * @see #setContract(Contract)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractRef_Contract()
-	 * @model
-	 * @generated
-	 */
-	Contract getContract();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ContractRef#getContract <em>Contract</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Contract</em>' reference.
-	 * @see #getContract()
-	 * @generated
-	 */
-	void setContract(Contract value);
-
-} // ContractRef
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Contract Ref</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ContractRef#getContract <em>Contract</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractRef()
+ * @model
+ * @generated
+ */
+public interface ContractRef extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Contract</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Contract</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Contract</em>' reference.
+   * @see #setContract(Contract)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractRef_Contract()
+   * @model
+   * @generated
+   */
+  Contract getContract();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ContractRef#getContract <em>Contract</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Contract</em>' reference.
+   * @see #getContract()
+   * @generated
+   */
+  void setContract(Contract value);
+
+} // ContractRef

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ContractSet.java

@@ -1,70 +1,71 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Contract Set</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ContractSet#getName <em>Name</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ContractSet#getContracts <em>Contracts</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractSet()
- * @model
- * @generated
- */
-public interface ContractSet extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractSet_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ContractSet#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Contracts</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Contracts</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contracts</em>' containment reference list.
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractSet_Contracts()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<EObject> getContracts();
-
-} // ContractSet
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Contract Set</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ContractSet#getName <em>Name</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ContractSet#getContracts <em>Contracts</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractSet()
+ * @model
+ * @generated
+ */
+public interface ContractSet extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractSet_Name()
+   * @model
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ContractSet#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Contracts</b></em>' containment reference list.
+   * The list contents are of type {@link org.eclipse.emf.ecore.EObject}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Contracts</em>' containment reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Contracts</em>' containment reference list.
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getContractSet_Contracts()
+   * @model containment="true"
+   * @generated
+   */
+  EList<EObject> getContracts();
+
+} // ContractSet

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Derivative.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Derivative</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Derivative#getVar <em>Var</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDerivative()
- * @model
- * @generated
- */
-public interface Derivative extends VarOrVarOp {
-	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Var</em>' containment reference.
-	 * @see #setVar(VarOrVarOp)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDerivative_Var()
-	 * @model containment="true"
-	 * @generated
-	 */
-	VarOrVarOp getVar();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Derivative#getVar <em>Var</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Var</em>' containment reference.
-	 * @see #getVar()
-	 * @generated
-	 */
-	void setVar(VarOrVarOp value);
-
-} // Derivative
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Derivative</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Derivative#getVar <em>Var</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDerivative()
+ * @model
+ * @generated
+ */
+public interface Derivative extends VarOrVarOp
+{
+  /**
+   * Returns the value of the '<em><b>Var</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Var</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Var</em>' containment reference.
+   * @see #setVar(VarOrVarOp)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDerivative_Var()
+   * @model containment="true"
+   * @generated
+   */
+  VarOrVarOp getVar();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Derivative#getVar <em>Var</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Var</em>' containment reference.
+   * @see #getVar()
+   * @generated
+   */
+  void setVar(VarOrVarOp value);
+
+} // Derivative

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Difference.java

@@ -1,77 +1,78 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Difference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Difference#getVar <em>Var</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Difference#getVar2 <em>Var2</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDifference()
- * @model
- * @generated
- */
-public interface Difference extends VarOrVarOp {
-	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Var</em>' containment reference.
-	 * @see #setVar(VarOrVarOp)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDifference_Var()
-	 * @model containment="true"
-	 * @generated
-	 */
-	VarOrVarOp getVar();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Difference#getVar <em>Var</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Var</em>' containment reference.
-	 * @see #getVar()
-	 * @generated
-	 */
-	void setVar(VarOrVarOp value);
-
-	/**
-	 * Returns the value of the '<em><b>Var2</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Var2</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Var2</em>' containment reference.
-	 * @see #setVar2(VarOrVarOp)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDifference_Var2()
-	 * @model containment="true"
-	 * @generated
-	 */
-	VarOrVarOp getVar2();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Difference#getVar2 <em>Var2</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Var2</em>' containment reference.
-	 * @see #getVar2()
-	 * @generated
-	 */
-	void setVar2(VarOrVarOp value);
-
-} // Difference
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Difference</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Difference#getVar <em>Var</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Difference#getVar2 <em>Var2</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDifference()
+ * @model
+ * @generated
+ */
+public interface Difference extends VarOrVarOp
+{
+  /**
+   * Returns the value of the '<em><b>Var</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Var</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Var</em>' containment reference.
+   * @see #setVar(VarOrVarOp)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDifference_Var()
+   * @model containment="true"
+   * @generated
+   */
+  VarOrVarOp getVar();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Difference#getVar <em>Var</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Var</em>' containment reference.
+   * @see #getVar()
+   * @generated
+   */
+  void setVar(VarOrVarOp value);
+
+  /**
+   * Returns the value of the '<em><b>Var2</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Var2</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Var2</em>' containment reference.
+   * @see #setVar2(VarOrVarOp)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDifference_Var2()
+   * @model containment="true"
+   * @generated
+   */
+  VarOrVarOp getVar2();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Difference#getVar2 <em>Var2</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Var2</em>' containment reference.
+   * @see #getVar2()
+   * @generated
+   */
+  void setVar2(VarOrVarOp value);
+
+} // Difference

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/DomainValue.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Domain Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDomainValue()
- * @model
- * @generated
- */
-public interface DomainValue extends Expression {
-} // DomainValue
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Domain Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getDomainValue()
+ * @model
+ * @generated
+ */
+public interface DomainValue extends Expression
+{
+} // DomainValue

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Equality.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Equality</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getEquality()
- * @model
- * @generated
- */
-public interface Equality extends Operator {
-} // Equality
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Equality</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getEquality()
+ * @model
+ * @generated
+ */
+public interface Equality extends Operator
+{
+} // Equality

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Event.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Event</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getEvent()
- * @model
- * @generated
- */
-public interface Event extends Statement {
-} // Event
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Event</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getEvent()
+ * @model
+ * @generated
+ */
+public interface Event extends Statement
+{
+} // Event

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ExistencePattern.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Existence Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ExistencePattern#getTime <em>Time</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getExistencePattern()
- * @model
- * @generated
- */
-public interface ExistencePattern extends Occurrence {
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getExistencePattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ExistencePattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-} // ExistencePattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Existence Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ExistencePattern#getTime <em>Time</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getExistencePattern()
+ * @model
+ * @generated
+ */
+public interface ExistencePattern extends Occurrence
+{
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getExistencePattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ExistencePattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+} // ExistencePattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Expression.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getExpression()
- * @model
- * @generated
- */
-public interface Expression extends EObject {
-} // Expression
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Expression</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getExpression()
+ * @model
+ * @generated
+ */
+public interface Expression extends EObject
+{
+} // Expression

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/FMUInstance.java

@@ -1,51 +1,52 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>FMU Instance</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.FMUInstance#getSignal <em>Signal</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUInstance()
- * @model
- * @generated
- */
-public interface FMUInstance extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Signal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Signal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Signal</em>' attribute.
-	 * @see #setSignal(String)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUInstance_Signal()
-	 * @model
-	 * @generated
-	 */
-	String getSignal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FMUInstance#getSignal <em>Signal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Signal</em>' attribute.
-	 * @see #getSignal()
-	 * @generated
-	 */
-	void setSignal(String value);
-
-} // FMUInstance
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>FMU Instance</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.FMUInstance#getSignal <em>Signal</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUInstance()
+ * @model
+ * @generated
+ */
+public interface FMUInstance extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Signal</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Signal</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Signal</em>' attribute.
+   * @see #setSignal(String)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUInstance_Signal()
+   * @model
+   * @generated
+   */
+  String getSignal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FMUInstance#getSignal <em>Signal</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Signal</em>' attribute.
+   * @see #getSignal()
+   * @generated
+   */
+  void setSignal(String value);
+
+} // FMUInstance

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/FMUProperty.java

@@ -1,80 +1,81 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>FMU Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.FMUProperty#getFmu <em>Fmu</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.FMUProperty#getProperty <em>Property</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUProperty()
- * @model
- * @generated
- */
-public interface FMUProperty extends Variable {
-	/**
-	 * Returns the value of the '<em><b>Fmu</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Fmu</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fmu</em>' containment reference.
-	 * @see #setFmu(FMUInstance)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUProperty_Fmu()
-	 * @model containment="true"
-	 * @generated
-	 */
-	FMUInstance getFmu();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FMUProperty#getFmu <em>Fmu</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fmu</em>' containment reference.
-	 * @see #getFmu()
-	 * @generated
-	 */
-	void setFmu(FMUInstance value);
-
-	/**
-	 * Returns the value of the '<em><b>Property</b></em>' attribute.
-	 * The literals are from the enumeration {@link be.uantwerpen.cosys.contractLang.FMUPropertyEnum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Property</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Property</em>' attribute.
-	 * @see be.uantwerpen.cosys.contractLang.FMUPropertyEnum
-	 * @see #setProperty(FMUPropertyEnum)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUProperty_Property()
-	 * @model
-	 * @generated
-	 */
-	FMUPropertyEnum getProperty();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FMUProperty#getProperty <em>Property</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Property</em>' attribute.
-	 * @see be.uantwerpen.cosys.contractLang.FMUPropertyEnum
-	 * @see #getProperty()
-	 * @generated
-	 */
-	void setProperty(FMUPropertyEnum value);
-
-} // FMUProperty
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>FMU Property</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.FMUProperty#getFmu <em>Fmu</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.FMUProperty#getProperty <em>Property</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUProperty()
+ * @model
+ * @generated
+ */
+public interface FMUProperty extends Variable
+{
+  /**
+   * Returns the value of the '<em><b>Fmu</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Fmu</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Fmu</em>' containment reference.
+   * @see #setFmu(FMUInstance)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUProperty_Fmu()
+   * @model containment="true"
+   * @generated
+   */
+  FMUInstance getFmu();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FMUProperty#getFmu <em>Fmu</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Fmu</em>' containment reference.
+   * @see #getFmu()
+   * @generated
+   */
+  void setFmu(FMUInstance value);
+
+  /**
+   * Returns the value of the '<em><b>Property</b></em>' attribute.
+   * The literals are from the enumeration {@link be.uantwerpen.cosys.contractLang.FMUPropertyEnum}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Property</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Property</em>' attribute.
+   * @see be.uantwerpen.cosys.contractLang.FMUPropertyEnum
+   * @see #setProperty(FMUPropertyEnum)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUProperty_Property()
+   * @model
+   * @generated
+   */
+  FMUPropertyEnum getProperty();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FMUProperty#getProperty <em>Property</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Property</em>' attribute.
+   * @see be.uantwerpen.cosys.contractLang.FMUPropertyEnum
+   * @see #getProperty()
+   * @generated
+   */
+  void setProperty(FMUPropertyEnum value);
+
+} // FMUProperty

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/FMUPropertyEnum.java

@@ -1,215 +1,233 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>FMU Property Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUPropertyEnum()
- * @model
- * @generated
- */
-public enum FMUPropertyEnum implements Enumerator {
-	/**
-	 * The '<em><b>EXEC RATE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EXEC_RATE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	EXEC_RATE(0, "EXEC_RATE", "exec_rate"),
-
-	/**
-	 * The '<em><b>IS PHYSICAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #IS_PHYSICAL_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	IS_PHYSICAL(1, "IS_PHYSICAL", "is_physical");
-
-	/**
-	 * The '<em><b>EXEC RATE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>EXEC RATE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EXEC_RATE
-	 * @model literal="exec_rate"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EXEC_RATE_VALUE = 0;
-
-	/**
-	 * The '<em><b>IS PHYSICAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>IS PHYSICAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #IS_PHYSICAL
-	 * @model literal="is_physical"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int IS_PHYSICAL_VALUE = 1;
-
-	/**
-	 * An array of all the '<em><b>FMU Property Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final FMUPropertyEnum[] VALUES_ARRAY =
-		new FMUPropertyEnum[] {
-			EXEC_RATE,
-			IS_PHYSICAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>FMU Property Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<FMUPropertyEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>FMU Property Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static FMUPropertyEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FMUPropertyEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>FMU Property Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static FMUPropertyEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FMUPropertyEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>FMU Property Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static FMUPropertyEnum get(int value) {
-		switch (value) {
-			case EXEC_RATE_VALUE: return EXEC_RATE;
-			case IS_PHYSICAL_VALUE: return IS_PHYSICAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private FMUPropertyEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //FMUPropertyEnum
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>FMU Property Enum</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUPropertyEnum()
+ * @model
+ * @generated
+ */
+public enum FMUPropertyEnum implements Enumerator
+{
+  /**
+   * The '<em><b>EXEC RATE</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #EXEC_RATE_VALUE
+   * @generated
+   * @ordered
+   */
+  EXEC_RATE(0, "EXEC_RATE", "exec_rate"),
+
+  /**
+   * The '<em><b>IS PHYSICAL</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #IS_PHYSICAL_VALUE
+   * @generated
+   * @ordered
+   */
+  IS_PHYSICAL(1, "IS_PHYSICAL", "is_physical");
+
+  /**
+   * The '<em><b>EXEC RATE</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>EXEC RATE</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #EXEC_RATE
+   * @model literal="exec_rate"
+   * @generated
+   * @ordered
+   */
+  public static final int EXEC_RATE_VALUE = 0;
+
+  /**
+   * The '<em><b>IS PHYSICAL</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>IS PHYSICAL</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #IS_PHYSICAL
+   * @model literal="is_physical"
+   * @generated
+   * @ordered
+   */
+  public static final int IS_PHYSICAL_VALUE = 1;
+
+  /**
+   * An array of all the '<em><b>FMU Property Enum</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static final FMUPropertyEnum[] VALUES_ARRAY =
+    new FMUPropertyEnum[]
+    {
+      EXEC_RATE,
+      IS_PHYSICAL,
+    };
+
+  /**
+   * A public read-only list of all the '<em><b>FMU Property Enum</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final List<FMUPropertyEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+  /**
+   * Returns the '<em><b>FMU Property Enum</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static FMUPropertyEnum get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      FMUPropertyEnum result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns the '<em><b>FMU Property Enum</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static FMUPropertyEnum getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      FMUPropertyEnum result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns the '<em><b>FMU Property Enum</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static FMUPropertyEnum get(int value)
+  {
+    switch (value)
+    {
+      case EXEC_RATE_VALUE: return EXEC_RATE;
+      case IS_PHYSICAL_VALUE: return IS_PHYSICAL;
+    }
+    return null;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final int value;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String name;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String literal;
+
+  /**
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private FMUPropertyEnum(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getLiteral()
+  {
+    return literal;
+  }
+
+  /**
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+  
+} //FMUPropertyEnum

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/FMUSignal.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>FMU Signal</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.FMUSignal#getSignal <em>Signal</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUSignal()
- * @model
- * @generated
- */
-public interface FMUSignal extends Variable {
-	/**
-	 * Returns the value of the '<em><b>Signal</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Signal</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Signal</em>' attribute.
-	 * @see #setSignal(String)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUSignal_Signal()
-	 * @model
-	 * @generated
-	 */
-	String getSignal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FMUSignal#getSignal <em>Signal</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Signal</em>' attribute.
-	 * @see #getSignal()
-	 * @generated
-	 */
-	void setSignal(String value);
-
-} // FMUSignal
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>FMU Signal</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.FMUSignal#getSignal <em>Signal</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUSignal()
+ * @model
+ * @generated
+ */
+public interface FMUSignal extends Variable
+{
+  /**
+   * Returns the value of the '<em><b>Signal</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Signal</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Signal</em>' attribute.
+   * @see #setSignal(String)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFMUSignal_Signal()
+   * @model
+   * @generated
+   */
+  String getSignal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FMUSignal#getSignal <em>Signal</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Signal</em>' attribute.
+   * @see #getSignal()
+   * @generated
+   */
+  void setSignal(String value);
+
+} // FMUSignal

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/False.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>False</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFalse()
- * @model
- * @generated
- */
-public interface False extends Expression, Value {
-} // False
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>False</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFalse()
+ * @model
+ * @generated
+ */
+public interface False extends Expression, Value
+{
+} // False

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/FloatValue.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Float Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.FloatValue#getVal <em>Val</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFloatValue()
- * @model
- * @generated
- */
-public interface FloatValue extends Expression, NumValue, Value {
-	/**
-	 * Returns the value of the '<em><b>Val</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Val</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Val</em>' attribute.
-	 * @see #setVal(double)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFloatValue_Val()
-	 * @model
-	 * @generated
-	 */
-	double getVal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FloatValue#getVal <em>Val</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Val</em>' attribute.
-	 * @see #getVal()
-	 * @generated
-	 */
-	void setVal(double value);
-
-} // FloatValue
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Float Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.FloatValue#getVal <em>Val</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFloatValue()
+ * @model
+ * @generated
+ */
+public interface FloatValue extends Expression, NumValue, Value
+{
+  /**
+   * Returns the value of the '<em><b>Val</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Val</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Val</em>' attribute.
+   * @see #setVal(double)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFloatValue_Val()
+   * @model
+   * @generated
+   */
+  double getVal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.FloatValue#getVal <em>Val</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Val</em>' attribute.
+   * @see #getVal()
+   * @generated
+   */
+  void setVal(double value);
+
+} // FloatValue

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Frequency.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Frequency</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFrequency()
- * @model
- * @generated
- */
-public interface Frequency extends Unit {
-} // Frequency
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Frequency</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getFrequency()
+ * @model
+ * @generated
+ */
+public interface Frequency extends Unit
+{
+} // Frequency

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/GloballyScope.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Globally Scope</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getGloballyScope()
- * @model
- * @generated
- */
-public interface GloballyScope extends Scope {
-} // GloballyScope
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Globally Scope</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getGloballyScope()
+ * @model
+ * @generated
+ */
+public interface GloballyScope extends Scope
+{
+} // GloballyScope

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/GreaterThan.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Greater Than</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.GreaterThan#isEqualTo <em>Equal To</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getGreaterThan()
- * @model
- * @generated
- */
-public interface GreaterThan extends Operator {
-	/**
-	 * Returns the value of the '<em><b>Equal To</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Equal To</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Equal To</em>' attribute.
-	 * @see #setEqualTo(boolean)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getGreaterThan_EqualTo()
-	 * @model
-	 * @generated
-	 */
-	boolean isEqualTo();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.GreaterThan#isEqualTo <em>Equal To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Equal To</em>' attribute.
-	 * @see #isEqualTo()
-	 * @generated
-	 */
-	void setEqualTo(boolean value);
-
-} // GreaterThan
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Greater Than</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.GreaterThan#isEqualTo <em>Equal To</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getGreaterThan()
+ * @model
+ * @generated
+ */
+public interface GreaterThan extends Operator
+{
+  /**
+   * Returns the value of the '<em><b>Equal To</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Equal To</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Equal To</em>' attribute.
+   * @see #setEqualTo(boolean)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getGreaterThan_EqualTo()
+   * @model
+   * @generated
+   */
+  boolean isEqualTo();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.GreaterThan#isEqualTo <em>Equal To</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Equal To</em>' attribute.
+   * @see #isEqualTo()
+   * @generated
+   */
+  void setEqualTo(boolean value);
+
+} // GreaterThan

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Infinity.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Infinity</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInfinity()
- * @model
- * @generated
- */
-public interface Infinity extends Expression, NumValue, Value {
-} // Infinity
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Infinity</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInfinity()
+ * @model
+ * @generated
+ */
+public interface Infinity extends Expression, NumValue, Value
+{
+} // Infinity

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/IntValue.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Int Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.IntValue#getVal <em>Val</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getIntValue()
- * @model
- * @generated
- */
-public interface IntValue extends Expression, NumValue, Value {
-	/**
-	 * Returns the value of the '<em><b>Val</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Val</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Val</em>' attribute.
-	 * @see #setVal(int)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getIntValue_Val()
-	 * @model
-	 * @generated
-	 */
-	int getVal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.IntValue#getVal <em>Val</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Val</em>' attribute.
-	 * @see #getVal()
-	 * @generated
-	 */
-	void setVal(int value);
-
-} // IntValue
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Int Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.IntValue#getVal <em>Val</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getIntValue()
+ * @model
+ * @generated
+ */
+public interface IntValue extends Expression, NumValue, Value
+{
+  /**
+   * Returns the value of the '<em><b>Val</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Val</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Val</em>' attribute.
+   * @see #setVal(int)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getIntValue_Val()
+   * @model
+   * @generated
+   */
+  int getVal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.IntValue#getVal <em>Val</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Val</em>' attribute.
+   * @see #getVal()
+   * @generated
+   */
+  void setVal(int value);
+
+} // IntValue

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Interval.java

@@ -1,158 +1,159 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Interval</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#isClosed_min <em>Closed min</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#isClosed_max <em>Closed max</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#getMin <em>Min</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#getMax <em>Max</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#getUnit <em>Unit</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval()
- * @model
- * @generated
- */
-public interface Interval extends Expression {
-	/**
-	 * Returns the value of the '<em><b>Closed min</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Closed min</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Closed min</em>' attribute.
-	 * @see #setClosed_min(boolean)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Closed_min()
-	 * @model
-	 * @generated
-	 */
-	boolean isClosed_min();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#isClosed_min <em>Closed min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Closed min</em>' attribute.
-	 * @see #isClosed_min()
-	 * @generated
-	 */
-	void setClosed_min(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Closed max</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Closed max</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Closed max</em>' attribute.
-	 * @see #setClosed_max(boolean)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Closed_max()
-	 * @model
-	 * @generated
-	 */
-	boolean isClosed_max();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#isClosed_max <em>Closed max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Closed max</em>' attribute.
-	 * @see #isClosed_max()
-	 * @generated
-	 */
-	void setClosed_max(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Min</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Min</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Min</em>' containment reference.
-	 * @see #setMin(Value)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Min()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Value getMin();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#getMin <em>Min</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Min</em>' containment reference.
-	 * @see #getMin()
-	 * @generated
-	 */
-	void setMin(Value value);
-
-	/**
-	 * Returns the value of the '<em><b>Max</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Max</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Max</em>' containment reference.
-	 * @see #setMax(Value)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Max()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Value getMax();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#getMax <em>Max</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Max</em>' containment reference.
-	 * @see #getMax()
-	 * @generated
-	 */
-	void setMax(Value value);
-
-	/**
-	 * Returns the value of the '<em><b>Unit</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unit</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unit</em>' containment reference.
-	 * @see #setUnit(Unit)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Unit()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Unit getUnit();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#getUnit <em>Unit</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unit</em>' containment reference.
-	 * @see #getUnit()
-	 * @generated
-	 */
-	void setUnit(Unit value);
-
-} // Interval
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Interval</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#isClosed_min <em>Closed min</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#isClosed_max <em>Closed max</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#getMin <em>Min</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#getMax <em>Max</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Interval#getUnit <em>Unit</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval()
+ * @model
+ * @generated
+ */
+public interface Interval extends Expression
+{
+  /**
+   * Returns the value of the '<em><b>Closed min</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Closed min</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Closed min</em>' attribute.
+   * @see #setClosed_min(boolean)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Closed_min()
+   * @model
+   * @generated
+   */
+  boolean isClosed_min();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#isClosed_min <em>Closed min</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Closed min</em>' attribute.
+   * @see #isClosed_min()
+   * @generated
+   */
+  void setClosed_min(boolean value);
+
+  /**
+   * Returns the value of the '<em><b>Closed max</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Closed max</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Closed max</em>' attribute.
+   * @see #setClosed_max(boolean)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Closed_max()
+   * @model
+   * @generated
+   */
+  boolean isClosed_max();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#isClosed_max <em>Closed max</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Closed max</em>' attribute.
+   * @see #isClosed_max()
+   * @generated
+   */
+  void setClosed_max(boolean value);
+
+  /**
+   * Returns the value of the '<em><b>Min</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Min</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Min</em>' containment reference.
+   * @see #setMin(Value)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Min()
+   * @model containment="true"
+   * @generated
+   */
+  Value getMin();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#getMin <em>Min</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Min</em>' containment reference.
+   * @see #getMin()
+   * @generated
+   */
+  void setMin(Value value);
+
+  /**
+   * Returns the value of the '<em><b>Max</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Max</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Max</em>' containment reference.
+   * @see #setMax(Value)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Max()
+   * @model containment="true"
+   * @generated
+   */
+  Value getMax();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#getMax <em>Max</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Max</em>' containment reference.
+   * @see #getMax()
+   * @generated
+   */
+  void setMax(Value value);
+
+  /**
+   * Returns the value of the '<em><b>Unit</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Unit</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Unit</em>' containment reference.
+   * @see #setUnit(Unit)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getInterval_Unit()
+   * @model containment="true"
+   * @generated
+   */
+  Unit getUnit();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Interval#getUnit <em>Unit</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Unit</em>' containment reference.
+   * @see #getUnit()
+   * @generated
+   */
+  void setUnit(Unit value);
+
+} // Interval

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/LOW_MED_HIGH.java

@@ -1,269 +1,287 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>LOW MED HIGH</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLOW_MED_HIGH()
- * @model
- * @generated
- */
-public enum LOW_MED_HIGH implements Enumerator {
-	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NONE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NONE(0, "NONE", "NONE"),
-
-	/**
-	 * The '<em><b>LOW</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LOW_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	LOW(1, "LOW", "LOW"),
-
-	/**
-	 * The '<em><b>MED</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MED(2, "MED", "MED"),
-
-	/**
-	 * The '<em><b>HIGH</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #HIGH_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	HIGH(3, "HIGH", "HIGH");
-
-	/**
-	 * The '<em><b>NONE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NONE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NONE_VALUE = 0;
-
-	/**
-	 * The '<em><b>LOW</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LOW</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LOW
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LOW_VALUE = 1;
-
-	/**
-	 * The '<em><b>MED</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>MED</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MED
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MED_VALUE = 2;
-
-	/**
-	 * The '<em><b>HIGH</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>HIGH</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #HIGH
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int HIGH_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>LOW MED HIGH</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final LOW_MED_HIGH[] VALUES_ARRAY =
-		new LOW_MED_HIGH[] {
-			NONE,
-			LOW,
-			MED,
-			HIGH,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>LOW MED HIGH</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<LOW_MED_HIGH> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>LOW MED HIGH</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param literal the literal.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static LOW_MED_HIGH get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LOW_MED_HIGH result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>LOW MED HIGH</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param name the name.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static LOW_MED_HIGH getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LOW_MED_HIGH result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>LOW MED HIGH</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the integer value.
-	 * @return the matching enumerator or <code>null</code>.
-	 * @generated
-	 */
-	public static LOW_MED_HIGH get(int value) {
-		switch (value) {
-			case NONE_VALUE: return NONE;
-			case LOW_VALUE: return LOW;
-			case MED_VALUE: return MED;
-			case HIGH_VALUE: return HIGH;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private LOW_MED_HIGH(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //LOW_MED_HIGH
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the literals of the enumeration '<em><b>LOW MED HIGH</b></em>',
+ * and utility methods for working with them.
+ * <!-- end-user-doc -->
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLOW_MED_HIGH()
+ * @model
+ * @generated
+ */
+public enum LOW_MED_HIGH implements Enumerator
+{
+  /**
+   * The '<em><b>NONE</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #NONE_VALUE
+   * @generated
+   * @ordered
+   */
+  NONE(0, "NONE", "NONE"),
+
+  /**
+   * The '<em><b>LOW</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #LOW_VALUE
+   * @generated
+   * @ordered
+   */
+  LOW(1, "LOW", "LOW"),
+
+  /**
+   * The '<em><b>MED</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #MED_VALUE
+   * @generated
+   * @ordered
+   */
+  MED(2, "MED", "MED"),
+
+  /**
+   * The '<em><b>HIGH</b></em>' literal object.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @see #HIGH_VALUE
+   * @generated
+   * @ordered
+   */
+  HIGH(3, "HIGH", "HIGH");
+
+  /**
+   * The '<em><b>NONE</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #NONE
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int NONE_VALUE = 0;
+
+  /**
+   * The '<em><b>LOW</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>LOW</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #LOW
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int LOW_VALUE = 1;
+
+  /**
+   * The '<em><b>MED</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>MED</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #MED
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int MED_VALUE = 2;
+
+  /**
+   * The '<em><b>HIGH</b></em>' literal value.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of '<em><b>HIGH</b></em>' literal object isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @see #HIGH
+   * @model
+   * @generated
+   * @ordered
+   */
+  public static final int HIGH_VALUE = 3;
+
+  /**
+   * An array of all the '<em><b>LOW MED HIGH</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private static final LOW_MED_HIGH[] VALUES_ARRAY =
+    new LOW_MED_HIGH[]
+    {
+      NONE,
+      LOW,
+      MED,
+      HIGH,
+    };
+
+  /**
+   * A public read-only list of all the '<em><b>LOW MED HIGH</b></em>' enumerators.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  public static final List<LOW_MED_HIGH> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+  /**
+   * Returns the '<em><b>LOW MED HIGH</b></em>' literal with the specified literal value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param literal the literal.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static LOW_MED_HIGH get(String literal)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      LOW_MED_HIGH result = VALUES_ARRAY[i];
+      if (result.toString().equals(literal))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns the '<em><b>LOW MED HIGH</b></em>' literal with the specified name.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param name the name.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static LOW_MED_HIGH getByName(String name)
+  {
+    for (int i = 0; i < VALUES_ARRAY.length; ++i)
+    {
+      LOW_MED_HIGH result = VALUES_ARRAY[i];
+      if (result.getName().equals(name))
+      {
+        return result;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * Returns the '<em><b>LOW MED HIGH</b></em>' literal with the specified integer value.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the integer value.
+   * @return the matching enumerator or <code>null</code>.
+   * @generated
+   */
+  public static LOW_MED_HIGH get(int value)
+  {
+    switch (value)
+    {
+      case NONE_VALUE: return NONE;
+      case LOW_VALUE: return LOW;
+      case MED_VALUE: return MED;
+      case HIGH_VALUE: return HIGH;
+    }
+    return null;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final int value;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String name;
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private final String literal;
+
+  /**
+   * Only this class can construct instances.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  private LOW_MED_HIGH(int value, String name, String literal)
+  {
+    this.value = value;
+    this.name = name;
+    this.literal = literal;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public int getValue()
+  {
+    return value;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getName()
+  {
+    return name;
+  }
+
+  /**
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String getLiteral()
+  {
+    return literal;
+  }
+
+  /**
+   * Returns the literal value of the enumerator, which is its string representation.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @generated
+   */
+  @Override
+  public String toString()
+  {
+    return literal;
+  }
+  
+} //LOW_MED_HIGH

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/LessThan.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Less Than</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.LessThan#isEqualTo <em>Equal To</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLessThan()
- * @model
- * @generated
- */
-public interface LessThan extends Operator {
-	/**
-	 * Returns the value of the '<em><b>Equal To</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Equal To</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Equal To</em>' attribute.
-	 * @see #setEqualTo(boolean)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLessThan_EqualTo()
-	 * @model
-	 * @generated
-	 */
-	boolean isEqualTo();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.LessThan#isEqualTo <em>Equal To</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Equal To</em>' attribute.
-	 * @see #isEqualTo()
-	 * @generated
-	 */
-	void setEqualTo(boolean value);
-
-} // LessThan
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Less Than</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.LessThan#isEqualTo <em>Equal To</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLessThan()
+ * @model
+ * @generated
+ */
+public interface LessThan extends Operator
+{
+  /**
+   * Returns the value of the '<em><b>Equal To</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Equal To</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Equal To</em>' attribute.
+   * @see #setEqualTo(boolean)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLessThan_EqualTo()
+   * @model
+   * @generated
+   */
+  boolean isEqualTo();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.LessThan#isEqualTo <em>Equal To</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Equal To</em>' attribute.
+   * @see #isEqualTo()
+   * @generated
+   */
+  void setEqualTo(boolean value);
+
+} // LessThan

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/LowerTimeBound.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Lower Time Bound</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.LowerTimeBound#getVal <em>Val</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLowerTimeBound()
- * @model
- * @generated
- */
-public interface LowerTimeBound extends Time {
-	/**
-	 * Returns the value of the '<em><b>Val</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Val</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Val</em>' containment reference.
-	 * @see #setVal(NumValue)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLowerTimeBound_Val()
-	 * @model containment="true"
-	 * @generated
-	 */
-	NumValue getVal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.LowerTimeBound#getVal <em>Val</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Val</em>' containment reference.
-	 * @see #getVal()
-	 * @generated
-	 */
-	void setVal(NumValue value);
-
-} // LowerTimeBound
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Lower Time Bound</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.LowerTimeBound#getVal <em>Val</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLowerTimeBound()
+ * @model
+ * @generated
+ */
+public interface LowerTimeBound extends Time
+{
+  /**
+   * Returns the value of the '<em><b>Val</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Val</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Val</em>' containment reference.
+   * @see #setVal(NumValue)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getLowerTimeBound_Val()
+   * @model containment="true"
+   * @generated
+   */
+  NumValue getVal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.LowerTimeBound#getVal <em>Val</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Val</em>' containment reference.
+   * @see #getVal()
+   * @generated
+   */
+  void setVal(NumValue value);
+
+} // LowerTimeBound

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/MaxDurationPattern.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Max Duration Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.MaxDurationPattern#getDuration <em>Duration</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMaxDurationPattern()
- * @model
- * @generated
- */
-public interface MaxDurationPattern extends Occurrence {
-	/**
-	 * Returns the value of the '<em><b>Duration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Duration</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Duration</em>' containment reference.
-	 * @see #setDuration(SingleTime)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMaxDurationPattern_Duration()
-	 * @model containment="true"
-	 * @generated
-	 */
-	SingleTime getDuration();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.MaxDurationPattern#getDuration <em>Duration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration</em>' containment reference.
-	 * @see #getDuration()
-	 * @generated
-	 */
-	void setDuration(SingleTime value);
-
-} // MaxDurationPattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Max Duration Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.MaxDurationPattern#getDuration <em>Duration</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMaxDurationPattern()
+ * @model
+ * @generated
+ */
+public interface MaxDurationPattern extends Occurrence
+{
+  /**
+   * Returns the value of the '<em><b>Duration</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Duration</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Duration</em>' containment reference.
+   * @see #setDuration(SingleTime)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMaxDurationPattern_Duration()
+   * @model containment="true"
+   * @generated
+   */
+  SingleTime getDuration();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.MaxDurationPattern#getDuration <em>Duration</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Duration</em>' containment reference.
+   * @see #getDuration()
+   * @generated
+   */
+  void setDuration(SingleTime value);
+
+} // MaxDurationPattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/MetaStatement.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Meta Statement</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMetaStatement()
- * @model
- * @generated
- */
-public interface MetaStatement extends EObject {
-} // MetaStatement
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Meta Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMetaStatement()
+ * @model
+ * @generated
+ */
+public interface MetaStatement extends EObject
+{
+} // MetaStatement

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Meters.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Meters</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMeters()
- * @model
- * @generated
- */
-public interface Meters extends Unit {
-} // Meters
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Meters</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMeters()
+ * @model
+ * @generated
+ */
+public interface Meters extends Unit
+{
+} // Meters

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/MetersPerSecond.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Meters Per Second</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMetersPerSecond()
- * @model
- * @generated
- */
-public interface MetersPerSecond extends Unit {
-} // MetersPerSecond
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Meters Per Second</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMetersPerSecond()
+ * @model
+ * @generated
+ */
+public interface MetersPerSecond extends Unit
+{
+} // MetersPerSecond

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Milliseconds.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Milliseconds</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMilliseconds()
- * @model
- * @generated
- */
-public interface Milliseconds extends TimeUnit, Unit {
-} // Milliseconds
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Milliseconds</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMilliseconds()
+ * @model
+ * @generated
+ */
+public interface Milliseconds extends TimeUnit, Unit
+{
+} // Milliseconds

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/MinDurationPattern.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Min Duration Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.MinDurationPattern#getDuration <em>Duration</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMinDurationPattern()
- * @model
- * @generated
- */
-public interface MinDurationPattern extends Occurrence {
-	/**
-	 * Returns the value of the '<em><b>Duration</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Duration</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Duration</em>' containment reference.
-	 * @see #setDuration(SingleTime)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMinDurationPattern_Duration()
-	 * @model containment="true"
-	 * @generated
-	 */
-	SingleTime getDuration();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.MinDurationPattern#getDuration <em>Duration</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Duration</em>' containment reference.
-	 * @see #getDuration()
-	 * @generated
-	 */
-	void setDuration(SingleTime value);
-
-} // MinDurationPattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Min Duration Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.MinDurationPattern#getDuration <em>Duration</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMinDurationPattern()
+ * @model
+ * @generated
+ */
+public interface MinDurationPattern extends Occurrence
+{
+  /**
+   * Returns the value of the '<em><b>Duration</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Duration</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Duration</em>' containment reference.
+   * @see #setDuration(SingleTime)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getMinDurationPattern_Duration()
+   * @model containment="true"
+   * @generated
+   */
+  SingleTime getDuration();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.MinDurationPattern#getDuration <em>Duration</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Duration</em>' containment reference.
+   * @see #getDuration()
+   * @generated
+   */
+  void setDuration(SingleTime value);
+
+} // MinDurationPattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/NumValue.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Num Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getNumValue()
- * @model
- * @generated
- */
-public interface NumValue extends EObject {
-} // NumValue
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Num Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getNumValue()
+ * @model
+ * @generated
+ */
+public interface NumValue extends EObject
+{
+} // NumValue

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Occurrence.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Occurrence</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Occurrence#getStatement <em>Statement</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getOccurrence()
- * @model
- * @generated
- */
-public interface Occurrence extends Pattern {
-	/**
-	 * Returns the value of the '<em><b>Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statement</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statement</em>' reference.
-	 * @see #setStatement(Statement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getOccurrence_Statement()
-	 * @model
-	 * @generated
-	 */
-	Statement getStatement();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Occurrence#getStatement <em>Statement</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Statement</em>' reference.
-	 * @see #getStatement()
-	 * @generated
-	 */
-	void setStatement(Statement value);
-
-} // Occurrence
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Occurrence</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Occurrence#getStatement <em>Statement</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getOccurrence()
+ * @model
+ * @generated
+ */
+public interface Occurrence extends Pattern
+{
+  /**
+   * Returns the value of the '<em><b>Statement</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statement</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statement</em>' reference.
+   * @see #setStatement(Statement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getOccurrence_Statement()
+   * @model
+   * @generated
+   */
+  Statement getStatement();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Occurrence#getStatement <em>Statement</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Statement</em>' reference.
+   * @see #getStatement()
+   * @generated
+   */
+  void setStatement(Statement value);
+
+} // Occurrence

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Operator.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Operator</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getOperator()
- * @model
- * @generated
- */
-public interface Operator extends EObject {
-} // Operator
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Operator</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getOperator()
+ * @model
+ * @generated
+ */
+public interface Operator extends EObject
+{
+} // Operator

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Order.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Order</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getOrder()
- * @model
- * @generated
- */
-public interface Order extends Pattern {
-} // Order
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Order</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getOrder()
+ * @model
+ * @generated
+ */
+public interface Order extends Pattern
+{
+} // Order

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Pattern.java

@@ -1,51 +1,52 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Pattern#getProb <em>Prob</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPattern()
- * @model
- * @generated
- */
-public interface Pattern extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Prob</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Prob</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Prob</em>' containment reference.
-	 * @see #setProb(Probability)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPattern_Prob()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Probability getProb();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Pattern#getProb <em>Prob</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Prob</em>' containment reference.
-	 * @see #getProb()
-	 * @generated
-	 */
-	void setProb(Probability value);
-
-} // Pattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Pattern#getProb <em>Prob</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPattern()
+ * @model
+ * @generated
+ */
+public interface Pattern extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Prob</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Prob</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Prob</em>' containment reference.
+   * @see #setProb(Probability)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPattern_Prob()
+   * @model containment="true"
+   * @generated
+   */
+  Probability getProb();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Pattern#getProb <em>Prob</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Prob</em>' containment reference.
+   * @see #getProb()
+   * @generated
+   */
+  void setProb(Probability value);
+
+} // Pattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Percentage.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Percentage</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPercentage()
- * @model
- * @generated
- */
-public interface Percentage extends Unit {
-} // Percentage
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Percentage</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPercentage()
+ * @model
+ * @generated
+ */
+public interface Percentage extends Unit
+{
+} // Percentage

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/PrecStatement.java

@@ -1,105 +1,106 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prec Statement</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecStatement#getStatement <em>Statement</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecStatement#getTime <em>Time</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecStatement#getConstraint <em>Constraint</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecStatement()
- * @model
- * @generated
- */
-public interface PrecStatement extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Statement</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statement</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statement</em>' containment reference.
-	 * @see #setStatement(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecStatement_Statement()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getStatement();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecStatement#getStatement <em>Statement</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Statement</em>' containment reference.
-	 * @see #getStatement()
-	 * @generated
-	 */
-	void setStatement(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecStatement_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecStatement#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-	/**
-	 * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Constraint</em>' containment reference.
-	 * @see #setConstraint(Constraint)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecStatement_Constraint()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Constraint getConstraint();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecStatement#getConstraint <em>Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constraint</em>' containment reference.
-	 * @see #getConstraint()
-	 * @generated
-	 */
-	void setConstraint(Constraint value);
-
-} // PrecStatement
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Prec Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecStatement#getStatement <em>Statement</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecStatement#getTime <em>Time</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecStatement#getConstraint <em>Constraint</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecStatement()
+ * @model
+ * @generated
+ */
+public interface PrecStatement extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Statement</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statement</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statement</em>' containment reference.
+   * @see #setStatement(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecStatement_Statement()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getStatement();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecStatement#getStatement <em>Statement</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Statement</em>' containment reference.
+   * @see #getStatement()
+   * @generated
+   */
+  void setStatement(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecStatement_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecStatement#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+  /**
+   * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Constraint</em>' containment reference.
+   * @see #setConstraint(Constraint)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecStatement_Constraint()
+   * @model containment="true"
+   * @generated
+   */
+  Constraint getConstraint();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecStatement#getConstraint <em>Constraint</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Constraint</em>' containment reference.
+   * @see #getConstraint()
+   * @generated
+   */
+  void setConstraint(Constraint value);
+
+} // PrecStatement

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/PrecedenceChain1NPattern.java

@@ -1,149 +1,150 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Precedence Chain1 NPattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getSecond <em>Second</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getStatements <em>Statements</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getFirst <em>First</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getInterval <em>Interval</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getConstraint <em>Constraint</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern()
- * @model
- * @generated
- */
-public interface PrecedenceChain1NPattern extends Order {
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' reference.
-	 * @see #setSecond(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_Second()
-	 * @model
-	 * @generated
-	 */
-	MetaStatement getSecond();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getSecond <em>Second</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' reference.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	void setSecond(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Statements</b></em>' reference list.
-	 * The list contents are of type {@link be.uantwerpen.cosys.contractLang.PrecStatement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statements</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statements</em>' reference list.
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_Statements()
-	 * @model
-	 * @generated
-	 */
-	EList<PrecStatement> getStatements();
-
-	/**
-	 * Returns the value of the '<em><b>First</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First</em>' reference.
-	 * @see #setFirst(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_First()
-	 * @model
-	 * @generated
-	 */
-	MetaStatement getFirst();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getFirst <em>First</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First</em>' reference.
-	 * @see #getFirst()
-	 * @generated
-	 */
-	void setFirst(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Interval</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interval</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interval</em>' containment reference.
-	 * @see #setInterval(Interval)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_Interval()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Interval getInterval();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getInterval <em>Interval</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Interval</em>' containment reference.
-	 * @see #getInterval()
-	 * @generated
-	 */
-	void setInterval(Interval value);
-
-	/**
-	 * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Constraint</em>' containment reference.
-	 * @see #setConstraint(Constraint)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_Constraint()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Constraint getConstraint();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getConstraint <em>Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constraint</em>' containment reference.
-	 * @see #getConstraint()
-	 * @generated
-	 */
-	void setConstraint(Constraint value);
-
-} // PrecedenceChain1NPattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Precedence Chain1 NPattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getSecond <em>Second</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getStatements <em>Statements</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getFirst <em>First</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getInterval <em>Interval</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getConstraint <em>Constraint</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern()
+ * @model
+ * @generated
+ */
+public interface PrecedenceChain1NPattern extends Order
+{
+  /**
+   * Returns the value of the '<em><b>Second</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Second</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Second</em>' reference.
+   * @see #setSecond(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_Second()
+   * @model
+   * @generated
+   */
+  MetaStatement getSecond();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getSecond <em>Second</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Second</em>' reference.
+   * @see #getSecond()
+   * @generated
+   */
+  void setSecond(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Statements</b></em>' reference list.
+   * The list contents are of type {@link be.uantwerpen.cosys.contractLang.PrecStatement}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statements</em>' reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statements</em>' reference list.
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_Statements()
+   * @model
+   * @generated
+   */
+  EList<PrecStatement> getStatements();
+
+  /**
+   * Returns the value of the '<em><b>First</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>First</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>First</em>' reference.
+   * @see #setFirst(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_First()
+   * @model
+   * @generated
+   */
+  MetaStatement getFirst();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getFirst <em>First</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>First</em>' reference.
+   * @see #getFirst()
+   * @generated
+   */
+  void setFirst(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Interval</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Interval</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Interval</em>' containment reference.
+   * @see #setInterval(Interval)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_Interval()
+   * @model containment="true"
+   * @generated
+   */
+  Interval getInterval();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getInterval <em>Interval</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Interval</em>' containment reference.
+   * @see #getInterval()
+   * @generated
+   */
+  void setInterval(Interval value);
+
+  /**
+   * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Constraint</em>' containment reference.
+   * @see #setConstraint(Constraint)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedenceChain1NPattern_Constraint()
+   * @model containment="true"
+   * @generated
+   */
+  Constraint getConstraint();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedenceChain1NPattern#getConstraint <em>Constraint</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Constraint</em>' containment reference.
+   * @see #getConstraint()
+   * @generated
+   */
+  void setConstraint(Constraint value);
+
+} // PrecedenceChain1NPattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/PrecedencePattern.java

@@ -1,104 +1,105 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Precedence Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getFirst <em>First</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getSecond <em>Second</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getInterval <em>Interval</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedencePattern()
- * @model
- * @generated
- */
-public interface PrecedencePattern extends Order {
-	/**
-	 * Returns the value of the '<em><b>First</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First</em>' reference.
-	 * @see #setFirst(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedencePattern_First()
-	 * @model
-	 * @generated
-	 */
-	MetaStatement getFirst();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getFirst <em>First</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First</em>' reference.
-	 * @see #getFirst()
-	 * @generated
-	 */
-	void setFirst(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' reference.
-	 * @see #setSecond(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedencePattern_Second()
-	 * @model
-	 * @generated
-	 */
-	MetaStatement getSecond();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getSecond <em>Second</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' reference.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	void setSecond(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Interval</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Interval</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Interval</em>' containment reference.
-	 * @see #setInterval(Interval)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedencePattern_Interval()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Interval getInterval();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getInterval <em>Interval</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Interval</em>' containment reference.
-	 * @see #getInterval()
-	 * @generated
-	 */
-	void setInterval(Interval value);
-
-} // PrecedencePattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Precedence Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getFirst <em>First</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getSecond <em>Second</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getInterval <em>Interval</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedencePattern()
+ * @model
+ * @generated
+ */
+public interface PrecedencePattern extends Order
+{
+  /**
+   * Returns the value of the '<em><b>First</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>First</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>First</em>' reference.
+   * @see #setFirst(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedencePattern_First()
+   * @model
+   * @generated
+   */
+  MetaStatement getFirst();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getFirst <em>First</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>First</em>' reference.
+   * @see #getFirst()
+   * @generated
+   */
+  void setFirst(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Second</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Second</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Second</em>' reference.
+   * @see #setSecond(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedencePattern_Second()
+   * @model
+   * @generated
+   */
+  MetaStatement getSecond();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getSecond <em>Second</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Second</em>' reference.
+   * @see #getSecond()
+   * @generated
+   */
+  void setSecond(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Interval</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Interval</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Interval</em>' containment reference.
+   * @see #setInterval(Interval)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getPrecedencePattern_Interval()
+   * @model containment="true"
+   * @generated
+   */
+  Interval getInterval();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.PrecedencePattern#getInterval <em>Interval</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Interval</em>' containment reference.
+   * @see #getInterval()
+   * @generated
+   */
+  void setInterval(Interval value);
+
+} // PrecedencePattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ProbGreater.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prob Greater</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbGreater()
- * @model
- * @generated
- */
-public interface ProbGreater extends EObject {
-} // ProbGreater
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Prob Greater</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbGreater()
+ * @model
+ * @generated
+ */
+public interface ProbGreater extends EObject
+{
+} // ProbGreater

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ProbGreaterEq.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prob Greater Eq</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbGreaterEq()
- * @model
- * @generated
- */
-public interface ProbGreaterEq extends EObject {
-} // ProbGreaterEq
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Prob Greater Eq</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbGreaterEq()
+ * @model
+ * @generated
+ */
+public interface ProbGreaterEq extends EObject
+{
+} // ProbGreaterEq

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ProbLess.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prob Less</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbLess()
- * @model
- * @generated
- */
-public interface ProbLess extends EObject {
-} // ProbLess
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Prob Less</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbLess()
+ * @model
+ * @generated
+ */
+public interface ProbLess extends EObject
+{
+} // ProbLess

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ProbLessEq.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Prob Less Eq</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbLessEq()
- * @model
- * @generated
- */
-public interface ProbLessEq extends EObject {
-} // ProbLessEq
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Prob Less Eq</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbLessEq()
+ * @model
+ * @generated
+ */
+public interface ProbLessEq extends EObject
+{
+} // ProbLessEq

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Probability.java

@@ -1,51 +1,52 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Probability</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Probability#getProb <em>Prob</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbability()
- * @model
- * @generated
- */
-public interface Probability extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Prob</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Prob</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Prob</em>' containment reference.
-	 * @see #setProb(EObject)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbability_Prob()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EObject getProb();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Probability#getProb <em>Prob</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Prob</em>' containment reference.
-	 * @see #getProb()
-	 * @generated
-	 */
-	void setProb(EObject value);
-
-} // Probability
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Probability</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Probability#getProb <em>Prob</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbability()
+ * @model
+ * @generated
+ */
+public interface Probability extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Prob</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Prob</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Prob</em>' containment reference.
+   * @see #setProb(EObject)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProbability_Prob()
+   * @model containment="true"
+   * @generated
+   */
+  EObject getProb();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Probability#getProb <em>Prob</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Prob</em>' containment reference.
+   * @see #getProb()
+   * @generated
+   */
+  void setProb(EObject value);
+
+} // Probability

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Property.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProperty()
- * @model
- * @generated
- */
-public interface Property extends Statement {
-} // Property
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Property</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getProperty()
+ * @model
+ * @generated
+ */
+public interface Property extends Statement
+{
+} // Property

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/QualValue.java

@@ -1,53 +1,54 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Qual Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.QualValue#getVal <em>Val</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getQualValue()
- * @model
- * @generated
- */
-public interface QualValue extends Expression, Value {
-	/**
-	 * Returns the value of the '<em><b>Val</b></em>' attribute.
-	 * The literals are from the enumeration {@link be.uantwerpen.cosys.contractLang.LOW_MED_HIGH}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Val</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Val</em>' attribute.
-	 * @see be.uantwerpen.cosys.contractLang.LOW_MED_HIGH
-	 * @see #setVal(LOW_MED_HIGH)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getQualValue_Val()
-	 * @model
-	 * @generated
-	 */
-	LOW_MED_HIGH getVal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.QualValue#getVal <em>Val</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Val</em>' attribute.
-	 * @see be.uantwerpen.cosys.contractLang.LOW_MED_HIGH
-	 * @see #getVal()
-	 * @generated
-	 */
-	void setVal(LOW_MED_HIGH value);
-
-} // QualValue
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Qual Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.QualValue#getVal <em>Val</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getQualValue()
+ * @model
+ * @generated
+ */
+public interface QualValue extends Expression, Value
+{
+  /**
+   * Returns the value of the '<em><b>Val</b></em>' attribute.
+   * The literals are from the enumeration {@link be.uantwerpen.cosys.contractLang.LOW_MED_HIGH}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Val</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Val</em>' attribute.
+   * @see be.uantwerpen.cosys.contractLang.LOW_MED_HIGH
+   * @see #setVal(LOW_MED_HIGH)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getQualValue_Val()
+   * @model
+   * @generated
+   */
+  LOW_MED_HIGH getVal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.QualValue#getVal <em>Val</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Val</em>' attribute.
+   * @see be.uantwerpen.cosys.contractLang.LOW_MED_HIGH
+   * @see #getVal()
+   * @generated
+   */
+  void setVal(LOW_MED_HIGH value);
+
+} // QualValue

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Recurrence.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Recurrence</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Recurrence#getTime <em>Time</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRecurrence()
- * @model
- * @generated
- */
-public interface Recurrence extends Occurrence {
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(SingleTime)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRecurrence_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	SingleTime getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Recurrence#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(SingleTime value);
-
-} // Recurrence
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Recurrence</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Recurrence#getTime <em>Time</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRecurrence()
+ * @model
+ * @generated
+ */
+public interface Recurrence extends Occurrence
+{
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(SingleTime)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRecurrence_Time()
+   * @model containment="true"
+   * @generated
+   */
+  SingleTime getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Recurrence#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(SingleTime value);
+
+} // Recurrence

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ResponseChain1NPattern.java

@@ -1,149 +1,150 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Response Chain1 NPattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getFirst <em>First</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getSecond <em>Second</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getTime <em>Time</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getConstraint <em>Constraint</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getStatements <em>Statements</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern()
- * @model
- * @generated
- */
-public interface ResponseChain1NPattern extends Order {
-	/**
-	 * Returns the value of the '<em><b>First</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First</em>' containment reference.
-	 * @see #setFirst(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_First()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getFirst();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getFirst <em>First</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First</em>' containment reference.
-	 * @see #getFirst()
-	 * @generated
-	 */
-	void setFirst(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' containment reference.
-	 * @see #setSecond(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_Second()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getSecond();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getSecond <em>Second</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' containment reference.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	void setSecond(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-	/**
-	 * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Constraint</em>' containment reference.
-	 * @see #setConstraint(Constraint)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_Constraint()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Constraint getConstraint();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getConstraint <em>Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constraint</em>' containment reference.
-	 * @see #getConstraint()
-	 * @generated
-	 */
-	void setConstraint(Constraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Statements</b></em>' reference list.
-	 * The list contents are of type {@link be.uantwerpen.cosys.contractLang.PrecStatement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statements</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statements</em>' reference list.
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_Statements()
-	 * @model
-	 * @generated
-	 */
-	EList<PrecStatement> getStatements();
-
-} // ResponseChain1NPattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Response Chain1 NPattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getFirst <em>First</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getSecond <em>Second</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getTime <em>Time</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getConstraint <em>Constraint</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getStatements <em>Statements</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern()
+ * @model
+ * @generated
+ */
+public interface ResponseChain1NPattern extends Order
+{
+  /**
+   * Returns the value of the '<em><b>First</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>First</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>First</em>' containment reference.
+   * @see #setFirst(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_First()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getFirst();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getFirst <em>First</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>First</em>' containment reference.
+   * @see #getFirst()
+   * @generated
+   */
+  void setFirst(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Second</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Second</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Second</em>' containment reference.
+   * @see #setSecond(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_Second()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getSecond();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getSecond <em>Second</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Second</em>' containment reference.
+   * @see #getSecond()
+   * @generated
+   */
+  void setSecond(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+  /**
+   * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Constraint</em>' containment reference.
+   * @see #setConstraint(Constraint)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_Constraint()
+   * @model containment="true"
+   * @generated
+   */
+  Constraint getConstraint();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChain1NPattern#getConstraint <em>Constraint</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Constraint</em>' containment reference.
+   * @see #getConstraint()
+   * @generated
+   */
+  void setConstraint(Constraint value);
+
+  /**
+   * Returns the value of the '<em><b>Statements</b></em>' reference list.
+   * The list contents are of type {@link be.uantwerpen.cosys.contractLang.PrecStatement}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statements</em>' reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statements</em>' reference list.
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChain1NPattern_Statements()
+   * @model
+   * @generated
+   */
+  EList<PrecStatement> getStatements();
+
+} // ResponseChain1NPattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ResponseChainN1Pattern.java

@@ -1,149 +1,150 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Response Chain N1 Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getSecond <em>Second</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getStatements <em>Statements</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getFirst <em>First</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getTime <em>Time</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getConstraint <em>Constraint</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern()
- * @model
- * @generated
- */
-public interface ResponseChainN1Pattern extends Order {
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' containment reference.
-	 * @see #setSecond(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_Second()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getSecond();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getSecond <em>Second</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' containment reference.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	void setSecond(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Statements</b></em>' reference list.
-	 * The list contents are of type {@link be.uantwerpen.cosys.contractLang.PrecStatement}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statements</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statements</em>' reference list.
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_Statements()
-	 * @model
-	 * @generated
-	 */
-	EList<PrecStatement> getStatements();
-
-	/**
-	 * Returns the value of the '<em><b>First</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First</em>' containment reference.
-	 * @see #setFirst(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_First()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getFirst();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getFirst <em>First</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First</em>' containment reference.
-	 * @see #getFirst()
-	 * @generated
-	 */
-	void setFirst(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-	/**
-	 * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Constraint</em>' containment reference.
-	 * @see #setConstraint(Constraint)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_Constraint()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Constraint getConstraint();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getConstraint <em>Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constraint</em>' containment reference.
-	 * @see #getConstraint()
-	 * @generated
-	 */
-	void setConstraint(Constraint value);
-
-} // ResponseChainN1Pattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.common.util.EList;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Response Chain N1 Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getSecond <em>Second</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getStatements <em>Statements</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getFirst <em>First</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getTime <em>Time</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getConstraint <em>Constraint</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern()
+ * @model
+ * @generated
+ */
+public interface ResponseChainN1Pattern extends Order
+{
+  /**
+   * Returns the value of the '<em><b>Second</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Second</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Second</em>' containment reference.
+   * @see #setSecond(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_Second()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getSecond();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getSecond <em>Second</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Second</em>' containment reference.
+   * @see #getSecond()
+   * @generated
+   */
+  void setSecond(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Statements</b></em>' reference list.
+   * The list contents are of type {@link be.uantwerpen.cosys.contractLang.PrecStatement}.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statements</em>' reference list isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statements</em>' reference list.
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_Statements()
+   * @model
+   * @generated
+   */
+  EList<PrecStatement> getStatements();
+
+  /**
+   * Returns the value of the '<em><b>First</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>First</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>First</em>' containment reference.
+   * @see #setFirst(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_First()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getFirst();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getFirst <em>First</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>First</em>' containment reference.
+   * @see #getFirst()
+   * @generated
+   */
+  void setFirst(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+  /**
+   * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Constraint</em>' containment reference.
+   * @see #setConstraint(Constraint)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseChainN1Pattern_Constraint()
+   * @model containment="true"
+   * @generated
+   */
+  Constraint getConstraint();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseChainN1Pattern#getConstraint <em>Constraint</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Constraint</em>' containment reference.
+   * @see #getConstraint()
+   * @generated
+   */
+  void setConstraint(Constraint value);
+
+} // ResponseChainN1Pattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ResponseInvariancePattern.java

@@ -1,104 +1,105 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Response Invariance Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getFirst <em>First</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getSecond <em>Second</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getTime <em>Time</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseInvariancePattern()
- * @model
- * @generated
- */
-public interface ResponseInvariancePattern extends Order {
-	/**
-	 * Returns the value of the '<em><b>First</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First</em>' containment reference.
-	 * @see #setFirst(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseInvariancePattern_First()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getFirst();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getFirst <em>First</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First</em>' containment reference.
-	 * @see #getFirst()
-	 * @generated
-	 */
-	void setFirst(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' containment reference.
-	 * @see #setSecond(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseInvariancePattern_Second()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getSecond();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getSecond <em>Second</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' containment reference.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	void setSecond(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseInvariancePattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-} // ResponseInvariancePattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Response Invariance Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getFirst <em>First</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getSecond <em>Second</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getTime <em>Time</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseInvariancePattern()
+ * @model
+ * @generated
+ */
+public interface ResponseInvariancePattern extends Order
+{
+  /**
+   * Returns the value of the '<em><b>First</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>First</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>First</em>' containment reference.
+   * @see #setFirst(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseInvariancePattern_First()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getFirst();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getFirst <em>First</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>First</em>' containment reference.
+   * @see #getFirst()
+   * @generated
+   */
+  void setFirst(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Second</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Second</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Second</em>' containment reference.
+   * @see #setSecond(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseInvariancePattern_Second()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getSecond();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getSecond <em>Second</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Second</em>' containment reference.
+   * @see #getSecond()
+   * @generated
+   */
+  void setSecond(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponseInvariancePattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponseInvariancePattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+} // ResponseInvariancePattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ResponsePattern.java

@@ -1,131 +1,132 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Response Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getFirst <em>First</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getSecond <em>Second</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getTime <em>Time</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getConstraint <em>Constraint</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern()
- * @model
- * @generated
- */
-public interface ResponsePattern extends Order {
-	/**
-	 * Returns the value of the '<em><b>First</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First</em>' containment reference.
-	 * @see #setFirst(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern_First()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getFirst();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getFirst <em>First</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First</em>' containment reference.
-	 * @see #getFirst()
-	 * @generated
-	 */
-	void setFirst(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' containment reference.
-	 * @see #setSecond(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern_Second()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getSecond();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getSecond <em>Second</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' containment reference.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	void setSecond(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-	/**
-	 * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Constraint</em>' containment reference.
-	 * @see #setConstraint(Constraint)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern_Constraint()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Constraint getConstraint();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getConstraint <em>Constraint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Constraint</em>' containment reference.
-	 * @see #getConstraint()
-	 * @generated
-	 */
-	void setConstraint(Constraint value);
-
-} // ResponsePattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Response Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getFirst <em>First</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getSecond <em>Second</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getTime <em>Time</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getConstraint <em>Constraint</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern()
+ * @model
+ * @generated
+ */
+public interface ResponsePattern extends Order
+{
+  /**
+   * Returns the value of the '<em><b>First</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>First</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>First</em>' containment reference.
+   * @see #setFirst(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern_First()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getFirst();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getFirst <em>First</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>First</em>' containment reference.
+   * @see #getFirst()
+   * @generated
+   */
+  void setFirst(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Second</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Second</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Second</em>' containment reference.
+   * @see #setSecond(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern_Second()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getSecond();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getSecond <em>Second</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Second</em>' containment reference.
+   * @see #getSecond()
+   * @generated
+   */
+  void setSecond(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+  /**
+   * Returns the value of the '<em><b>Constraint</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Constraint</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Constraint</em>' containment reference.
+   * @see #setConstraint(Constraint)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getResponsePattern_Constraint()
+   * @model containment="true"
+   * @generated
+   */
+  Constraint getConstraint();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ResponsePattern#getConstraint <em>Constraint</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Constraint</em>' containment reference.
+   * @see #getConstraint()
+   * @generated
+   */
+  void setConstraint(Constraint value);
+
+} // ResponsePattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Root.java

@@ -1,78 +1,79 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Root</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Root#getContract <em>Contract</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Root#getContractSet <em>Contract Set</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRoot()
- * @model
- * @generated
- */
-public interface Root extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Contract</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Contract</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contract</em>' containment reference.
-	 * @see #setContract(Contract)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRoot_Contract()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Contract getContract();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Root#getContract <em>Contract</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Contract</em>' containment reference.
-	 * @see #getContract()
-	 * @generated
-	 */
-	void setContract(Contract value);
-
-	/**
-	 * Returns the value of the '<em><b>Contract Set</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Contract Set</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Contract Set</em>' containment reference.
-	 * @see #setContractSet(ContractSet)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRoot_ContractSet()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ContractSet getContractSet();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Root#getContractSet <em>Contract Set</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Contract Set</em>' containment reference.
-	 * @see #getContractSet()
-	 * @generated
-	 */
-	void setContractSet(ContractSet value);
-
-} // Root
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Root</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Root#getContract <em>Contract</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Root#getContractSet <em>Contract Set</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRoot()
+ * @model
+ * @generated
+ */
+public interface Root extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Contract</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Contract</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Contract</em>' containment reference.
+   * @see #setContract(Contract)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRoot_Contract()
+   * @model containment="true"
+   * @generated
+   */
+  Contract getContract();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Root#getContract <em>Contract</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Contract</em>' containment reference.
+   * @see #getContract()
+   * @generated
+   */
+  void setContract(Contract value);
+
+  /**
+   * Returns the value of the '<em><b>Contract Set</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Contract Set</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Contract Set</em>' containment reference.
+   * @see #setContractSet(ContractSet)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getRoot_ContractSet()
+   * @model containment="true"
+   * @generated
+   */
+  ContractSet getContractSet();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Root#getContractSet <em>Contract Set</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Contract Set</em>' containment reference.
+   * @see #getContractSet()
+   * @generated
+   */
+  void setContractSet(ContractSet value);
+
+} // Root

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Scope.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Scope</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getScope()
- * @model
- * @generated
- */
-public interface Scope extends EObject {
-} // Scope
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Scope</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getScope()
+ * @model
+ * @generated
+ */
+public interface Scope extends EObject
+{
+} // Scope

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Seconds.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Seconds</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSeconds()
- * @model
- * @generated
- */
-public interface Seconds extends TimeUnit, Unit {
-} // Seconds
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Seconds</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSeconds()
+ * @model
+ * @generated
+ */
+public interface Seconds extends TimeUnit, Unit
+{
+} // Seconds

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/SingleTime.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Single Time</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.SingleTime#getVal <em>Val</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSingleTime()
- * @model
- * @generated
- */
-public interface SingleTime extends Time {
-	/**
-	 * Returns the value of the '<em><b>Val</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Val</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Val</em>' containment reference.
-	 * @see #setVal(NumValue)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSingleTime_Val()
-	 * @model containment="true"
-	 * @generated
-	 */
-	NumValue getVal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.SingleTime#getVal <em>Val</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Val</em>' containment reference.
-	 * @see #getVal()
-	 * @generated
-	 */
-	void setVal(NumValue value);
-
-} // SingleTime
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Single Time</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.SingleTime#getVal <em>Val</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSingleTime()
+ * @model
+ * @generated
+ */
+public interface SingleTime extends Time
+{
+  /**
+   * Returns the value of the '<em><b>Val</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Val</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Val</em>' containment reference.
+   * @see #setVal(NumValue)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSingleTime_Val()
+   * @model containment="true"
+   * @generated
+   */
+  NumValue getVal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.SingleTime#getVal <em>Val</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Val</em>' containment reference.
+   * @see #getVal()
+   * @generated
+   */
+  void setVal(NumValue value);
+
+} // SingleTime

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Statement.java

@@ -1,132 +1,133 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Statement</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Statement#getName <em>Name</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Statement#getVar <em>Var</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Statement#getOper <em>Oper</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Statement#getExpr <em>Expr</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement()
- * @model
- * @generated
- */
-public interface Statement extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Statement#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Var</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Var</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Var</em>' containment reference.
-	 * @see #setVar(VarOrVarOp)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement_Var()
-	 * @model containment="true"
-	 * @generated
-	 */
-	VarOrVarOp getVar();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Statement#getVar <em>Var</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Var</em>' containment reference.
-	 * @see #getVar()
-	 * @generated
-	 */
-	void setVar(VarOrVarOp value);
-
-	/**
-	 * Returns the value of the '<em><b>Oper</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Oper</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Oper</em>' containment reference.
-	 * @see #setOper(Operator)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement_Oper()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Operator getOper();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Statement#getOper <em>Oper</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Oper</em>' containment reference.
-	 * @see #getOper()
-	 * @generated
-	 */
-	void setOper(Operator value);
-
-	/**
-	 * Returns the value of the '<em><b>Expr</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Expr</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Expr</em>' containment reference.
-	 * @see #setExpr(Expression)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement_Expr()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Expression getExpr();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Statement#getExpr <em>Expr</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Expr</em>' containment reference.
-	 * @see #getExpr()
-	 * @generated
-	 */
-	void setExpr(Expression value);
-
-} // Statement
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Statement</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Statement#getName <em>Name</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Statement#getVar <em>Var</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Statement#getOper <em>Oper</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Statement#getExpr <em>Expr</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement()
+ * @model
+ * @generated
+ */
+public interface Statement extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Name</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Name</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Name</em>' attribute.
+   * @see #setName(String)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement_Name()
+   * @model
+   * @generated
+   */
+  String getName();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Statement#getName <em>Name</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Name</em>' attribute.
+   * @see #getName()
+   * @generated
+   */
+  void setName(String value);
+
+  /**
+   * Returns the value of the '<em><b>Var</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Var</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Var</em>' containment reference.
+   * @see #setVar(VarOrVarOp)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement_Var()
+   * @model containment="true"
+   * @generated
+   */
+  VarOrVarOp getVar();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Statement#getVar <em>Var</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Var</em>' containment reference.
+   * @see #getVar()
+   * @generated
+   */
+  void setVar(VarOrVarOp value);
+
+  /**
+   * Returns the value of the '<em><b>Oper</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Oper</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Oper</em>' containment reference.
+   * @see #setOper(Operator)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement_Oper()
+   * @model containment="true"
+   * @generated
+   */
+  Operator getOper();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Statement#getOper <em>Oper</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Oper</em>' containment reference.
+   * @see #getOper()
+   * @generated
+   */
+  void setOper(Operator value);
+
+  /**
+   * Returns the value of the '<em><b>Expr</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Expr</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Expr</em>' containment reference.
+   * @see #setExpr(Expression)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatement_Expr()
+   * @model containment="true"
+   * @generated
+   */
+  Expression getExpr();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Statement#getExpr <em>Expr</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Expr</em>' containment reference.
+   * @see #getExpr()
+   * @generated
+   */
+  void setExpr(Expression value);
+
+} // Statement

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/StatementAnd.java

@@ -1,77 +1,78 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Statement And</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.StatementAnd#getStatement1 <em>Statement1</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.StatementAnd#getStatement2 <em>Statement2</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementAnd()
- * @model
- * @generated
- */
-public interface StatementAnd extends StatementOp {
-	/**
-	 * Returns the value of the '<em><b>Statement1</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statement1</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statement1</em>' containment reference.
-	 * @see #setStatement1(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementAnd_Statement1()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getStatement1();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementAnd#getStatement1 <em>Statement1</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Statement1</em>' containment reference.
-	 * @see #getStatement1()
-	 * @generated
-	 */
-	void setStatement1(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Statement2</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statement2</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statement2</em>' containment reference.
-	 * @see #setStatement2(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementAnd_Statement2()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getStatement2();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementAnd#getStatement2 <em>Statement2</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Statement2</em>' containment reference.
-	 * @see #getStatement2()
-	 * @generated
-	 */
-	void setStatement2(MetaStatement value);
-
-} // StatementAnd
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Statement And</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.StatementAnd#getStatement1 <em>Statement1</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.StatementAnd#getStatement2 <em>Statement2</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementAnd()
+ * @model
+ * @generated
+ */
+public interface StatementAnd extends StatementOp
+{
+  /**
+   * Returns the value of the '<em><b>Statement1</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statement1</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statement1</em>' containment reference.
+   * @see #setStatement1(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementAnd_Statement1()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getStatement1();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementAnd#getStatement1 <em>Statement1</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Statement1</em>' containment reference.
+   * @see #getStatement1()
+   * @generated
+   */
+  void setStatement1(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Statement2</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statement2</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statement2</em>' containment reference.
+   * @see #setStatement2(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementAnd_Statement2()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getStatement2();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementAnd#getStatement2 <em>Statement2</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Statement2</em>' containment reference.
+   * @see #getStatement2()
+   * @generated
+   */
+  void setStatement2(MetaStatement value);
+
+} // StatementAnd

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/StatementNot.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Statement Not</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.StatementNot#getStatement <em>Statement</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementNot()
- * @model
- * @generated
- */
-public interface StatementNot extends StatementOp {
-	/**
-	 * Returns the value of the '<em><b>Statement</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statement</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statement</em>' containment reference.
-	 * @see #setStatement(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementNot_Statement()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getStatement();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementNot#getStatement <em>Statement</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Statement</em>' containment reference.
-	 * @see #getStatement()
-	 * @generated
-	 */
-	void setStatement(MetaStatement value);
-
-} // StatementNot
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Statement Not</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.StatementNot#getStatement <em>Statement</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementNot()
+ * @model
+ * @generated
+ */
+public interface StatementNot extends StatementOp
+{
+  /**
+   * Returns the value of the '<em><b>Statement</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statement</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statement</em>' containment reference.
+   * @see #setStatement(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementNot_Statement()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getStatement();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementNot#getStatement <em>Statement</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Statement</em>' containment reference.
+   * @see #getStatement()
+   * @generated
+   */
+  void setStatement(MetaStatement value);
+
+} // StatementNot

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/StatementOp.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Statement Op</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementOp()
- * @model
- * @generated
- */
-public interface StatementOp extends MetaStatement {
-} // StatementOp
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Statement Op</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementOp()
+ * @model
+ * @generated
+ */
+public interface StatementOp extends MetaStatement
+{
+} // StatementOp

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/StatementOr.java

@@ -1,77 +1,78 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Statement Or</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.StatementOr#getStatement1 <em>Statement1</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.StatementOr#getStatement2 <em>Statement2</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementOr()
- * @model
- * @generated
- */
-public interface StatementOr extends StatementOp {
-	/**
-	 * Returns the value of the '<em><b>Statement1</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statement1</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statement1</em>' containment reference.
-	 * @see #setStatement1(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementOr_Statement1()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getStatement1();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementOr#getStatement1 <em>Statement1</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Statement1</em>' containment reference.
-	 * @see #getStatement1()
-	 * @generated
-	 */
-	void setStatement1(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Statement2</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statement2</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statement2</em>' containment reference.
-	 * @see #setStatement2(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementOr_Statement2()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetaStatement getStatement2();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementOr#getStatement2 <em>Statement2</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Statement2</em>' containment reference.
-	 * @see #getStatement2()
-	 * @generated
-	 */
-	void setStatement2(MetaStatement value);
-
-} // StatementOr
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Statement Or</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.StatementOr#getStatement1 <em>Statement1</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.StatementOr#getStatement2 <em>Statement2</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementOr()
+ * @model
+ * @generated
+ */
+public interface StatementOr extends StatementOp
+{
+  /**
+   * Returns the value of the '<em><b>Statement1</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statement1</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statement1</em>' containment reference.
+   * @see #setStatement1(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementOr_Statement1()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getStatement1();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementOr#getStatement1 <em>Statement1</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Statement1</em>' containment reference.
+   * @see #getStatement1()
+   * @generated
+   */
+  void setStatement1(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Statement2</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statement2</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statement2</em>' containment reference.
+   * @see #setStatement2(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementOr_Statement2()
+   * @model containment="true"
+   * @generated
+   */
+  MetaStatement getStatement2();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementOr#getStatement2 <em>Statement2</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Statement2</em>' containment reference.
+   * @see #getStatement2()
+   * @generated
+   */
+  void setStatement2(MetaStatement value);
+
+} // StatementOr

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/StatementRef.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Statement Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.StatementRef#getStatement <em>Statement</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementRef()
- * @model
- * @generated
- */
-public interface StatementRef extends MetaStatement {
-	/**
-	 * Returns the value of the '<em><b>Statement</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Statement</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Statement</em>' reference.
-	 * @see #setStatement(Statement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementRef_Statement()
-	 * @model
-	 * @generated
-	 */
-	Statement getStatement();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementRef#getStatement <em>Statement</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Statement</em>' reference.
-	 * @see #getStatement()
-	 * @generated
-	 */
-	void setStatement(Statement value);
-
-} // StatementRef
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Statement Ref</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.StatementRef#getStatement <em>Statement</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementRef()
+ * @model
+ * @generated
+ */
+public interface StatementRef extends MetaStatement
+{
+  /**
+   * Returns the value of the '<em><b>Statement</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Statement</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Statement</em>' reference.
+   * @see #setStatement(Statement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStatementRef_Statement()
+   * @model
+   * @generated
+   */
+  Statement getStatement();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StatementRef#getStatement <em>Statement</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Statement</em>' reference.
+   * @see #getStatement()
+   * @generated
+   */
+  void setStatement(Statement value);
+
+} // StatementRef

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/SteadyStatePattern.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Steady State Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSteadyStatePattern()
- * @model
- * @generated
- */
-public interface SteadyStatePattern extends Occurrence {
-} // SteadyStatePattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Steady State Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSteadyStatePattern()
+ * @model
+ * @generated
+ */
+public interface SteadyStatePattern extends Occurrence
+{
+} // SteadyStatePattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/SteadyStateSuggestion.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Steady State Suggestion</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSteadyStateSuggestion()
- * @model
- * @generated
- */
-public interface SteadyStateSuggestion extends DomainValue {
-} // SteadyStateSuggestion
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Steady State Suggestion</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getSteadyStateSuggestion()
+ * @model
+ * @generated
+ */
+public interface SteadyStateSuggestion extends DomainValue
+{
+} // SteadyStateSuggestion

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/StringValue.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>String Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.StringValue#getVal <em>Val</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStringValue()
- * @model
- * @generated
- */
-public interface StringValue extends Expression, Value {
-	/**
-	 * Returns the value of the '<em><b>Val</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Val</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Val</em>' attribute.
-	 * @see #setVal(String)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStringValue_Val()
-	 * @model
-	 * @generated
-	 */
-	String getVal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StringValue#getVal <em>Val</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Val</em>' attribute.
-	 * @see #getVal()
-	 * @generated
-	 */
-	void setVal(String value);
-
-} // StringValue
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>String Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.StringValue#getVal <em>Val</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStringValue()
+ * @model
+ * @generated
+ */
+public interface StringValue extends Expression, Value
+{
+  /**
+   * Returns the value of the '<em><b>Val</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Val</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Val</em>' attribute.
+   * @see #setVal(String)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getStringValue_Val()
+   * @model
+   * @generated
+   */
+  String getVal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.StringValue#getVal <em>Val</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Val</em>' attribute.
+   * @see #getVal()
+   * @generated
+   */
+  void setVal(String value);
+
+} // StringValue

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Time.java

@@ -1,51 +1,52 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Time</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.Time#getUnit <em>Unit</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTime()
- * @model
- * @generated
- */
-public interface Time extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Unit</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unit</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unit</em>' containment reference.
-	 * @see #setUnit(TimeUnit)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTime_Unit()
-	 * @model containment="true"
-	 * @generated
-	 */
-	TimeUnit getUnit();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Time#getUnit <em>Unit</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unit</em>' containment reference.
-	 * @see #getUnit()
-	 * @generated
-	 */
-	void setUnit(TimeUnit value);
-
-} // Time
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Time</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.Time#getUnit <em>Unit</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTime()
+ * @model
+ * @generated
+ */
+public interface Time extends EObject
+{
+  /**
+   * Returns the value of the '<em><b>Unit</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Unit</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Unit</em>' containment reference.
+   * @see #setUnit(TimeUnit)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTime_Unit()
+   * @model containment="true"
+   * @generated
+   */
+  TimeUnit getUnit();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.Time#getUnit <em>Unit</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Unit</em>' containment reference.
+   * @see #getUnit()
+   * @generated
+   */
+  void setUnit(TimeUnit value);
+
+} // Time

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/TimeInterval.java

@@ -1,131 +1,132 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Time Interval</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.TimeInterval#getMin <em>Min</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.TimeInterval#getMax <em>Max</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.TimeInterval#isClosed_min <em>Closed min</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.TimeInterval#isClosed_max <em>Closed max</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval()
- * @model
- * @generated
- */
-public interface TimeInterval extends Time {
-	/**
-	 * Returns the value of the '<em><b>Min</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Min</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Min</em>' containment reference.
-	 * @see #setMin(NumValue)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval_Min()
-	 * @model containment="true"
-	 * @generated
-	 */
-	NumValue getMin();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TimeInterval#getMin <em>Min</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Min</em>' containment reference.
-	 * @see #getMin()
-	 * @generated
-	 */
-	void setMin(NumValue value);
-
-	/**
-	 * Returns the value of the '<em><b>Max</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Max</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Max</em>' containment reference.
-	 * @see #setMax(NumValue)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval_Max()
-	 * @model containment="true"
-	 * @generated
-	 */
-	NumValue getMax();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TimeInterval#getMax <em>Max</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Max</em>' containment reference.
-	 * @see #getMax()
-	 * @generated
-	 */
-	void setMax(NumValue value);
-
-	/**
-	 * Returns the value of the '<em><b>Closed min</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Closed min</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Closed min</em>' attribute.
-	 * @see #setClosed_min(boolean)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval_Closed_min()
-	 * @model
-	 * @generated
-	 */
-	boolean isClosed_min();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TimeInterval#isClosed_min <em>Closed min</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Closed min</em>' attribute.
-	 * @see #isClosed_min()
-	 * @generated
-	 */
-	void setClosed_min(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Closed max</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Closed max</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Closed max</em>' attribute.
-	 * @see #setClosed_max(boolean)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval_Closed_max()
-	 * @model
-	 * @generated
-	 */
-	boolean isClosed_max();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TimeInterval#isClosed_max <em>Closed max</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Closed max</em>' attribute.
-	 * @see #isClosed_max()
-	 * @generated
-	 */
-	void setClosed_max(boolean value);
-
-} // TimeInterval
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Time Interval</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.TimeInterval#getMin <em>Min</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.TimeInterval#getMax <em>Max</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.TimeInterval#isClosed_min <em>Closed min</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.TimeInterval#isClosed_max <em>Closed max</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval()
+ * @model
+ * @generated
+ */
+public interface TimeInterval extends Time
+{
+  /**
+   * Returns the value of the '<em><b>Min</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Min</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Min</em>' containment reference.
+   * @see #setMin(NumValue)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval_Min()
+   * @model containment="true"
+   * @generated
+   */
+  NumValue getMin();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TimeInterval#getMin <em>Min</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Min</em>' containment reference.
+   * @see #getMin()
+   * @generated
+   */
+  void setMin(NumValue value);
+
+  /**
+   * Returns the value of the '<em><b>Max</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Max</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Max</em>' containment reference.
+   * @see #setMax(NumValue)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval_Max()
+   * @model containment="true"
+   * @generated
+   */
+  NumValue getMax();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TimeInterval#getMax <em>Max</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Max</em>' containment reference.
+   * @see #getMax()
+   * @generated
+   */
+  void setMax(NumValue value);
+
+  /**
+   * Returns the value of the '<em><b>Closed min</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Closed min</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Closed min</em>' attribute.
+   * @see #setClosed_min(boolean)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval_Closed_min()
+   * @model
+   * @generated
+   */
+  boolean isClosed_min();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TimeInterval#isClosed_min <em>Closed min</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Closed min</em>' attribute.
+   * @see #isClosed_min()
+   * @generated
+   */
+  void setClosed_min(boolean value);
+
+  /**
+   * Returns the value of the '<em><b>Closed max</b></em>' attribute.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Closed max</em>' attribute isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Closed max</em>' attribute.
+   * @see #setClosed_max(boolean)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeInterval_Closed_max()
+   * @model
+   * @generated
+   */
+  boolean isClosed_max();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TimeInterval#isClosed_max <em>Closed max</em>}' attribute.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Closed max</em>' attribute.
+   * @see #isClosed_max()
+   * @generated
+   */
+  void setClosed_max(boolean value);
+
+} // TimeInterval

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/TimeUnit.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Time Unit</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeUnit()
- * @model
- * @generated
- */
-public interface TimeUnit extends EObject {
-} // TimeUnit
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Time Unit</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTimeUnit()
+ * @model
+ * @generated
+ */
+public interface TimeUnit extends EObject
+{
+} // TimeUnit

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/TransientStatePattern.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Transient State Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.TransientStatePattern#getTime <em>Time</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTransientStatePattern()
- * @model
- * @generated
- */
-public interface TransientStatePattern extends Occurrence {
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(SingleTime)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTransientStatePattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	SingleTime getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TransientStatePattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(SingleTime value);
-
-} // TransientStatePattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Transient State Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.TransientStatePattern#getTime <em>Time</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTransientStatePattern()
+ * @model
+ * @generated
+ */
+public interface TransientStatePattern extends Occurrence
+{
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(SingleTime)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTransientStatePattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  SingleTime getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.TransientStatePattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(SingleTime value);
+
+} // TransientStatePattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/True.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>True</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTrue()
- * @model
- * @generated
- */
-public interface True extends Expression, Value {
-} // True
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>True</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getTrue()
+ * @model
+ * @generated
+ */
+public interface True extends Expression, Value
+{
+} // True

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Unit.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Unit</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUnit()
- * @model
- * @generated
- */
-public interface Unit extends EObject {
-} // Unit
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Unit</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUnit()
+ * @model
+ * @generated
+ */
+public interface Unit extends EObject
+{
+} // Unit

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Unitless.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Unitless</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUnitless()
- * @model
- * @generated
- */
-public interface Unitless extends Unit {
-} // Unitless
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Unitless</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUnitless()
+ * @model
+ * @generated
+ */
+public interface Unitless extends Unit
+{
+} // Unitless

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/UniversalityPattern.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Universality Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.UniversalityPattern#getTime <em>Time</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUniversalityPattern()
- * @model
- * @generated
- */
-public interface UniversalityPattern extends Occurrence {
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUniversalityPattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UniversalityPattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-} // UniversalityPattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Universality Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.UniversalityPattern#getTime <em>Time</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUniversalityPattern()
+ * @model
+ * @generated
+ */
+public interface UniversalityPattern extends Occurrence
+{
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUniversalityPattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UniversalityPattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+} // UniversalityPattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/UntilPattern.java

@@ -1,104 +1,105 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Until Pattern</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.UntilPattern#getFirst <em>First</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.UntilPattern#getSecond <em>Second</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.UntilPattern#getTime <em>Time</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUntilPattern()
- * @model
- * @generated
- */
-public interface UntilPattern extends Order {
-	/**
-	 * Returns the value of the '<em><b>First</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>First</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>First</em>' reference.
-	 * @see #setFirst(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUntilPattern_First()
-	 * @model
-	 * @generated
-	 */
-	MetaStatement getFirst();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UntilPattern#getFirst <em>First</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>First</em>' reference.
-	 * @see #getFirst()
-	 * @generated
-	 */
-	void setFirst(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Second</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Second</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Second</em>' reference.
-	 * @see #setSecond(MetaStatement)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUntilPattern_Second()
-	 * @model
-	 * @generated
-	 */
-	MetaStatement getSecond();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UntilPattern#getSecond <em>Second</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Second</em>' reference.
-	 * @see #getSecond()
-	 * @generated
-	 */
-	void setSecond(MetaStatement value);
-
-	/**
-	 * Returns the value of the '<em><b>Time</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Time</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Time</em>' containment reference.
-	 * @see #setTime(Time)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUntilPattern_Time()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Time getTime();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UntilPattern#getTime <em>Time</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Time</em>' containment reference.
-	 * @see #getTime()
-	 * @generated
-	 */
-	void setTime(Time value);
-
-} // UntilPattern
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Until Pattern</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.UntilPattern#getFirst <em>First</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.UntilPattern#getSecond <em>Second</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.UntilPattern#getTime <em>Time</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUntilPattern()
+ * @model
+ * @generated
+ */
+public interface UntilPattern extends Order
+{
+  /**
+   * Returns the value of the '<em><b>First</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>First</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>First</em>' reference.
+   * @see #setFirst(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUntilPattern_First()
+   * @model
+   * @generated
+   */
+  MetaStatement getFirst();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UntilPattern#getFirst <em>First</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>First</em>' reference.
+   * @see #getFirst()
+   * @generated
+   */
+  void setFirst(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Second</b></em>' reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Second</em>' reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Second</em>' reference.
+   * @see #setSecond(MetaStatement)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUntilPattern_Second()
+   * @model
+   * @generated
+   */
+  MetaStatement getSecond();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UntilPattern#getSecond <em>Second</em>}' reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Second</em>' reference.
+   * @see #getSecond()
+   * @generated
+   */
+  void setSecond(MetaStatement value);
+
+  /**
+   * Returns the value of the '<em><b>Time</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Time</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Time</em>' containment reference.
+   * @see #setTime(Time)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUntilPattern_Time()
+   * @model containment="true"
+   * @generated
+   */
+  Time getTime();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UntilPattern#getTime <em>Time</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Time</em>' containment reference.
+   * @see #getTime()
+   * @generated
+   */
+  void setTime(Time value);
+
+} // UntilPattern

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/UpperTimeBound.java

@@ -1,50 +1,51 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Upper Time Bound</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.UpperTimeBound#getVal <em>Val</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUpperTimeBound()
- * @model
- * @generated
- */
-public interface UpperTimeBound extends Time {
-	/**
-	 * Returns the value of the '<em><b>Val</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Val</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Val</em>' containment reference.
-	 * @see #setVal(NumValue)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUpperTimeBound_Val()
-	 * @model containment="true"
-	 * @generated
-	 */
-	NumValue getVal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UpperTimeBound#getVal <em>Val</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Val</em>' containment reference.
-	 * @see #getVal()
-	 * @generated
-	 */
-	void setVal(NumValue value);
-
-} // UpperTimeBound
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Upper Time Bound</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.UpperTimeBound#getVal <em>Val</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUpperTimeBound()
+ * @model
+ * @generated
+ */
+public interface UpperTimeBound extends Time
+{
+  /**
+   * Returns the value of the '<em><b>Val</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Val</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Val</em>' containment reference.
+   * @see #setVal(NumValue)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getUpperTimeBound_Val()
+   * @model containment="true"
+   * @generated
+   */
+  NumValue getVal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.UpperTimeBound#getVal <em>Val</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Val</em>' containment reference.
+   * @see #getVal()
+   * @generated
+   */
+  void setVal(NumValue value);
+
+} // UpperTimeBound

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Value.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Value</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getValue()
- * @model
- * @generated
- */
-public interface Value extends EObject {
-} // Value
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Value</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getValue()
+ * @model
+ * @generated
+ */
+public interface Value extends EObject
+{
+} // Value

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/ValueWithUnit.java

@@ -1,77 +1,78 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Value With Unit</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ValueWithUnit#getVal <em>Val</em>}</li>
- *   <li>{@link be.uantwerpen.cosys.contractLang.ValueWithUnit#getUnit <em>Unit</em>}</li>
- * </ul>
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getValueWithUnit()
- * @model
- * @generated
- */
-public interface ValueWithUnit extends Expression, Value {
-	/**
-	 * Returns the value of the '<em><b>Val</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Val</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Val</em>' containment reference.
-	 * @see #setVal(NumValue)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getValueWithUnit_Val()
-	 * @model containment="true"
-	 * @generated
-	 */
-	NumValue getVal();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ValueWithUnit#getVal <em>Val</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Val</em>' containment reference.
-	 * @see #getVal()
-	 * @generated
-	 */
-	void setVal(NumValue value);
-
-	/**
-	 * Returns the value of the '<em><b>Unit</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unit</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unit</em>' containment reference.
-	 * @see #setUnit(Unit)
-	 * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getValueWithUnit_Unit()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Unit getUnit();
-
-	/**
-	 * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ValueWithUnit#getUnit <em>Unit</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unit</em>' containment reference.
-	 * @see #getUnit()
-	 * @generated
-	 */
-	void setUnit(Unit value);
-
-} // ValueWithUnit
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Value With Unit</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ValueWithUnit#getVal <em>Val</em>}</li>
+ *   <li>{@link be.uantwerpen.cosys.contractLang.ValueWithUnit#getUnit <em>Unit</em>}</li>
+ * </ul>
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getValueWithUnit()
+ * @model
+ * @generated
+ */
+public interface ValueWithUnit extends Expression, Value
+{
+  /**
+   * Returns the value of the '<em><b>Val</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Val</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Val</em>' containment reference.
+   * @see #setVal(NumValue)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getValueWithUnit_Val()
+   * @model containment="true"
+   * @generated
+   */
+  NumValue getVal();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ValueWithUnit#getVal <em>Val</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Val</em>' containment reference.
+   * @see #getVal()
+   * @generated
+   */
+  void setVal(NumValue value);
+
+  /**
+   * Returns the value of the '<em><b>Unit</b></em>' containment reference.
+   * <!-- begin-user-doc -->
+   * <p>
+   * If the meaning of the '<em>Unit</em>' containment reference isn't clear,
+   * there really should be more of a description here...
+   * </p>
+   * <!-- end-user-doc -->
+   * @return the value of the '<em>Unit</em>' containment reference.
+   * @see #setUnit(Unit)
+   * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getValueWithUnit_Unit()
+   * @model containment="true"
+   * @generated
+   */
+  Unit getUnit();
+
+  /**
+   * Sets the value of the '{@link be.uantwerpen.cosys.contractLang.ValueWithUnit#getUnit <em>Unit</em>}' containment reference.
+   * <!-- begin-user-doc -->
+   * <!-- end-user-doc -->
+   * @param value the new value of the '<em>Unit</em>' containment reference.
+   * @see #getUnit()
+   * @generated
+   */
+  void setUnit(Unit value);
+
+} // ValueWithUnit

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/VarOrVarOp.java

@@ -1,19 +1,20 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Var Or Var Op</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getVarOrVarOp()
- * @model
- * @generated
- */
-public interface VarOrVarOp extends EObject {
-} // VarOrVarOp
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Var Or Var Op</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getVarOrVarOp()
+ * @model
+ * @generated
+ */
+public interface VarOrVarOp extends EObject
+{
+} // VarOrVarOp

be.uantwerpen.cosys.ContractLang/src/be/uantwerpen/cosys/contractLang/Variable.java

@@ -1,18 +1,19 @@
-/**
- * generated by Xtext 2.16.0
- */
-package be.uantwerpen.cosys.contractLang;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Variable</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getVariable()
- * @model
- * @generated
- */
-public interface Variable extends VarOrVarOp {
-} // Variable
+/**
+ * generated by Xtext 2.16.0
+ */
+package be.uantwerpen.cosys.contractLang;
+
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Variable</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ *
+ * @see be.uantwerpen.cosys.contractLang.ContractLangPackage#getVariable()
+ * @model
+ * @generated
+ */
+public interface Variable extends VarOrVarOp
+{
+} // Variable