refactor simpleScenario->crossingScenario

59 files changed, 1294 insertions, 2752 deletions

diff --git a/Domains/simpleScenario/.classpath b/Domains/crossingScenario/.classpath
index 0712d3e2..1643899c 100644
--- a/Domains/simpleScenario/.classpath
+++ b/Domains/crossingScenario/.classpath
@@ -4,6 +4,5 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

         <classpathentry kind="src" path="src"/>

-        <classpathentry kind="src" path="src-gen"/>

         <classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/Domains/simpleScenario/.gitignore b/Domains/crossingScenario/.gitignore
index 0370ac06..0370ac06 100644
--- a/Domains/simpleScenario/.gitignore
+++ b/Domains/crossingScenario/.gitignore
diff --git a/Domains/simpleScenario/.project b/Domains/crossingScenario/.project
index 60b7160b..8368f74e 100644
--- a/Domains/simpleScenario/.project
+++ b/Domains/crossingScenario/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-        <name>simpleScenario</name>

+        <name>crossingScenario</name>

         <comment></comment>

         <projects>

         </projects>

diff --git a/Domains/simpleScenario/.settings/org.eclipse.jdt.core.prefs b/Domains/crossingScenario/.settings/org.eclipse.jdt.core.prefs
index 295926d9..295926d9 100644
--- a/Domains/simpleScenario/.settings/org.eclipse.jdt.core.prefs
+++ b/Domains/crossingScenario/.settings/org.eclipse.jdt.core.prefs
diff --git a/Domains/simpleScenario/META-INF/MANIFEST.MF b/Domains/crossingScenario/META-INF/MANIFEST.MF
index 7772ef80..b2b98c75 100644
--- a/Domains/simpleScenario/META-INF/MANIFEST.MF
+++ b/Domains/crossingScenario/META-INF/MANIFEST.MF
@@ -1,15 +1,15 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: simpleScenario;singleton:=true
+Bundle-SymbolicName: crossingScenario;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: queries,
- simpleScenario,
- simpleScenario.impl,
- simpleScenario.util
+ crossingScenario,
+ crossingScenario.impl,
+ crossingScenario.util
 Require-Bundle: org.eclipse.viatra.query.runtime,
  org.eclipse.viatra.query.runtime.rete,
  org.eclipse.viatra.query.runtime.localsearch,
@@ -23,6 +23,6 @@ Require-Bundle: org.eclipse.viatra.query.runtime,
  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
  hu.bme.mit.inf.dslreasoner.viatra2logic;bundle-version="1.0.0"
 Import-Package: org.apache.log4j
-Automatic-Module-Name: simpleScenario
+Automatic-Module-Name: crossingScenario
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/Domains/simpleScenario/build.properties b/Domains/crossingScenario/build.properties
index cc431c50..cc431c50 100644
--- a/Domains/simpleScenario/build.properties
+++ b/Domains/crossingScenario/build.properties
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java
index 92c0ee3f..035aafcc 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 import org.eclipse.emf.common.util.EList;

 

@@ -15,17 +15,17 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.Actor#getXPos <em>XPos</em>}</li>

- *   <li>{@link simpleScenario.Actor#getYPos <em>YPos</em>}</li>

- *   <li>{@link simpleScenario.Actor#getLength <em>Length</em>}</li>

- *   <li>{@link simpleScenario.Actor#getWidth <em>Width</em>}</li>

- *   <li>{@link simpleScenario.Actor#getXSpeed <em>XSpeed</em>}</li>

- *   <li>{@link simpleScenario.Actor#getRelations <em>Relations</em>}</li>

- *   <li>{@link simpleScenario.Actor#getPlacedOn <em>Placed On</em>}</li>

- *   <li>{@link simpleScenario.Actor#getYSpeed <em>YSpeed</em>}</li>

+ *   <li>{@link crossingScenario.Actor#getXPos <em>XPos</em>}</li>

+ *   <li>{@link crossingScenario.Actor#getYPos <em>YPos</em>}</li>

+ *   <li>{@link crossingScenario.Actor#getLength <em>Length</em>}</li>

+ *   <li>{@link crossingScenario.Actor#getWidth <em>Width</em>}</li>

+ *   <li>{@link crossingScenario.Actor#getXSpeed <em>XSpeed</em>}</li>

+ *   <li>{@link crossingScenario.Actor#getRelations <em>Relations</em>}</li>

+ *   <li>{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}</li>

+ *   <li>{@link crossingScenario.Actor#getYSpeed <em>YSpeed</em>}</li>

  * </ul>

  *

- * @see simpleScenario.SimpleScenarioPackage#getActor()

+ * @see crossingScenario.CrossingScenarioPackage#getActor()

  * @model abstract="true"

  * @generated

  */

@@ -36,14 +36,14 @@ public interface Actor extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>XPos</em>' attribute.

          * @see #setXPos(double)

-         * @see simpleScenario.SimpleScenarioPackage#getActor_XPos()

+         * @see crossingScenario.CrossingScenarioPackage#getActor_XPos()

          * @model required="true"

          * @generated

          */

         double getXPos();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Actor#getXPos <em>XPos</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Actor#getXPos <em>XPos</em>}' attribute.

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

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

          * @param value the new value of the '<em>XPos</em>' attribute.

@@ -58,14 +58,14 @@ public interface Actor extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>YPos</em>' attribute.

          * @see #setYPos(double)

-         * @see simpleScenario.SimpleScenarioPackage#getActor_YPos()

+         * @see crossingScenario.CrossingScenarioPackage#getActor_YPos()

          * @model required="true"

          * @generated

          */

         double getYPos();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Actor#getYPos <em>YPos</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Actor#getYPos <em>YPos</em>}' attribute.

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

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

          * @param value the new value of the '<em>YPos</em>' attribute.

@@ -81,14 +81,14 @@ public interface Actor extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Length</em>' attribute.

          * @see #setLength(double)

-         * @see simpleScenario.SimpleScenarioPackage#getActor_Length()

+         * @see crossingScenario.CrossingScenarioPackage#getActor_Length()

          * @model default="0.0" required="true" derived="true"

          * @generated

          */

         double getLength();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Actor#getLength <em>Length</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Actor#getLength <em>Length</em>}' attribute.

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

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

          * @param value the new value of the '<em>Length</em>' attribute.

@@ -103,14 +103,14 @@ public interface Actor extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Width</em>' attribute.

          * @see #setWidth(double)

-         * @see simpleScenario.SimpleScenarioPackage#getActor_Width()

+         * @see crossingScenario.CrossingScenarioPackage#getActor_Width()

          * @model required="true" derived="true"

          * @generated

          */

         double getWidth();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Actor#getWidth <em>Width</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Actor#getWidth <em>Width</em>}' attribute.

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

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

          * @param value the new value of the '<em>Width</em>' attribute.

@@ -126,14 +126,14 @@ public interface Actor extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>XSpeed</em>' attribute.

          * @see #setXSpeed(double)

-         * @see simpleScenario.SimpleScenarioPackage#getActor_XSpeed()

+         * @see crossingScenario.CrossingScenarioPackage#getActor_XSpeed()

          * @model default="0.0" required="true"

          * @generated

          */

         double getXSpeed();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Actor#getXSpeed <em>XSpeed</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Actor#getXSpeed <em>XSpeed</em>}' attribute.

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

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

          * @param value the new value of the '<em>XSpeed</em>' attribute.

@@ -144,11 +144,11 @@ public interface Actor extends EObject {
 

         /**

          * Returns the value of the '<em><b>Relations</b></em>' containment reference list.

-         * The list contents are of type {@link simpleScenario.Relation}.

+         * The list contents are of type {@link crossingScenario.Relation}.

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

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

          * @return the value of the '<em>Relations</em>' containment reference list.

-         * @see simpleScenario.SimpleScenarioPackage#getActor_Relations()

+         * @see crossingScenario.CrossingScenarioPackage#getActor_Relations()

          * @model containment="true"

          * @generated

          */

@@ -156,20 +156,20 @@ public interface Actor extends EObject {
 

         /**

          * Returns the value of the '<em><b>Placed On</b></em>' reference.

-         * It is bidirectional and its opposite is '{@link simpleScenario.Lane#getActors <em>Actors</em>}'.

+         * It is bidirectional and its opposite is '{@link crossingScenario.Lane#getActors <em>Actors</em>}'.

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

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

          * @return the value of the '<em>Placed On</em>' reference.

          * @see #setPlacedOn(Lane)

-         * @see simpleScenario.SimpleScenarioPackage#getActor_PlacedOn()

-         * @see simpleScenario.Lane#getActors

+         * @see crossingScenario.CrossingScenarioPackage#getActor_PlacedOn()

+         * @see crossingScenario.Lane#getActors

          * @model opposite="actors" required="true"

          * @generated

          */

         Lane getPlacedOn();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Actor#getPlacedOn <em>Placed On</em>}' reference.

+         * Sets the value of the '{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}' reference.

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

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

          * @param value the new value of the '<em>Placed On</em>' reference.

@@ -184,14 +184,14 @@ public interface Actor extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>YSpeed</em>' attribute.

          * @see #setYSpeed(double)

-         * @see simpleScenario.SimpleScenarioPackage#getActor_YSpeed()

+         * @see crossingScenario.CrossingScenarioPackage#getActor_YSpeed()

          * @model required="true"

          * @generated

          */

         double getYSpeed();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Actor#getYSpeed <em>YSpeed</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Actor#getYSpeed <em>YSpeed</em>}' attribute.

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

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

          * @param value the new value of the '<em>YSpeed</em>' attribute.

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/CollisionDoesNotExist.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CollisionDoesNotExist.java
index 2699bb94..1347c478 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/CollisionDoesNotExist.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CollisionDoesNotExist.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 

 /**

@@ -9,7 +9,7 @@ package simpleScenario;
  * <!-- end-user-doc -->

  *

  *

- * @see simpleScenario.SimpleScenarioPackage#getCollisionDoesNotExist()

+ * @see crossingScenario.CrossingScenarioPackage#getCollisionDoesNotExist()

  * @model

  * @generated

  */

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/CollisionExists.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CollisionExists.java
index 9e495f61..95e95217 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/CollisionExists.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CollisionExists.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 

 /**

@@ -12,10 +12,10 @@ package simpleScenario;
  * The following features are supported:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.CollisionExists#getCollisionTime <em>Collision Time</em>}</li>

+ *   <li>{@link crossingScenario.CollisionExists#getCollisionTime <em>Collision Time</em>}</li>

  * </ul>

  *

- * @see simpleScenario.SimpleScenarioPackage#getCollisionExists()

+ * @see crossingScenario.CrossingScenarioPackage#getCollisionExists()

  * @model

  * @generated

  */

@@ -26,14 +26,14 @@ public interface CollisionExists extends TemporalRelation {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Collision Time</em>' attribute.

          * @see #setCollisionTime(double)

-         * @see simpleScenario.SimpleScenarioPackage#getCollisionExists_CollisionTime()

+         * @see crossingScenario.CrossingScenarioPackage#getCollisionExists_CollisionTime()

          * @model required="true"

          * @generated

          */

         double getCollisionTime();

 

         /**

-         * Sets the value of the '{@link simpleScenario.CollisionExists#getCollisionTime <em>Collision Time</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.CollisionExists#getCollisionTime <em>Collision Time</em>}' attribute.

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

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

          * @param value the new value of the '<em>Collision Time</em>' attribute.

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenario.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java
index 718d5bea..afbe34e7 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenario.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 import org.eclipse.emf.common.util.EList;

 

@@ -8,39 +8,39 @@ import org.eclipse.emf.ecore.EObject;
 

 /**

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

- * A representation of the model object '<em><b>Simple Scenario</b></em>'.

+ * A representation of the model object '<em><b>Crossing Scenario</b></em>'.

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

  *

  * <p>

  * The following features are supported:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.SimpleScenario#getXSize <em>XSize</em>}</li>

- *   <li>{@link simpleScenario.SimpleScenario#getYSize <em>YSize</em>}</li>

- *   <li>{@link simpleScenario.SimpleScenario#getActors <em>Actors</em>}</li>

- *   <li>{@link simpleScenario.SimpleScenario#getLanes <em>Lanes</em>}</li>

- *   <li>{@link simpleScenario.SimpleScenario#getMaxTime <em>Max Time</em>}</li>

+ *   <li>{@link crossingScenario.CrossingScenario#getXSize <em>XSize</em>}</li>

+ *   <li>{@link crossingScenario.CrossingScenario#getYSize <em>YSize</em>}</li>

+ *   <li>{@link crossingScenario.CrossingScenario#getActors <em>Actors</em>}</li>

+ *   <li>{@link crossingScenario.CrossingScenario#getLanes <em>Lanes</em>}</li>

+ *   <li>{@link crossingScenario.CrossingScenario#getMaxTime <em>Max Time</em>}</li>

  * </ul>

  *

- * @see simpleScenario.SimpleScenarioPackage#getSimpleScenario()

+ * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario()

  * @model

  * @generated

  */

-public interface SimpleScenario extends EObject {

+public interface CrossingScenario extends EObject {

         /**

          * Returns the value of the '<em><b>XSize</b></em>' attribute.

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

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

          * @return the value of the '<em>XSize</em>' attribute.

          * @see #setXSize(double)

-         * @see simpleScenario.SimpleScenarioPackage#getSimpleScenario_XSize()

+         * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_XSize()

          * @model

          * @generated

          */

         double getXSize();

 

         /**

-         * Sets the value of the '{@link simpleScenario.SimpleScenario#getXSize <em>XSize</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.CrossingScenario#getXSize <em>XSize</em>}' attribute.

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

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

          * @param value the new value of the '<em>XSize</em>' attribute.

@@ -55,14 +55,14 @@ public interface SimpleScenario extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>YSize</em>' attribute.

          * @see #setYSize(double)

-         * @see simpleScenario.SimpleScenarioPackage#getSimpleScenario_YSize()

+         * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_YSize()

          * @model

          * @generated

          */

         double getYSize();

 

         /**

-         * Sets the value of the '{@link simpleScenario.SimpleScenario#getYSize <em>YSize</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.CrossingScenario#getYSize <em>YSize</em>}' attribute.

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

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

          * @param value the new value of the '<em>YSize</em>' attribute.

@@ -73,11 +73,11 @@ public interface SimpleScenario extends EObject {
 

         /**

          * Returns the value of the '<em><b>Actors</b></em>' containment reference list.

-         * The list contents are of type {@link simpleScenario.Actor}.

+         * The list contents are of type {@link crossingScenario.Actor}.

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

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

          * @return the value of the '<em>Actors</em>' containment reference list.

-         * @see simpleScenario.SimpleScenarioPackage#getSimpleScenario_Actors()

+         * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_Actors()

          * @model containment="true"

          * @generated

          */

@@ -85,11 +85,11 @@ public interface SimpleScenario extends EObject {
 

         /**

          * Returns the value of the '<em><b>Lanes</b></em>' containment reference list.

-         * The list contents are of type {@link simpleScenario.Lane}.

+         * The list contents are of type {@link crossingScenario.Lane}.

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

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

          * @return the value of the '<em>Lanes</em>' containment reference list.

-         * @see simpleScenario.SimpleScenarioPackage#getSimpleScenario_Lanes()

+         * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_Lanes()

          * @model containment="true"

          * @generated

          */

@@ -101,14 +101,14 @@ public interface SimpleScenario extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Max Time</em>' attribute.

          * @see #setMaxTime(double)

-         * @see simpleScenario.SimpleScenarioPackage#getSimpleScenario_MaxTime()

+         * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_MaxTime()

          * @model

          * @generated

          */

         double getMaxTime();

 

         /**

-         * Sets the value of the '{@link simpleScenario.SimpleScenario#getMaxTime <em>Max Time</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.CrossingScenario#getMaxTime <em>Max Time</em>}' attribute.

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

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

          * @param value the new value of the '<em>Max Time</em>' attribute.

@@ -117,4 +117,4 @@ public interface SimpleScenario extends EObject {
          */

         void setMaxTime(double value);

 

-} // SimpleScenario

+} // CrossingScenario

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioFactory.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioFactory.java
index 7743578f..b281559c 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioFactory.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioFactory.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 import org.eclipse.emf.ecore.EFactory;

 

@@ -9,26 +9,26 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.

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

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

- * @see simpleScenario.SimpleScenarioPackage

+ * @see crossingScenario.CrossingScenarioPackage

  * @generated

  */

-public interface SimpleScenarioFactory extends EFactory {

+public interface CrossingScenarioFactory extends EFactory {

         /**

          * The singleton instance of the factory.

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

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

          * @generated

          */

-        SimpleScenarioFactory eINSTANCE = simpleScenario.impl.SimpleScenarioFactoryImpl.init();

+        CrossingScenarioFactory eINSTANCE = crossingScenario.impl.CrossingScenarioFactoryImpl.init();

 

         /**

-         * Returns a new object of class '<em>Simple Scenario</em>'.

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

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

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

-         * @return a new object of class '<em>Simple Scenario</em>'.

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

          * @generated

          */

-        SimpleScenario createSimpleScenario();

+        CrossingScenario createCrossingScenario();

 

         /**

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

@@ -49,13 +49,13 @@ public interface SimpleScenarioFactory extends EFactory {
         VisionBlocked createVisionBlocked();

 

         /**

-         * Returns a new object of class '<em>Seperation Distance</em>'.

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

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

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

-         * @return a new object of class '<em>Seperation Distance</em>'.

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

          * @generated

          */

-        SeperationDistance createSeperationDistance();

+        SeparationDistance createSeparationDistance();

 

         /**

          * Returns a new object of class '<em>Collision Exists</em>'.

@@ -100,6 +100,6 @@ public interface SimpleScenarioFactory extends EFactory {
          * @return the package supported by this factory.

          * @generated

          */

-        SimpleScenarioPackage getSimpleScenarioPackage();

+        CrossingScenarioPackage getCrossingScenarioPackage();

 

-} //SimpleScenarioFactory

+} //CrossingScenarioFactory

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
index 897d4653..c690a23c 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

@@ -20,18 +20,18 @@ import org.eclipse.emf.ecore.EReference;
  *   <li>and each data type</li>

  * </ul>

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

- * @see simpleScenario.SimpleScenarioFactory

+ * @see crossingScenario.CrossingScenarioFactory

  * @model kind="package"

  * @generated

  */

-public interface SimpleScenarioPackage extends EPackage {

+public interface CrossingScenarioPackage extends EPackage {

         /**

          * The package name.

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

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

          * @generated

          */

-        String eNAME = "simpleScenario";

+        String eNAME = "crossingScenario";

 

         /**

          * The package namespace URI.

@@ -39,7 +39,7 @@ public interface SimpleScenarioPackage extends EPackage {
          * <!-- end-user-doc -->

          * @generated

          */

-        String eNS_URI = "http://www.example.com/simpleScenario";

+        String eNS_URI = "http://www.example.com/crossingScenario";

 

         /**

          * The package namespace name.

@@ -47,7 +47,7 @@ public interface SimpleScenarioPackage extends EPackage {
          * <!-- end-user-doc -->

          * @generated

          */

-        String eNS_PREFIX = "simpleScenario";

+        String eNS_PREFIX = "crossingScenario";

 

         /**

          * The singleton instance of the package.

@@ -55,17 +55,17 @@ public interface SimpleScenarioPackage extends EPackage {
          * <!-- end-user-doc -->

          * @generated

          */

-        SimpleScenarioPackage eINSTANCE = simpleScenario.impl.SimpleScenarioPackageImpl.init();

+        CrossingScenarioPackage eINSTANCE = crossingScenario.impl.CrossingScenarioPackageImpl.init();

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.SimpleScenarioImpl <em>Simple Scenario</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.CrossingScenarioImpl <em>Crossing Scenario</em>}' class.

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

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

-         * @see simpleScenario.impl.SimpleScenarioImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSimpleScenario()

+         * @see crossingScenario.impl.CrossingScenarioImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getCrossingScenario()

          * @generated

          */

-        int SIMPLE_SCENARIO = 0;

+        int CROSSING_SCENARIO = 0;

 

         /**

          * The feature id for the '<em><b>XSize</b></em>' attribute.

@@ -74,7 +74,7 @@ public interface SimpleScenarioPackage extends EPackage {
          * @generated

          * @ordered

          */

-        int SIMPLE_SCENARIO__XSIZE = 0;

+        int CROSSING_SCENARIO__XSIZE = 0;

 

         /**

          * The feature id for the '<em><b>YSize</b></em>' attribute.

@@ -83,7 +83,7 @@ public interface SimpleScenarioPackage extends EPackage {
          * @generated

          * @ordered

          */

-        int SIMPLE_SCENARIO__YSIZE = 1;

+        int CROSSING_SCENARIO__YSIZE = 1;

 

         /**

          * The feature id for the '<em><b>Actors</b></em>' containment reference list.

@@ -92,7 +92,7 @@ public interface SimpleScenarioPackage extends EPackage {
          * @generated

          * @ordered

          */

-        int SIMPLE_SCENARIO__ACTORS = 2;

+        int CROSSING_SCENARIO__ACTORS = 2;

 

         /**

          * The feature id for the '<em><b>Lanes</b></em>' containment reference list.

@@ -101,7 +101,7 @@ public interface SimpleScenarioPackage extends EPackage {
          * @generated

          * @ordered

          */

-        int SIMPLE_SCENARIO__LANES = 3;

+        int CROSSING_SCENARIO__LANES = 3;

 

         /**

          * The feature id for the '<em><b>Max Time</b></em>' attribute.

@@ -110,32 +110,32 @@ public interface SimpleScenarioPackage extends EPackage {
          * @generated

          * @ordered

          */

-        int SIMPLE_SCENARIO__MAX_TIME = 4;

+        int CROSSING_SCENARIO__MAX_TIME = 4;

 

         /**

-         * The number of structural features of the '<em>Simple Scenario</em>' class.

+         * The number of structural features of the '<em>Crossing Scenario</em>' class.

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

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

          * @generated

          * @ordered

          */

-        int SIMPLE_SCENARIO_FEATURE_COUNT = 5;

+        int CROSSING_SCENARIO_FEATURE_COUNT = 5;

 

         /**

-         * The number of operations of the '<em>Simple Scenario</em>' class.

+         * The number of operations of the '<em>Crossing Scenario</em>' class.

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

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

          * @generated

          * @ordered

          */

-        int SIMPLE_SCENARIO_OPERATION_COUNT = 0;

+        int CROSSING_SCENARIO_OPERATION_COUNT = 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.LaneImpl <em>Lane</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.LaneImpl <em>Lane</em>}' class.

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

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

-         * @see simpleScenario.impl.LaneImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getLane()

+         * @see crossingScenario.impl.LaneImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane()

          * @generated

          */

         int LANE = 1;

@@ -213,11 +213,11 @@ public interface SimpleScenarioPackage extends EPackage {
         int LANE_OPERATION_COUNT = 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.ActorImpl <em>Actor</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.ActorImpl <em>Actor</em>}' class.

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

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

-         * @see simpleScenario.impl.ActorImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getActor()

+         * @see crossingScenario.impl.ActorImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getActor()

          * @generated

          */

         int ACTOR = 2;

@@ -313,11 +313,11 @@ public interface SimpleScenarioPackage extends EPackage {
         int ACTOR_OPERATION_COUNT = 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.RelationImpl <em>Relation</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.RelationImpl <em>Relation</em>}' class.

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

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

-         * @see simpleScenario.impl.RelationImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getRelation()

+         * @see crossingScenario.impl.RelationImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getRelation()

          * @generated

          */

         int RELATION = 3;

@@ -350,11 +350,11 @@ public interface SimpleScenarioPackage extends EPackage {
         int RELATION_OPERATION_COUNT = 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.SpatialRelationImpl <em>Spatial Relation</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.SpatialRelationImpl <em>Spatial Relation</em>}' class.

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

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

-         * @see simpleScenario.impl.SpatialRelationImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSpatialRelation()

+         * @see crossingScenario.impl.SpatialRelationImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSpatialRelation()

          * @generated

          */

         int SPATIAL_RELATION = 4;

@@ -387,11 +387,11 @@ public interface SimpleScenarioPackage extends EPackage {
         int SPATIAL_RELATION_OPERATION_COUNT = RELATION_OPERATION_COUNT + 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.TemporalRelationImpl <em>Temporal Relation</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.TemporalRelationImpl <em>Temporal Relation</em>}' class.

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

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

-         * @see simpleScenario.impl.TemporalRelationImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getTemporalRelation()

+         * @see crossingScenario.impl.TemporalRelationImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getTemporalRelation()

          * @generated

          */

         int TEMPORAL_RELATION = 5;

@@ -424,11 +424,11 @@ public interface SimpleScenarioPackage extends EPackage {
         int TEMPORAL_RELATION_OPERATION_COUNT = RELATION_OPERATION_COUNT + 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.VisionBlockedImpl <em>Vision Blocked</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.VisionBlockedImpl <em>Vision Blocked</em>}' class.

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

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

-         * @see simpleScenario.impl.VisionBlockedImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getVisionBlocked()

+         * @see crossingScenario.impl.VisionBlockedImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getVisionBlocked()

          * @generated

          */

         int VISION_BLOCKED = 6;

@@ -470,14 +470,14 @@ public interface SimpleScenarioPackage extends EPackage {
         int VISION_BLOCKED_OPERATION_COUNT = SPATIAL_RELATION_OPERATION_COUNT + 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.SeperationDistanceImpl <em>Seperation Distance</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.SeparationDistanceImpl <em>Separation Distance</em>}' class.

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

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

-         * @see simpleScenario.impl.SeperationDistanceImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSeperationDistance()

+         * @see crossingScenario.impl.SeparationDistanceImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSeparationDistance()

          * @generated

          */

-        int SEPERATION_DISTANCE = 7;

+        int SEPARATION_DISTANCE = 7;

 

         /**

          * The feature id for the '<em><b>Target</b></em>' reference.

@@ -486,7 +486,7 @@ public interface SimpleScenarioPackage extends EPackage {
          * @generated

          * @ordered

          */

-        int SEPERATION_DISTANCE__TARGET = SPATIAL_RELATION__TARGET;

+        int SEPARATION_DISTANCE__TARGET = SPATIAL_RELATION__TARGET;

 

         /**

          * The feature id for the '<em><b>Distance</b></em>' attribute.

@@ -495,32 +495,32 @@ public interface SimpleScenarioPackage extends EPackage {
          * @generated

          * @ordered

          */

-        int SEPERATION_DISTANCE__DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 0;

+        int SEPARATION_DISTANCE__DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 0;

 

         /**

-         * The number of structural features of the '<em>Seperation Distance</em>' class.

+         * The number of structural features of the '<em>Separation Distance</em>' class.

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

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

          * @generated

          * @ordered

          */

-        int SEPERATION_DISTANCE_FEATURE_COUNT = SPATIAL_RELATION_FEATURE_COUNT + 1;

+        int SEPARATION_DISTANCE_FEATURE_COUNT = SPATIAL_RELATION_FEATURE_COUNT + 1;

 

         /**

-         * The number of operations of the '<em>Seperation Distance</em>' class.

+         * The number of operations of the '<em>Separation Distance</em>' class.

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

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

          * @generated

          * @ordered

          */

-        int SEPERATION_DISTANCE_OPERATION_COUNT = SPATIAL_RELATION_OPERATION_COUNT + 0;

+        int SEPARATION_DISTANCE_OPERATION_COUNT = SPATIAL_RELATION_OPERATION_COUNT + 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.CollisionExistsImpl <em>Collision Exists</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.CollisionExistsImpl <em>Collision Exists</em>}' class.

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

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

-         * @see simpleScenario.impl.CollisionExistsImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getCollisionExists()

+         * @see crossingScenario.impl.CollisionExistsImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getCollisionExists()

          * @generated

          */

         int COLLISION_EXISTS = 8;

@@ -562,11 +562,11 @@ public interface SimpleScenarioPackage extends EPackage {
         int COLLISION_EXISTS_OPERATION_COUNT = TEMPORAL_RELATION_OPERATION_COUNT + 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.CollisionDoesNotExistImpl <em>Collision Does Not Exist</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.CollisionDoesNotExistImpl <em>Collision Does Not Exist</em>}' class.

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

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

-         * @see simpleScenario.impl.CollisionDoesNotExistImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getCollisionDoesNotExist()

+         * @see crossingScenario.impl.CollisionDoesNotExistImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getCollisionDoesNotExist()

          * @generated

          */

         int COLLISION_DOES_NOT_EXIST = 9;

@@ -599,11 +599,11 @@ public interface SimpleScenarioPackage extends EPackage {
         int COLLISION_DOES_NOT_EXIST_OPERATION_COUNT = TEMPORAL_RELATION_OPERATION_COUNT + 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.PedestrianImpl <em>Pedestrian</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.PedestrianImpl <em>Pedestrian</em>}' class.

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

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

-         * @see simpleScenario.impl.PedestrianImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getPedestrian()

+         * @see crossingScenario.impl.PedestrianImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getPedestrian()

          * @generated

          */

         int PEDESTRIAN = 10;

@@ -699,11 +699,11 @@ public interface SimpleScenarioPackage extends EPackage {
         int PEDESTRIAN_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.impl.VehicleImpl <em>Vehicle</em>}' class.

+         * The meta object id for the '{@link crossingScenario.impl.VehicleImpl <em>Vehicle</em>}' class.

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

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

-         * @see simpleScenario.impl.VehicleImpl

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getVehicle()

+         * @see crossingScenario.impl.VehicleImpl

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getVehicle()

          * @generated

          */

         int VEHICLE = 11;

@@ -799,434 +799,435 @@ public interface SimpleScenarioPackage extends EPackage {
         int VEHICLE_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0;

 

         /**

-         * The meta object id for the '{@link simpleScenario.Orientation <em>Orientation</em>}' enum.

+         * The meta object id for the '{@link crossingScenario.Orientation <em>Orientation</em>}' enum.

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

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

-         * @see simpleScenario.Orientation

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getOrientation()

+         * @see crossingScenario.Orientation

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getOrientation()

          * @generated

          */

         int ORIENTATION = 12;

 

         /**

-         * The meta object id for the '{@link simpleScenario.Size <em>Size</em>}' enum.

+         * The meta object id for the '{@link crossingScenario.Size <em>Size</em>}' enum.

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

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

-         * @see simpleScenario.Size

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSize()

+         * @see crossingScenario.Size

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSize()

          * @generated

          */

         int SIZE = 13;

 

         /**

-         * The meta object id for the '{@link simpleScenario.Distance <em>Distance</em>}' enum.

+         * The meta object id for the '{@link crossingScenario.Distance <em>Distance</em>}' enum.

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

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

-         * @see simpleScenario.Distance

-         * @see simpleScenario.impl.SimpleScenarioPackageImpl#getDistance()

+         * @see crossingScenario.Distance

+         * @see crossingScenario.impl.CrossingScenarioPackageImpl#getDistance()

          * @generated

          */

         int DISTANCE = 14;

 

+

         /**

-         * Returns the meta object for class '{@link simpleScenario.SimpleScenario <em>Simple Scenario</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.CrossingScenario <em>Crossing Scenario</em>}'.

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

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

-         * @return the meta object for class '<em>Simple Scenario</em>'.

-         * @see simpleScenario.SimpleScenario

+         * @return the meta object for class '<em>Crossing Scenario</em>'.

+         * @see crossingScenario.CrossingScenario

          * @generated

          */

-        EClass getSimpleScenario();

+        EClass getCrossingScenario();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.SimpleScenario#getXSize <em>XSize</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.CrossingScenario#getXSize <em>XSize</em>}'.

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

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

          * @return the meta object for the attribute '<em>XSize</em>'.

-         * @see simpleScenario.SimpleScenario#getXSize()

-         * @see #getSimpleScenario()

+         * @see crossingScenario.CrossingScenario#getXSize()

+         * @see #getCrossingScenario()

          * @generated

          */

-        EAttribute getSimpleScenario_XSize();

+        EAttribute getCrossingScenario_XSize();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.SimpleScenario#getYSize <em>YSize</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.CrossingScenario#getYSize <em>YSize</em>}'.

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

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

          * @return the meta object for the attribute '<em>YSize</em>'.

-         * @see simpleScenario.SimpleScenario#getYSize()

-         * @see #getSimpleScenario()

+         * @see crossingScenario.CrossingScenario#getYSize()

+         * @see #getCrossingScenario()

          * @generated

          */

-        EAttribute getSimpleScenario_YSize();

+        EAttribute getCrossingScenario_YSize();

 

         /**

-         * Returns the meta object for the containment reference list '{@link simpleScenario.SimpleScenario#getActors <em>Actors</em>}'.

+         * Returns the meta object for the containment reference list '{@link crossingScenario.CrossingScenario#getActors <em>Actors</em>}'.

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

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

          * @return the meta object for the containment reference list '<em>Actors</em>'.

-         * @see simpleScenario.SimpleScenario#getActors()

-         * @see #getSimpleScenario()

+         * @see crossingScenario.CrossingScenario#getActors()

+         * @see #getCrossingScenario()

          * @generated

          */

-        EReference getSimpleScenario_Actors();

+        EReference getCrossingScenario_Actors();

 

         /**

-         * Returns the meta object for the containment reference list '{@link simpleScenario.SimpleScenario#getLanes <em>Lanes</em>}'.

+         * Returns the meta object for the containment reference list '{@link crossingScenario.CrossingScenario#getLanes <em>Lanes</em>}'.

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

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

          * @return the meta object for the containment reference list '<em>Lanes</em>'.

-         * @see simpleScenario.SimpleScenario#getLanes()

-         * @see #getSimpleScenario()

+         * @see crossingScenario.CrossingScenario#getLanes()

+         * @see #getCrossingScenario()

          * @generated

          */

-        EReference getSimpleScenario_Lanes();

+        EReference getCrossingScenario_Lanes();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.SimpleScenario#getMaxTime <em>Max Time</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.CrossingScenario#getMaxTime <em>Max Time</em>}'.

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

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

          * @return the meta object for the attribute '<em>Max Time</em>'.

-         * @see simpleScenario.SimpleScenario#getMaxTime()

-         * @see #getSimpleScenario()

+         * @see crossingScenario.CrossingScenario#getMaxTime()

+         * @see #getCrossingScenario()

          * @generated

          */

-        EAttribute getSimpleScenario_MaxTime();

+        EAttribute getCrossingScenario_MaxTime();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.Lane <em>Lane</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.Lane <em>Lane</em>}'.

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

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

          * @return the meta object for class '<em>Lane</em>'.

-         * @see simpleScenario.Lane

+         * @see crossingScenario.Lane

          * @generated

          */

         EClass getLane();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Lane#getOrientation <em>Orientation</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Lane#getOrientation <em>Orientation</em>}'.

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

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

          * @return the meta object for the attribute '<em>Orientation</em>'.

-         * @see simpleScenario.Lane#getOrientation()

+         * @see crossingScenario.Lane#getOrientation()

          * @see #getLane()

          * @generated

          */

         EAttribute getLane_Orientation();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Lane#getWidth <em>Width</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Lane#getWidth <em>Width</em>}'.

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

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

          * @return the meta object for the attribute '<em>Width</em>'.

-         * @see simpleScenario.Lane#getWidth()

+         * @see crossingScenario.Lane#getWidth()

          * @see #getLane()

          * @generated

          */

         EAttribute getLane_Width();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Lane#getReferenceCoord <em>Reference Coord</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Lane#getReferenceCoord <em>Reference Coord</em>}'.

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

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

          * @return the meta object for the attribute '<em>Reference Coord</em>'.

-         * @see simpleScenario.Lane#getReferenceCoord()

+         * @see crossingScenario.Lane#getReferenceCoord()

          * @see #getLane()

          * @generated

          */

         EAttribute getLane_ReferenceCoord();

 

         /**

-         * Returns the meta object for the reference '{@link simpleScenario.Lane#getPrevLane <em>Prev Lane</em>}'.

+         * Returns the meta object for the reference '{@link crossingScenario.Lane#getPrevLane <em>Prev Lane</em>}'.

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

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

          * @return the meta object for the reference '<em>Prev Lane</em>'.

-         * @see simpleScenario.Lane#getPrevLane()

+         * @see crossingScenario.Lane#getPrevLane()

          * @see #getLane()

          * @generated

          */

         EReference getLane_PrevLane();

 

         /**

-         * Returns the meta object for the reference list '{@link simpleScenario.Lane#getActors <em>Actors</em>}'.

+         * Returns the meta object for the reference list '{@link crossingScenario.Lane#getActors <em>Actors</em>}'.

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

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

          * @return the meta object for the reference list '<em>Actors</em>'.

-         * @see simpleScenario.Lane#getActors()

+         * @see crossingScenario.Lane#getActors()

          * @see #getLane()

          * @generated

          */

         EReference getLane_Actors();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Lane#getNumWidth <em>Num Width</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Lane#getNumWidth <em>Num Width</em>}'.

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

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

          * @return the meta object for the attribute '<em>Num Width</em>'.

-         * @see simpleScenario.Lane#getNumWidth()

+         * @see crossingScenario.Lane#getNumWidth()

          * @see #getLane()

          * @generated

          */

         EAttribute getLane_NumWidth();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.Actor <em>Actor</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.Actor <em>Actor</em>}'.

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

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

          * @return the meta object for class '<em>Actor</em>'.

-         * @see simpleScenario.Actor

+         * @see crossingScenario.Actor

          * @generated

          */

         EClass getActor();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Actor#getXPos <em>XPos</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Actor#getXPos <em>XPos</em>}'.

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

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

          * @return the meta object for the attribute '<em>XPos</em>'.

-         * @see simpleScenario.Actor#getXPos()

+         * @see crossingScenario.Actor#getXPos()

          * @see #getActor()

          * @generated

          */

         EAttribute getActor_XPos();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Actor#getYPos <em>YPos</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Actor#getYPos <em>YPos</em>}'.

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

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

          * @return the meta object for the attribute '<em>YPos</em>'.

-         * @see simpleScenario.Actor#getYPos()

+         * @see crossingScenario.Actor#getYPos()

          * @see #getActor()

          * @generated

          */

         EAttribute getActor_YPos();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Actor#getLength <em>Length</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Actor#getLength <em>Length</em>}'.

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

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

          * @return the meta object for the attribute '<em>Length</em>'.

-         * @see simpleScenario.Actor#getLength()

+         * @see crossingScenario.Actor#getLength()

          * @see #getActor()

          * @generated

          */

         EAttribute getActor_Length();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Actor#getWidth <em>Width</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Actor#getWidth <em>Width</em>}'.

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

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

          * @return the meta object for the attribute '<em>Width</em>'.

-         * @see simpleScenario.Actor#getWidth()

+         * @see crossingScenario.Actor#getWidth()

          * @see #getActor()

          * @generated

          */

         EAttribute getActor_Width();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Actor#getXSpeed <em>XSpeed</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Actor#getXSpeed <em>XSpeed</em>}'.

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

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

          * @return the meta object for the attribute '<em>XSpeed</em>'.

-         * @see simpleScenario.Actor#getXSpeed()

+         * @see crossingScenario.Actor#getXSpeed()

          * @see #getActor()

          * @generated

          */

         EAttribute getActor_XSpeed();

 

         /**

-         * Returns the meta object for the containment reference list '{@link simpleScenario.Actor#getRelations <em>Relations</em>}'.

+         * Returns the meta object for the containment reference list '{@link crossingScenario.Actor#getRelations <em>Relations</em>}'.

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

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

          * @return the meta object for the containment reference list '<em>Relations</em>'.

-         * @see simpleScenario.Actor#getRelations()

+         * @see crossingScenario.Actor#getRelations()

          * @see #getActor()

          * @generated

          */

         EReference getActor_Relations();

 

         /**

-         * Returns the meta object for the reference '{@link simpleScenario.Actor#getPlacedOn <em>Placed On</em>}'.

+         * Returns the meta object for the reference '{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}'.

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

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

          * @return the meta object for the reference '<em>Placed On</em>'.

-         * @see simpleScenario.Actor#getPlacedOn()

+         * @see crossingScenario.Actor#getPlacedOn()

          * @see #getActor()

          * @generated

          */

         EReference getActor_PlacedOn();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.Actor#getYSpeed <em>YSpeed</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.Actor#getYSpeed <em>YSpeed</em>}'.

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

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

          * @return the meta object for the attribute '<em>YSpeed</em>'.

-         * @see simpleScenario.Actor#getYSpeed()

+         * @see crossingScenario.Actor#getYSpeed()

          * @see #getActor()

          * @generated

          */

         EAttribute getActor_YSpeed();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.Relation <em>Relation</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.Relation <em>Relation</em>}'.

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

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

          * @return the meta object for class '<em>Relation</em>'.

-         * @see simpleScenario.Relation

+         * @see crossingScenario.Relation

          * @generated

          */

         EClass getRelation();

 

         /**

-         * Returns the meta object for the reference '{@link simpleScenario.Relation#getTarget <em>Target</em>}'.

+         * Returns the meta object for the reference '{@link crossingScenario.Relation#getTarget <em>Target</em>}'.

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

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

          * @return the meta object for the reference '<em>Target</em>'.

-         * @see simpleScenario.Relation#getTarget()

+         * @see crossingScenario.Relation#getTarget()

          * @see #getRelation()

          * @generated

          */

         EReference getRelation_Target();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.SpatialRelation <em>Spatial Relation</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.SpatialRelation <em>Spatial Relation</em>}'.

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

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

          * @return the meta object for class '<em>Spatial Relation</em>'.

-         * @see simpleScenario.SpatialRelation

+         * @see crossingScenario.SpatialRelation

          * @generated

          */

         EClass getSpatialRelation();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.TemporalRelation <em>Temporal Relation</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.TemporalRelation <em>Temporal Relation</em>}'.

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

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

          * @return the meta object for class '<em>Temporal Relation</em>'.

-         * @see simpleScenario.TemporalRelation

+         * @see crossingScenario.TemporalRelation

          * @generated

          */

         EClass getTemporalRelation();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.VisionBlocked <em>Vision Blocked</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.VisionBlocked <em>Vision Blocked</em>}'.

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

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

          * @return the meta object for class '<em>Vision Blocked</em>'.

-         * @see simpleScenario.VisionBlocked

+         * @see crossingScenario.VisionBlocked

          * @generated

          */

         EClass getVisionBlocked();

 

         /**

-         * Returns the meta object for the reference '{@link simpleScenario.VisionBlocked#getBlockedBy <em>Blocked By</em>}'.

+         * Returns the meta object for the reference '{@link crossingScenario.VisionBlocked#getBlockedBy <em>Blocked By</em>}'.

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

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

          * @return the meta object for the reference '<em>Blocked By</em>'.

-         * @see simpleScenario.VisionBlocked#getBlockedBy()

+         * @see crossingScenario.VisionBlocked#getBlockedBy()

          * @see #getVisionBlocked()

          * @generated

          */

         EReference getVisionBlocked_BlockedBy();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.SeperationDistance <em>Seperation Distance</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.SeparationDistance <em>Separation Distance</em>}'.

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

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

-         * @return the meta object for class '<em>Seperation Distance</em>'.

-         * @see simpleScenario.SeperationDistance

+         * @return the meta object for class '<em>Separation Distance</em>'.

+         * @see crossingScenario.SeparationDistance

          * @generated

          */

-        EClass getSeperationDistance();

+        EClass getSeparationDistance();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.SeperationDistance#getDistance <em>Distance</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.SeparationDistance#getDistance <em>Distance</em>}'.

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

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

          * @return the meta object for the attribute '<em>Distance</em>'.

-         * @see simpleScenario.SeperationDistance#getDistance()

-         * @see #getSeperationDistance()

+         * @see crossingScenario.SeparationDistance#getDistance()

+         * @see #getSeparationDistance()

          * @generated

          */

-        EAttribute getSeperationDistance_Distance();

+        EAttribute getSeparationDistance_Distance();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.CollisionExists <em>Collision Exists</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.CollisionExists <em>Collision Exists</em>}'.

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

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

          * @return the meta object for class '<em>Collision Exists</em>'.

-         * @see simpleScenario.CollisionExists

+         * @see crossingScenario.CollisionExists

          * @generated

          */

         EClass getCollisionExists();

 

         /**

-         * Returns the meta object for the attribute '{@link simpleScenario.CollisionExists#getCollisionTime <em>Collision Time</em>}'.

+         * Returns the meta object for the attribute '{@link crossingScenario.CollisionExists#getCollisionTime <em>Collision Time</em>}'.

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

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

          * @return the meta object for the attribute '<em>Collision Time</em>'.

-         * @see simpleScenario.CollisionExists#getCollisionTime()

+         * @see crossingScenario.CollisionExists#getCollisionTime()

          * @see #getCollisionExists()

          * @generated

          */

         EAttribute getCollisionExists_CollisionTime();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.CollisionDoesNotExist <em>Collision Does Not Exist</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.CollisionDoesNotExist <em>Collision Does Not Exist</em>}'.

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

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

          * @return the meta object for class '<em>Collision Does Not Exist</em>'.

-         * @see simpleScenario.CollisionDoesNotExist

+         * @see crossingScenario.CollisionDoesNotExist

          * @generated

          */

         EClass getCollisionDoesNotExist();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.Pedestrian <em>Pedestrian</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.Pedestrian <em>Pedestrian</em>}'.

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

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

          * @return the meta object for class '<em>Pedestrian</em>'.

-         * @see simpleScenario.Pedestrian

+         * @see crossingScenario.Pedestrian

          * @generated

          */

         EClass getPedestrian();

 

         /**

-         * Returns the meta object for class '{@link simpleScenario.Vehicle <em>Vehicle</em>}'.

+         * Returns the meta object for class '{@link crossingScenario.Vehicle <em>Vehicle</em>}'.

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

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

          * @return the meta object for class '<em>Vehicle</em>'.

-         * @see simpleScenario.Vehicle

+         * @see crossingScenario.Vehicle

          * @generated

          */

         EClass getVehicle();

 

         /**

-         * Returns the meta object for enum '{@link simpleScenario.Orientation <em>Orientation</em>}'.

+         * Returns the meta object for enum '{@link crossingScenario.Orientation <em>Orientation</em>}'.

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

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

          * @return the meta object for enum '<em>Orientation</em>'.

-         * @see simpleScenario.Orientation

+         * @see crossingScenario.Orientation

          * @generated

          */

         EEnum getOrientation();

 

         /**

-         * Returns the meta object for enum '{@link simpleScenario.Size <em>Size</em>}'.

+         * Returns the meta object for enum '{@link crossingScenario.Size <em>Size</em>}'.

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

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

          * @return the meta object for enum '<em>Size</em>'.

-         * @see simpleScenario.Size

+         * @see crossingScenario.Size

          * @generated

          */

         EEnum getSize();

 

         /**

-         * Returns the meta object for enum '{@link simpleScenario.Distance <em>Distance</em>}'.

+         * Returns the meta object for enum '{@link crossingScenario.Distance <em>Distance</em>}'.

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

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

          * @return the meta object for enum '<em>Distance</em>'.

-         * @see simpleScenario.Distance

+         * @see crossingScenario.Distance

          * @generated

          */

         EEnum getDistance();

@@ -1238,7 +1239,7 @@ public interface SimpleScenarioPackage extends EPackage {
          * @return the factory that creates the instances of the model.

          * @generated

          */

-        SimpleScenarioFactory getSimpleScenarioFactory();

+        CrossingScenarioFactory getCrossingScenarioFactory();

 

         /**

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

@@ -1255,14 +1256,14 @@ public interface SimpleScenarioPackage extends EPackage {
          */

         interface Literals {

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.SimpleScenarioImpl <em>Simple Scenario</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.CrossingScenarioImpl <em>Crossing Scenario</em>}' class.

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

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

-                 * @see simpleScenario.impl.SimpleScenarioImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSimpleScenario()

+                 * @see crossingScenario.impl.CrossingScenarioImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getCrossingScenario()

                  * @generated

                  */

-                EClass SIMPLE_SCENARIO = eINSTANCE.getSimpleScenario();

+                EClass CROSSING_SCENARIO = eINSTANCE.getCrossingScenario();

 

                 /**

                  * The meta object literal for the '<em><b>XSize</b></em>' attribute feature.

@@ -1270,7 +1271,7 @@ public interface SimpleScenarioPackage extends EPackage {
                  * <!-- end-user-doc -->

                  * @generated

                  */

-                EAttribute SIMPLE_SCENARIO__XSIZE = eINSTANCE.getSimpleScenario_XSize();

+                EAttribute CROSSING_SCENARIO__XSIZE = eINSTANCE.getCrossingScenario_XSize();

 

                 /**

                  * The meta object literal for the '<em><b>YSize</b></em>' attribute feature.

@@ -1278,7 +1279,7 @@ public interface SimpleScenarioPackage extends EPackage {
                  * <!-- end-user-doc -->

                  * @generated

                  */

-                EAttribute SIMPLE_SCENARIO__YSIZE = eINSTANCE.getSimpleScenario_YSize();

+                EAttribute CROSSING_SCENARIO__YSIZE = eINSTANCE.getCrossingScenario_YSize();

 

                 /**

                  * The meta object literal for the '<em><b>Actors</b></em>' containment reference list feature.

@@ -1286,7 +1287,7 @@ public interface SimpleScenarioPackage extends EPackage {
                  * <!-- end-user-doc -->

                  * @generated

                  */

-                EReference SIMPLE_SCENARIO__ACTORS = eINSTANCE.getSimpleScenario_Actors();

+                EReference CROSSING_SCENARIO__ACTORS = eINSTANCE.getCrossingScenario_Actors();

 

                 /**

                  * The meta object literal for the '<em><b>Lanes</b></em>' containment reference list feature.

@@ -1294,7 +1295,7 @@ public interface SimpleScenarioPackage extends EPackage {
                  * <!-- end-user-doc -->

                  * @generated

                  */

-                EReference SIMPLE_SCENARIO__LANES = eINSTANCE.getSimpleScenario_Lanes();

+                EReference CROSSING_SCENARIO__LANES = eINSTANCE.getCrossingScenario_Lanes();

 

                 /**

                  * The meta object literal for the '<em><b>Max Time</b></em>' attribute feature.

@@ -1302,14 +1303,14 @@ public interface SimpleScenarioPackage extends EPackage {
                  * <!-- end-user-doc -->

                  * @generated

                  */

-                EAttribute SIMPLE_SCENARIO__MAX_TIME = eINSTANCE.getSimpleScenario_MaxTime();

+                EAttribute CROSSING_SCENARIO__MAX_TIME = eINSTANCE.getCrossingScenario_MaxTime();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.LaneImpl <em>Lane</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.LaneImpl <em>Lane</em>}' class.

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

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

-                 * @see simpleScenario.impl.LaneImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getLane()

+                 * @see crossingScenario.impl.LaneImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane()

                  * @generated

                  */

                 EClass LANE = eINSTANCE.getLane();

@@ -1363,11 +1364,11 @@ public interface SimpleScenarioPackage extends EPackage {
                 EAttribute LANE__NUM_WIDTH = eINSTANCE.getLane_NumWidth();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.ActorImpl <em>Actor</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.ActorImpl <em>Actor</em>}' class.

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

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

-                 * @see simpleScenario.impl.ActorImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getActor()

+                 * @see crossingScenario.impl.ActorImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getActor()

                  * @generated

                  */

                 EClass ACTOR = eINSTANCE.getActor();

@@ -1437,11 +1438,11 @@ public interface SimpleScenarioPackage extends EPackage {
                 EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.RelationImpl <em>Relation</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.RelationImpl <em>Relation</em>}' class.

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

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

-                 * @see simpleScenario.impl.RelationImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getRelation()

+                 * @see crossingScenario.impl.RelationImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getRelation()

                  * @generated

                  */

                 EClass RELATION = eINSTANCE.getRelation();

@@ -1455,31 +1456,31 @@ public interface SimpleScenarioPackage extends EPackage {
                 EReference RELATION__TARGET = eINSTANCE.getRelation_Target();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.SpatialRelationImpl <em>Spatial Relation</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.SpatialRelationImpl <em>Spatial Relation</em>}' class.

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

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

-                 * @see simpleScenario.impl.SpatialRelationImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSpatialRelation()

+                 * @see crossingScenario.impl.SpatialRelationImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSpatialRelation()

                  * @generated

                  */

                 EClass SPATIAL_RELATION = eINSTANCE.getSpatialRelation();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.TemporalRelationImpl <em>Temporal Relation</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.TemporalRelationImpl <em>Temporal Relation</em>}' class.

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

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

-                 * @see simpleScenario.impl.TemporalRelationImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getTemporalRelation()

+                 * @see crossingScenario.impl.TemporalRelationImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getTemporalRelation()

                  * @generated

                  */

                 EClass TEMPORAL_RELATION = eINSTANCE.getTemporalRelation();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.VisionBlockedImpl <em>Vision Blocked</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.VisionBlockedImpl <em>Vision Blocked</em>}' class.

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

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

-                 * @see simpleScenario.impl.VisionBlockedImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getVisionBlocked()

+                 * @see crossingScenario.impl.VisionBlockedImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getVisionBlocked()

                  * @generated

                  */

                 EClass VISION_BLOCKED = eINSTANCE.getVisionBlocked();

@@ -1493,14 +1494,14 @@ public interface SimpleScenarioPackage extends EPackage {
                 EReference VISION_BLOCKED__BLOCKED_BY = eINSTANCE.getVisionBlocked_BlockedBy();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.SeperationDistanceImpl <em>Seperation Distance</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.SeparationDistanceImpl <em>Separation Distance</em>}' class.

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

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

-                 * @see simpleScenario.impl.SeperationDistanceImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSeperationDistance()

+                 * @see crossingScenario.impl.SeparationDistanceImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSeparationDistance()

                  * @generated

                  */

-                EClass SEPERATION_DISTANCE = eINSTANCE.getSeperationDistance();

+                EClass SEPARATION_DISTANCE = eINSTANCE.getSeparationDistance();

 

                 /**

                  * The meta object literal for the '<em><b>Distance</b></em>' attribute feature.

@@ -1508,14 +1509,14 @@ public interface SimpleScenarioPackage extends EPackage {
                  * <!-- end-user-doc -->

                  * @generated

                  */

-                EAttribute SEPERATION_DISTANCE__DISTANCE = eINSTANCE.getSeperationDistance_Distance();

+                EAttribute SEPARATION_DISTANCE__DISTANCE = eINSTANCE.getSeparationDistance_Distance();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.CollisionExistsImpl <em>Collision Exists</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.CollisionExistsImpl <em>Collision Exists</em>}' class.

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

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

-                 * @see simpleScenario.impl.CollisionExistsImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getCollisionExists()

+                 * @see crossingScenario.impl.CollisionExistsImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getCollisionExists()

                  * @generated

                  */

                 EClass COLLISION_EXISTS = eINSTANCE.getCollisionExists();

@@ -1529,65 +1530,65 @@ public interface SimpleScenarioPackage extends EPackage {
                 EAttribute COLLISION_EXISTS__COLLISION_TIME = eINSTANCE.getCollisionExists_CollisionTime();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.CollisionDoesNotExistImpl <em>Collision Does Not Exist</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.CollisionDoesNotExistImpl <em>Collision Does Not Exist</em>}' class.

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

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

-                 * @see simpleScenario.impl.CollisionDoesNotExistImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getCollisionDoesNotExist()

+                 * @see crossingScenario.impl.CollisionDoesNotExistImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getCollisionDoesNotExist()

                  * @generated

                  */

                 EClass COLLISION_DOES_NOT_EXIST = eINSTANCE.getCollisionDoesNotExist();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.PedestrianImpl <em>Pedestrian</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.PedestrianImpl <em>Pedestrian</em>}' class.

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

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

-                 * @see simpleScenario.impl.PedestrianImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getPedestrian()

+                 * @see crossingScenario.impl.PedestrianImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getPedestrian()

                  * @generated

                  */

                 EClass PEDESTRIAN = eINSTANCE.getPedestrian();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.impl.VehicleImpl <em>Vehicle</em>}' class.

+                 * The meta object literal for the '{@link crossingScenario.impl.VehicleImpl <em>Vehicle</em>}' class.

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

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

-                 * @see simpleScenario.impl.VehicleImpl

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getVehicle()

+                 * @see crossingScenario.impl.VehicleImpl

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getVehicle()

                  * @generated

                  */

                 EClass VEHICLE = eINSTANCE.getVehicle();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.Orientation <em>Orientation</em>}' enum.

+                 * The meta object literal for the '{@link crossingScenario.Orientation <em>Orientation</em>}' enum.

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

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

-                 * @see simpleScenario.Orientation

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getOrientation()

+                 * @see crossingScenario.Orientation

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getOrientation()

                  * @generated

                  */

                 EEnum ORIENTATION = eINSTANCE.getOrientation();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.Size <em>Size</em>}' enum.

+                 * The meta object literal for the '{@link crossingScenario.Size <em>Size</em>}' enum.

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

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

-                 * @see simpleScenario.Size

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSize()

+                 * @see crossingScenario.Size

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSize()

                  * @generated

                  */

                 EEnum SIZE = eINSTANCE.getSize();

 

                 /**

-                 * The meta object literal for the '{@link simpleScenario.Distance <em>Distance</em>}' enum.

+                 * The meta object literal for the '{@link crossingScenario.Distance <em>Distance</em>}' enum.

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

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

-                 * @see simpleScenario.Distance

-                 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getDistance()

+                 * @see crossingScenario.Distance

+                 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getDistance()

                  * @generated

                  */

                 EEnum DISTANCE = eINSTANCE.getDistance();

 

         }

 

-} //SimpleScenarioPackage

+} //CrossingScenarioPackage

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Distance.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java
index 52f67665..68a0deb6 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Distance.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Distance.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 import java.util.Arrays;

 import java.util.Collections;

@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Distance</b></em>',

  * and utility methods for working with them.

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

- * @see simpleScenario.SimpleScenarioPackage#getDistance()

+ * @see crossingScenario.CrossingScenarioPackage#getDistance()

  * @model

  * @generated

  */

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java
index 376117d0..fd04b3c9 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 import org.eclipse.emf.common.util.EList;

 

@@ -15,39 +15,39 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.Lane#getOrientation <em>Orientation</em>}</li>

- *   <li>{@link simpleScenario.Lane#getWidth <em>Width</em>}</li>

- *   <li>{@link simpleScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li>

- *   <li>{@link simpleScenario.Lane#getPrevLane <em>Prev Lane</em>}</li>

- *   <li>{@link simpleScenario.Lane#getActors <em>Actors</em>}</li>

- *   <li>{@link simpleScenario.Lane#getNumWidth <em>Num Width</em>}</li>

+ *   <li>{@link crossingScenario.Lane#getOrientation <em>Orientation</em>}</li>

+ *   <li>{@link crossingScenario.Lane#getWidth <em>Width</em>}</li>

+ *   <li>{@link crossingScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li>

+ *   <li>{@link crossingScenario.Lane#getPrevLane <em>Prev Lane</em>}</li>

+ *   <li>{@link crossingScenario.Lane#getActors <em>Actors</em>}</li>

+ *   <li>{@link crossingScenario.Lane#getNumWidth <em>Num Width</em>}</li>

  * </ul>

  *

- * @see simpleScenario.SimpleScenarioPackage#getLane()

+ * @see crossingScenario.CrossingScenarioPackage#getLane()

  * @model

  * @generated

  */

 public interface Lane extends EObject {

         /**

          * Returns the value of the '<em><b>Orientation</b></em>' attribute.

-         * The literals are from the enumeration {@link simpleScenario.Orientation}.

+         * The literals are from the enumeration {@link crossingScenario.Orientation}.

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

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

          * @return the value of the '<em>Orientation</em>' attribute.

-         * @see simpleScenario.Orientation

+         * @see crossingScenario.Orientation

          * @see #setOrientation(Orientation)

-         * @see simpleScenario.SimpleScenarioPackage#getLane_Orientation()

+         * @see crossingScenario.CrossingScenarioPackage#getLane_Orientation()

          * @model required="true"

          * @generated

          */

         Orientation getOrientation();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Lane#getOrientation <em>Orientation</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Lane#getOrientation <em>Orientation</em>}' attribute.

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

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

          * @param value the new value of the '<em>Orientation</em>' attribute.

-         * @see simpleScenario.Orientation

+         * @see crossingScenario.Orientation

          * @see #getOrientation()

          * @generated

          */

@@ -55,24 +55,24 @@ public interface Lane extends EObject {
 

         /**

          * Returns the value of the '<em><b>Width</b></em>' attribute.

-         * The literals are from the enumeration {@link simpleScenario.Size}.

+         * The literals are from the enumeration {@link crossingScenario.Size}.

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

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

          * @return the value of the '<em>Width</em>' attribute.

-         * @see simpleScenario.Size

+         * @see crossingScenario.Size

          * @see #setWidth(Size)

-         * @see simpleScenario.SimpleScenarioPackage#getLane_Width()

+         * @see crossingScenario.CrossingScenarioPackage#getLane_Width()

          * @model required="true"

          * @generated

          */

         Size getWidth();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Lane#getWidth <em>Width</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Lane#getWidth <em>Width</em>}' attribute.

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

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

          * @param value the new value of the '<em>Width</em>' attribute.

-         * @see simpleScenario.Size

+         * @see crossingScenario.Size

          * @see #getWidth()

          * @generated

          */

@@ -84,14 +84,14 @@ public interface Lane extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Reference Coord</em>' attribute.

          * @see #setReferenceCoord(double)

-         * @see simpleScenario.SimpleScenarioPackage#getLane_ReferenceCoord()

+         * @see crossingScenario.CrossingScenarioPackage#getLane_ReferenceCoord()

          * @model required="true"

          * @generated

          */

         double getReferenceCoord();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Lane#getReferenceCoord <em>Reference Coord</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Lane#getReferenceCoord <em>Reference Coord</em>}' attribute.

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

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

          * @param value the new value of the '<em>Reference Coord</em>' attribute.

@@ -106,14 +106,14 @@ public interface Lane extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Prev Lane</em>' reference.

          * @see #setPrevLane(Lane)

-         * @see simpleScenario.SimpleScenarioPackage#getLane_PrevLane()

+         * @see crossingScenario.CrossingScenarioPackage#getLane_PrevLane()

          * @model

          * @generated

          */

         Lane getPrevLane();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Lane#getPrevLane <em>Prev Lane</em>}' reference.

+         * Sets the value of the '{@link crossingScenario.Lane#getPrevLane <em>Prev Lane</em>}' reference.

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

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

          * @param value the new value of the '<em>Prev Lane</em>' reference.

@@ -124,13 +124,13 @@ public interface Lane extends EObject {
 

         /**

          * Returns the value of the '<em><b>Actors</b></em>' reference list.

-         * The list contents are of type {@link simpleScenario.Actor}.

-         * It is bidirectional and its opposite is '{@link simpleScenario.Actor#getPlacedOn <em>Placed On</em>}'.

+         * The list contents are of type {@link crossingScenario.Actor}.

+         * It is bidirectional and its opposite is '{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}'.

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

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

          * @return the value of the '<em>Actors</em>' reference list.

-         * @see simpleScenario.SimpleScenarioPackage#getLane_Actors()

-         * @see simpleScenario.Actor#getPlacedOn

+         * @see crossingScenario.CrossingScenarioPackage#getLane_Actors()

+         * @see crossingScenario.Actor#getPlacedOn

          * @model opposite="placedOn"

          * @generated

          */

@@ -143,14 +143,14 @@ public interface Lane extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Num Width</em>' attribute.

          * @see #setNumWidth(double)

-         * @see simpleScenario.SimpleScenarioPackage#getLane_NumWidth()

+         * @see crossingScenario.CrossingScenarioPackage#getLane_NumWidth()

          * @model default="0.0" required="true"

          * @generated

          */

         double getNumWidth();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Lane#getNumWidth <em>Num Width</em>}' attribute.

+         * Sets the value of the '{@link crossingScenario.Lane#getNumWidth <em>Num Width</em>}' attribute.

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

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

          * @param value the new value of the '<em>Num Width</em>' attribute.

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Orientation.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Orientation.java
index 8f7f055b..a295e683 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Orientation.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Orientation.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 import java.util.Arrays;

 import java.util.Collections;

@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Orientation</b></em>',

  * and utility methods for working with them.

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

- * @see simpleScenario.SimpleScenarioPackage#getOrientation()

+ * @see crossingScenario.CrossingScenarioPackage#getOrientation()

  * @model

  * @generated

  */

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Pedestrian.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Pedestrian.java
index 27718759..faedd6c4 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Pedestrian.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Pedestrian.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 

 /**

@@ -9,7 +9,7 @@ package simpleScenario;
  * <!-- end-user-doc -->

  *

  *

- * @see simpleScenario.SimpleScenarioPackage#getPedestrian()

+ * @see crossingScenario.CrossingScenarioPackage#getPedestrian()

  * @model

  * @generated

  */

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Relation.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Relation.java
index eaaa296f..213f4df2 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Relation.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Relation.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 import org.eclipse.emf.ecore.EObject;

 

@@ -13,10 +13,10 @@ import org.eclipse.emf.ecore.EObject;
  * The following features are supported:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.Relation#getTarget <em>Target</em>}</li>

+ *   <li>{@link crossingScenario.Relation#getTarget <em>Target</em>}</li>

  * </ul>

  *

- * @see simpleScenario.SimpleScenarioPackage#getRelation()

+ * @see crossingScenario.CrossingScenarioPackage#getRelation()

  * @model abstract="true"

  * @generated

  */

@@ -27,14 +27,14 @@ public interface Relation extends EObject {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Target</em>' reference.

          * @see #setTarget(Actor)

-         * @see simpleScenario.SimpleScenarioPackage#getRelation_Target()

+         * @see crossingScenario.CrossingScenarioPackage#getRelation_Target()

          * @model required="true"

          * @generated

          */

         Actor getTarget();

 

         /**

-         * Sets the value of the '{@link simpleScenario.Relation#getTarget <em>Target</em>}' reference.

+         * Sets the value of the '{@link crossingScenario.Relation#getTarget <em>Target</em>}' reference.

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

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

          * @param value the new value of the '<em>Target</em>' reference.

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/SeparationDistance.java b/Domains/crossingScenario/ecore-gen/crossingScenario/SeparationDistance.java
new file mode 100644
index 00000000..37e31607
--- /dev/null
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/SeparationDistance.java
@@ -0,0 +1,48 @@
+/**

+ */

+package crossingScenario;

+

+

+/**

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

+ * A representation of the model object '<em><b>Separation Distance</b></em>'.

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

+ *

+ * <p>

+ * The following features are supported:

+ * </p>

+ * <ul>

+ *   <li>{@link crossingScenario.SeparationDistance#getDistance <em>Distance</em>}</li>

+ * </ul>

+ *

+ * @see crossingScenario.CrossingScenarioPackage#getSeparationDistance()

+ * @model

+ * @generated

+ */

+public interface SeparationDistance extends SpatialRelation {

+        /**

+         * Returns the value of the '<em><b>Distance</b></em>' attribute.

+         * The literals are from the enumeration {@link crossingScenario.Distance}.

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

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

+         * @return the value of the '<em>Distance</em>' attribute.

+         * @see crossingScenario.Distance

+         * @see #setDistance(Distance)

+         * @see crossingScenario.CrossingScenarioPackage#getSeparationDistance_Distance()

+         * @model required="true"

+         * @generated

+         */

+        Distance getDistance();

+

+        /**

+         * Sets the value of the '{@link crossingScenario.SeparationDistance#getDistance <em>Distance</em>}' attribute.

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

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

+         * @param value the new value of the '<em>Distance</em>' attribute.

+         * @see crossingScenario.Distance

+         * @see #getDistance()

+         * @generated

+         */

+        void setDistance(Distance value);

+

+} // SeparationDistance

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Size.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Size.java
index 2f4f5d81..f4915b2e 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Size.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Size.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 import java.util.Arrays;

 import java.util.Collections;

@@ -13,7 +13,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Size</b></em>',

  * and utility methods for working with them.

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

- * @see simpleScenario.SimpleScenarioPackage#getSize()

+ * @see crossingScenario.CrossingScenarioPackage#getSize()

  * @model

  * @generated

  */

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SpatialRelation.java b/Domains/crossingScenario/ecore-gen/crossingScenario/SpatialRelation.java
index 9b394f58..495ac20c 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SpatialRelation.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/SpatialRelation.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 

 /**

@@ -9,7 +9,7 @@ package simpleScenario;
  * <!-- end-user-doc -->

  *

  *

- * @see simpleScenario.SimpleScenarioPackage#getSpatialRelation()

+ * @see crossingScenario.CrossingScenarioPackage#getSpatialRelation()

  * @model abstract="true"

  * @generated

  */

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/TemporalRelation.java b/Domains/crossingScenario/ecore-gen/crossingScenario/TemporalRelation.java
index 21b56b14..2f688d4a 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/TemporalRelation.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/TemporalRelation.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 

 /**

@@ -9,7 +9,7 @@ package simpleScenario;
  * <!-- end-user-doc -->

  *

  *

- * @see simpleScenario.SimpleScenarioPackage#getTemporalRelation()

+ * @see crossingScenario.CrossingScenarioPackage#getTemporalRelation()

  * @model abstract="true"

  * @generated

  */

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Vehicle.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Vehicle.java
index f37c527e..7be9e3ba 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Vehicle.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Vehicle.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 

 /**

@@ -9,7 +9,7 @@ package simpleScenario;
  * <!-- end-user-doc -->

  *

  *

- * @see simpleScenario.SimpleScenarioPackage#getVehicle()

+ * @see crossingScenario.CrossingScenarioPackage#getVehicle()

  * @model

  * @generated

  */

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/VisionBlocked.java b/Domains/crossingScenario/ecore-gen/crossingScenario/VisionBlocked.java
index cdf5a074..91e075ef 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/VisionBlocked.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/VisionBlocked.java
@@ -1,6 +1,6 @@
 /**

  */

-package simpleScenario;

+package crossingScenario;

 

 

 /**

@@ -12,10 +12,10 @@ package simpleScenario;
  * The following features are supported:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.VisionBlocked#getBlockedBy <em>Blocked By</em>}</li>

+ *   <li>{@link crossingScenario.VisionBlocked#getBlockedBy <em>Blocked By</em>}</li>

  * </ul>

  *

- * @see simpleScenario.SimpleScenarioPackage#getVisionBlocked()

+ * @see crossingScenario.CrossingScenarioPackage#getVisionBlocked()

  * @model

  * @generated

  */

@@ -26,14 +26,14 @@ public interface VisionBlocked extends SpatialRelation {
          * <!-- end-user-doc -->

          * @return the value of the '<em>Blocked By</em>' reference.

          * @see #setBlockedBy(Actor)

-         * @see simpleScenario.SimpleScenarioPackage#getVisionBlocked_BlockedBy()

+         * @see crossingScenario.CrossingScenarioPackage#getVisionBlocked_BlockedBy()

          * @model required="true"

          * @generated

          */

         Actor getBlockedBy();

 

         /**

-         * Sets the value of the '{@link simpleScenario.VisionBlocked#getBlockedBy <em>Blocked By</em>}' reference.

+         * Sets the value of the '{@link crossingScenario.VisionBlocked#getBlockedBy <em>Blocked By</em>}' reference.

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

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

          * @param value the new value of the '<em>Blocked By</em>' reference.

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java
index 780cd305..46e60ec2 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java
@@ -1,6 +1,11 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

+

+import crossingScenario.Actor;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.Lane;

+import crossingScenario.Relation;

 

 import java.util.Collection;

 

@@ -18,11 +23,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

 

-import simpleScenario.Actor;

-import simpleScenario.Lane;

-import simpleScenario.Relation;

-import simpleScenario.SimpleScenarioPackage;

-

 /**

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

  * An implementation of the model object '<em><b>Actor</b></em>'.

@@ -31,14 +31,14 @@ import simpleScenario.SimpleScenarioPackage;
  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.impl.ActorImpl#getXPos <em>XPos</em>}</li>

- *   <li>{@link simpleScenario.impl.ActorImpl#getYPos <em>YPos</em>}</li>

- *   <li>{@link simpleScenario.impl.ActorImpl#getLength <em>Length</em>}</li>

- *   <li>{@link simpleScenario.impl.ActorImpl#getWidth <em>Width</em>}</li>

- *   <li>{@link simpleScenario.impl.ActorImpl#getXSpeed <em>XSpeed</em>}</li>

- *   <li>{@link simpleScenario.impl.ActorImpl#getRelations <em>Relations</em>}</li>

- *   <li>{@link simpleScenario.impl.ActorImpl#getPlacedOn <em>Placed On</em>}</li>

- *   <li>{@link simpleScenario.impl.ActorImpl#getYSpeed <em>YSpeed</em>}</li>

+ *   <li>{@link crossingScenario.impl.ActorImpl#getXPos <em>XPos</em>}</li>

+ *   <li>{@link crossingScenario.impl.ActorImpl#getYPos <em>YPos</em>}</li>

+ *   <li>{@link crossingScenario.impl.ActorImpl#getLength <em>Length</em>}</li>

+ *   <li>{@link crossingScenario.impl.ActorImpl#getWidth <em>Width</em>}</li>

+ *   <li>{@link crossingScenario.impl.ActorImpl#getXSpeed <em>XSpeed</em>}</li>

+ *   <li>{@link crossingScenario.impl.ActorImpl#getRelations <em>Relations</em>}</li>

+ *   <li>{@link crossingScenario.impl.ActorImpl#getPlacedOn <em>Placed On</em>}</li>

+ *   <li>{@link crossingScenario.impl.ActorImpl#getYSpeed <em>YSpeed</em>}</li>

  * </ul>

  *

  * @generated

@@ -200,7 +200,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.ACTOR;

+                return CrossingScenarioPackage.Literals.ACTOR;

         }

 

         /**

@@ -223,7 +223,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                 double oldXPos = xPos;

                 xPos = newXPos;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__XPOS, oldXPos, xPos));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.ACTOR__XPOS, oldXPos, xPos));

         }

 

         /**

@@ -246,7 +246,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                 double oldYPos = yPos;

                 yPos = newYPos;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__YPOS, oldYPos, yPos));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.ACTOR__YPOS, oldYPos, yPos));

         }

 

         /**

@@ -269,7 +269,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                 double oldLength = length;

                 length = newLength;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__LENGTH, oldLength, length));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.ACTOR__LENGTH, oldLength, length));

         }

 

         /**

@@ -292,7 +292,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                 double oldWidth = width;

                 width = newWidth;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__WIDTH, oldWidth, width));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.ACTOR__WIDTH, oldWidth, width));

         }

 

         /**

@@ -315,7 +315,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                 double oldXSpeed = xSpeed;

                 xSpeed = newXSpeed;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__XSPEED, oldXSpeed, xSpeed));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.ACTOR__XSPEED, oldXSpeed, xSpeed));

         }

 

         /**

@@ -326,7 +326,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
         @Override

         public EList<Relation> getRelations() {

                 if (relations == null) {

-                        relations = new EObjectContainmentEList<Relation>(Relation.class, this, SimpleScenarioPackage.ACTOR__RELATIONS);

+                        relations = new EObjectContainmentEList<Relation>(Relation.class, this, CrossingScenarioPackage.ACTOR__RELATIONS);

                 }

                 return relations;

         }

@@ -343,7 +343,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                         placedOn = (Lane)eResolveProxy(oldPlacedOn);

                         if (placedOn != oldPlacedOn) {

                                 if (eNotificationRequired())

-                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, SimpleScenarioPackage.ACTOR__PLACED_ON, oldPlacedOn, placedOn));

+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.ACTOR__PLACED_ON, oldPlacedOn, placedOn));

                         }

                 }

                 return placedOn;

@@ -367,7 +367,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                 Lane oldPlacedOn = placedOn;

                 placedOn = newPlacedOn;

                 if (eNotificationRequired()) {

-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__PLACED_ON, oldPlacedOn, newPlacedOn);

+                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.ACTOR__PLACED_ON, oldPlacedOn, newPlacedOn);

                         if (msgs == null) msgs = notification; else msgs.add(notification);

                 }

                 return msgs;

@@ -383,14 +383,14 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                 if (newPlacedOn != placedOn) {

                         NotificationChain msgs = null;

                         if (placedOn != null)

-                                msgs = ((InternalEObject)placedOn).eInverseRemove(this, SimpleScenarioPackage.LANE__ACTORS, Lane.class, msgs);

+                                msgs = ((InternalEObject)placedOn).eInverseRemove(this, CrossingScenarioPackage.LANE__ACTORS, Lane.class, msgs);

                         if (newPlacedOn != null)

-                                msgs = ((InternalEObject)newPlacedOn).eInverseAdd(this, SimpleScenarioPackage.LANE__ACTORS, Lane.class, msgs);

+                                msgs = ((InternalEObject)newPlacedOn).eInverseAdd(this, CrossingScenarioPackage.LANE__ACTORS, Lane.class, msgs);

                         msgs = basicSetPlacedOn(newPlacedOn, msgs);

                         if (msgs != null) msgs.dispatch();

                 }

                 else if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__PLACED_ON, newPlacedOn, newPlacedOn));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.ACTOR__PLACED_ON, newPlacedOn, newPlacedOn));

         }

 

         /**

@@ -413,7 +413,7 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                 double oldYSpeed = ySpeed;

                 ySpeed = newYSpeed;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__YSPEED, oldYSpeed, ySpeed));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.ACTOR__YSPEED, oldYSpeed, ySpeed));

         }

 

         /**

@@ -424,9 +424,9 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
         @Override

         public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.ACTOR__PLACED_ON:

+                        case CrossingScenarioPackage.ACTOR__PLACED_ON:

                                 if (placedOn != null)

-                                        msgs = ((InternalEObject)placedOn).eInverseRemove(this, SimpleScenarioPackage.LANE__ACTORS, Lane.class, msgs);

+                                        msgs = ((InternalEObject)placedOn).eInverseRemove(this, CrossingScenarioPackage.LANE__ACTORS, Lane.class, msgs);

                                 return basicSetPlacedOn((Lane)otherEnd, msgs);

                 }

                 return super.eInverseAdd(otherEnd, featureID, msgs);

@@ -440,9 +440,9 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
         @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.ACTOR__RELATIONS:

+                        case CrossingScenarioPackage.ACTOR__RELATIONS:

                                 return ((InternalEList<?>)getRelations()).basicRemove(otherEnd, msgs);

-                        case SimpleScenarioPackage.ACTOR__PLACED_ON:

+                        case CrossingScenarioPackage.ACTOR__PLACED_ON:

                                 return basicSetPlacedOn(null, msgs);

                 }

                 return super.eInverseRemove(otherEnd, featureID, msgs);

@@ -456,22 +456,22 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.ACTOR__XPOS:

+                        case CrossingScenarioPackage.ACTOR__XPOS:

                                 return getXPos();

-                        case SimpleScenarioPackage.ACTOR__YPOS:

+                        case CrossingScenarioPackage.ACTOR__YPOS:

                                 return getYPos();

-                        case SimpleScenarioPackage.ACTOR__LENGTH:

+                        case CrossingScenarioPackage.ACTOR__LENGTH:

                                 return getLength();

-                        case SimpleScenarioPackage.ACTOR__WIDTH:

+                        case CrossingScenarioPackage.ACTOR__WIDTH:

                                 return getWidth();

-                        case SimpleScenarioPackage.ACTOR__XSPEED:

+                        case CrossingScenarioPackage.ACTOR__XSPEED:

                                 return getXSpeed();

-                        case SimpleScenarioPackage.ACTOR__RELATIONS:

+                        case CrossingScenarioPackage.ACTOR__RELATIONS:

                                 return getRelations();

-                        case SimpleScenarioPackage.ACTOR__PLACED_ON:

+                        case CrossingScenarioPackage.ACTOR__PLACED_ON:

                                 if (resolve) return getPlacedOn();

                                 return basicGetPlacedOn();

-                        case SimpleScenarioPackage.ACTOR__YSPEED:

+                        case CrossingScenarioPackage.ACTOR__YSPEED:

                                 return getYSpeed();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -486,29 +486,29 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.ACTOR__XPOS:

+                        case CrossingScenarioPackage.ACTOR__XPOS:

                                 setXPos((Double)newValue);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__YPOS:

+                        case CrossingScenarioPackage.ACTOR__YPOS:

                                 setYPos((Double)newValue);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__LENGTH:

+                        case CrossingScenarioPackage.ACTOR__LENGTH:

                                 setLength((Double)newValue);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__WIDTH:

+                        case CrossingScenarioPackage.ACTOR__WIDTH:

                                 setWidth((Double)newValue);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__XSPEED:

+                        case CrossingScenarioPackage.ACTOR__XSPEED:

                                 setXSpeed((Double)newValue);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__RELATIONS:

+                        case CrossingScenarioPackage.ACTOR__RELATIONS:

                                 getRelations().clear();

                                 getRelations().addAll((Collection<? extends Relation>)newValue);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__PLACED_ON:

+                        case CrossingScenarioPackage.ACTOR__PLACED_ON:

                                 setPlacedOn((Lane)newValue);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__YSPEED:

+                        case CrossingScenarioPackage.ACTOR__YSPEED:

                                 setYSpeed((Double)newValue);

                                 return;

                 }

@@ -523,28 +523,28 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.ACTOR__XPOS:

+                        case CrossingScenarioPackage.ACTOR__XPOS:

                                 setXPos(XPOS_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__YPOS:

+                        case CrossingScenarioPackage.ACTOR__YPOS:

                                 setYPos(YPOS_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__LENGTH:

+                        case CrossingScenarioPackage.ACTOR__LENGTH:

                                 setLength(LENGTH_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__WIDTH:

+                        case CrossingScenarioPackage.ACTOR__WIDTH:

                                 setWidth(WIDTH_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__XSPEED:

+                        case CrossingScenarioPackage.ACTOR__XSPEED:

                                 setXSpeed(XSPEED_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__RELATIONS:

+                        case CrossingScenarioPackage.ACTOR__RELATIONS:

                                 getRelations().clear();

                                 return;

-                        case SimpleScenarioPackage.ACTOR__PLACED_ON:

+                        case CrossingScenarioPackage.ACTOR__PLACED_ON:

                                 setPlacedOn((Lane)null);

                                 return;

-                        case SimpleScenarioPackage.ACTOR__YSPEED:

+                        case CrossingScenarioPackage.ACTOR__YSPEED:

                                 setYSpeed(YSPEED_EDEFAULT);

                                 return;

                 }

@@ -559,21 +559,21 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.ACTOR__XPOS:

+                        case CrossingScenarioPackage.ACTOR__XPOS:

                                 return xPos != XPOS_EDEFAULT;

-                        case SimpleScenarioPackage.ACTOR__YPOS:

+                        case CrossingScenarioPackage.ACTOR__YPOS:

                                 return yPos != YPOS_EDEFAULT;

-                        case SimpleScenarioPackage.ACTOR__LENGTH:

+                        case CrossingScenarioPackage.ACTOR__LENGTH:

                                 return length != LENGTH_EDEFAULT;

-                        case SimpleScenarioPackage.ACTOR__WIDTH:

+                        case CrossingScenarioPackage.ACTOR__WIDTH:

                                 return width != WIDTH_EDEFAULT;

-                        case SimpleScenarioPackage.ACTOR__XSPEED:

+                        case CrossingScenarioPackage.ACTOR__XSPEED:

                                 return xSpeed != XSPEED_EDEFAULT;

-                        case SimpleScenarioPackage.ACTOR__RELATIONS:

+                        case CrossingScenarioPackage.ACTOR__RELATIONS:

                                 return relations != null && !relations.isEmpty();

-                        case SimpleScenarioPackage.ACTOR__PLACED_ON:

+                        case CrossingScenarioPackage.ACTOR__PLACED_ON:

                                 return placedOn != null;

-                        case SimpleScenarioPackage.ACTOR__YSPEED:

+                        case CrossingScenarioPackage.ACTOR__YSPEED:

                                 return ySpeed != YSPEED_EDEFAULT;

                 }

                 return super.eIsSet(featureID);

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/CollisionDoesNotExistImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CollisionDoesNotExistImpl.java
index 48eab559..7cdcb6ac 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/CollisionDoesNotExistImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CollisionDoesNotExistImpl.java
@@ -1,11 +1,11 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

 

-import org.eclipse.emf.ecore.EClass;

+import crossingScenario.CollisionDoesNotExist;

+import crossingScenario.CrossingScenarioPackage;

 

-import simpleScenario.CollisionDoesNotExist;

-import simpleScenario.SimpleScenarioPackage;

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

 

 /**

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

@@ -31,7 +31,7 @@ public class CollisionDoesNotExistImpl extends TemporalRelationImpl implements C
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.COLLISION_DOES_NOT_EXIST;

+                return CrossingScenarioPackage.Literals.COLLISION_DOES_NOT_EXIST;

         }

 

 } //CollisionDoesNotExistImpl

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/CollisionExistsImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CollisionExistsImpl.java
index 44a33785..9fd2c2a9 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/CollisionExistsImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CollisionExistsImpl.java
@@ -1,6 +1,9 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

+

+import crossingScenario.CollisionExists;

+import crossingScenario.CrossingScenarioPackage;

 

 import org.eclipse.emf.common.notify.Notification;

 

@@ -8,9 +11,6 @@ import org.eclipse.emf.ecore.EClass;
 

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

-import simpleScenario.CollisionExists;

-import simpleScenario.SimpleScenarioPackage;

-

 /**

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

  * An implementation of the model object '<em><b>Collision Exists</b></em>'.

@@ -19,7 +19,7 @@ import simpleScenario.SimpleScenarioPackage;
  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.impl.CollisionExistsImpl#getCollisionTime <em>Collision Time</em>}</li>

+ *   <li>{@link crossingScenario.impl.CollisionExistsImpl#getCollisionTime <em>Collision Time</em>}</li>

  * </ul>

  *

  * @generated

@@ -61,7 +61,7 @@ public class CollisionExistsImpl extends TemporalRelationImpl implements Collisi
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.COLLISION_EXISTS;

+                return CrossingScenarioPackage.Literals.COLLISION_EXISTS;

         }

 

         /**

@@ -84,7 +84,7 @@ public class CollisionExistsImpl extends TemporalRelationImpl implements Collisi
                 double oldCollisionTime = collisionTime;

                 collisionTime = newCollisionTime;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.COLLISION_EXISTS__COLLISION_TIME, oldCollisionTime, collisionTime));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.COLLISION_EXISTS__COLLISION_TIME, oldCollisionTime, collisionTime));

         }

 

         /**

@@ -95,7 +95,7 @@ public class CollisionExistsImpl extends TemporalRelationImpl implements Collisi
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.COLLISION_EXISTS__COLLISION_TIME:

+                        case CrossingScenarioPackage.COLLISION_EXISTS__COLLISION_TIME:

                                 return getCollisionTime();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -109,7 +109,7 @@ public class CollisionExistsImpl extends TemporalRelationImpl implements Collisi
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.COLLISION_EXISTS__COLLISION_TIME:

+                        case CrossingScenarioPackage.COLLISION_EXISTS__COLLISION_TIME:

                                 setCollisionTime((Double)newValue);

                                 return;

                 }

@@ -124,7 +124,7 @@ public class CollisionExistsImpl extends TemporalRelationImpl implements Collisi
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.COLLISION_EXISTS__COLLISION_TIME:

+                        case CrossingScenarioPackage.COLLISION_EXISTS__COLLISION_TIME:

                                 setCollisionTime(COLLISION_TIME_EDEFAULT);

                                 return;

                 }

@@ -139,7 +139,7 @@ public class CollisionExistsImpl extends TemporalRelationImpl implements Collisi
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.COLLISION_EXISTS__COLLISION_TIME:

+                        case CrossingScenarioPackage.COLLISION_EXISTS__COLLISION_TIME:

                                 return collisionTime != COLLISION_TIME_EDEFAULT;

                 }

                 return super.eIsSet(featureID);

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioFactoryImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java
index 33db5584..6e5bab16 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioFactoryImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java
@@ -1,6 +1,8 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

+

+import crossingScenario.*;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EDataType;

@@ -11,32 +13,30 @@ import org.eclipse.emf.ecore.impl.EFactoryImpl;
 

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

 

-import simpleScenario.*;

-

 /**

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

  * An implementation of the model <b>Factory</b>.

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

  * @generated

  */

-public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleScenarioFactory {

+public class CrossingScenarioFactoryImpl extends EFactoryImpl implements CrossingScenarioFactory {

         /**

          * Creates the default factory implementation.

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

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

          * @generated

          */

-        public static SimpleScenarioFactory init() {

+        public static CrossingScenarioFactory init() {

                 try {

-                        SimpleScenarioFactory theSimpleScenarioFactory = (SimpleScenarioFactory)EPackage.Registry.INSTANCE.getEFactory(SimpleScenarioPackage.eNS_URI);

-                        if (theSimpleScenarioFactory != null) {

-                                return theSimpleScenarioFactory;

+                        CrossingScenarioFactory theCrossingScenarioFactory = (CrossingScenarioFactory)EPackage.Registry.INSTANCE.getEFactory(CrossingScenarioPackage.eNS_URI);

+                        if (theCrossingScenarioFactory != null) {

+                                return theCrossingScenarioFactory;

                         }

                 }

                 catch (Exception exception) {

                         EcorePlugin.INSTANCE.log(exception);

                 }

-                return new SimpleScenarioFactoryImpl();

+                return new CrossingScenarioFactoryImpl();

         }

 

         /**

@@ -45,7 +45,7 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
          * <!-- end-user-doc -->

          * @generated

          */

-        public SimpleScenarioFactoryImpl() {

+        public CrossingScenarioFactoryImpl() {

                 super();

         }

 

@@ -57,14 +57,14 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
         @Override

         public EObject create(EClass eClass) {

                 switch (eClass.getClassifierID()) {

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO: return createSimpleScenario();

-                        case SimpleScenarioPackage.LANE: return createLane();

-                        case SimpleScenarioPackage.VISION_BLOCKED: return createVisionBlocked();

-                        case SimpleScenarioPackage.SEPERATION_DISTANCE: return createSeperationDistance();

-                        case SimpleScenarioPackage.COLLISION_EXISTS: return createCollisionExists();

-                        case SimpleScenarioPackage.COLLISION_DOES_NOT_EXIST: return createCollisionDoesNotExist();

-                        case SimpleScenarioPackage.PEDESTRIAN: return createPedestrian();

-                        case SimpleScenarioPackage.VEHICLE: return createVehicle();

+                        case CrossingScenarioPackage.CROSSING_SCENARIO: return createCrossingScenario();

+                        case CrossingScenarioPackage.LANE: return createLane();

+                        case CrossingScenarioPackage.VISION_BLOCKED: return createVisionBlocked();

+                        case CrossingScenarioPackage.SEPARATION_DISTANCE: return createSeparationDistance();

+                        case CrossingScenarioPackage.COLLISION_EXISTS: return createCollisionExists();

+                        case CrossingScenarioPackage.COLLISION_DOES_NOT_EXIST: return createCollisionDoesNotExist();

+                        case CrossingScenarioPackage.PEDESTRIAN: return createPedestrian();

+                        case CrossingScenarioPackage.VEHICLE: return createVehicle();

                         default:

                                 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");

                 }

@@ -78,11 +78,11 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
         @Override

         public Object createFromString(EDataType eDataType, String initialValue) {

                 switch (eDataType.getClassifierID()) {

-                        case SimpleScenarioPackage.ORIENTATION:

+                        case CrossingScenarioPackage.ORIENTATION:

                                 return createOrientationFromString(eDataType, initialValue);

-                        case SimpleScenarioPackage.SIZE:

+                        case CrossingScenarioPackage.SIZE:

                                 return createSizeFromString(eDataType, initialValue);

-                        case SimpleScenarioPackage.DISTANCE:

+                        case CrossingScenarioPackage.DISTANCE:

                                 return createDistanceFromString(eDataType, initialValue);

                         default:

                                 throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

@@ -97,11 +97,11 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
         @Override

         public String convertToString(EDataType eDataType, Object instanceValue) {

                 switch (eDataType.getClassifierID()) {

-                        case SimpleScenarioPackage.ORIENTATION:

+                        case CrossingScenarioPackage.ORIENTATION:

                                 return convertOrientationToString(eDataType, instanceValue);

-                        case SimpleScenarioPackage.SIZE:

+                        case CrossingScenarioPackage.SIZE:

                                 return convertSizeToString(eDataType, instanceValue);

-                        case SimpleScenarioPackage.DISTANCE:

+                        case CrossingScenarioPackage.DISTANCE:

                                 return convertDistanceToString(eDataType, instanceValue);

                         default:

                                 throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");

@@ -114,9 +114,9 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
          * @generated

          */

         @Override

-        public SimpleScenario createSimpleScenario() {

-                SimpleScenarioImpl simpleScenario = new SimpleScenarioImpl();

-                return simpleScenario;

+        public CrossingScenario createCrossingScenario() {

+                CrossingScenarioImpl crossingScenario = new CrossingScenarioImpl();

+                return crossingScenario;

         }

 

         /**

@@ -147,9 +147,9 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
          * @generated

          */

         @Override

-        public SeperationDistance createSeperationDistance() {

-                SeperationDistanceImpl seperationDistance = new SeperationDistanceImpl();

-                return seperationDistance;

+        public SeparationDistance createSeparationDistance() {

+                SeparationDistanceImpl separationDistance = new SeparationDistanceImpl();

+                return separationDistance;

         }

 

         /**

@@ -262,8 +262,8 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
          * @generated

          */

         @Override

-        public SimpleScenarioPackage getSimpleScenarioPackage() {

-                return (SimpleScenarioPackage)getEPackage();

+        public CrossingScenarioPackage getCrossingScenarioPackage() {

+                return (CrossingScenarioPackage)getEPackage();

         }

 

         /**

@@ -273,8 +273,8 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
          * @generated

          */

         @Deprecated

-        public static SimpleScenarioPackage getPackage() {

-                return SimpleScenarioPackage.eINSTANCE;

+        public static CrossingScenarioPackage getPackage() {

+                return CrossingScenarioPackage.eINSTANCE;

         }

 

-} //SimpleScenarioFactoryImpl

+} //CrossingScenarioFactoryImpl

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java
index e027c457..ad8ee90d 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java
@@ -1,6 +1,11 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

+

+import crossingScenario.Actor;

+import crossingScenario.CrossingScenario;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.Lane;

 

 import java.util.Collection;

 

@@ -18,29 +23,24 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectContainmentEList;

 import org.eclipse.emf.ecore.util.InternalEList;

 

-import simpleScenario.Actor;

-import simpleScenario.Lane;

-import simpleScenario.SimpleScenario;

-import simpleScenario.SimpleScenarioPackage;

-

 /**

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

- * An implementation of the model object '<em><b>Simple Scenario</b></em>'.

+ * An implementation of the model object '<em><b>Crossing Scenario</b></em>'.

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

  * <p>

  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.impl.SimpleScenarioImpl#getXSize <em>XSize</em>}</li>

- *   <li>{@link simpleScenario.impl.SimpleScenarioImpl#getYSize <em>YSize</em>}</li>

- *   <li>{@link simpleScenario.impl.SimpleScenarioImpl#getActors <em>Actors</em>}</li>

- *   <li>{@link simpleScenario.impl.SimpleScenarioImpl#getLanes <em>Lanes</em>}</li>

- *   <li>{@link simpleScenario.impl.SimpleScenarioImpl#getMaxTime <em>Max Time</em>}</li>

+ *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getXSize <em>XSize</em>}</li>

+ *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getYSize <em>YSize</em>}</li>

+ *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getActors <em>Actors</em>}</li>

+ *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getLanes <em>Lanes</em>}</li>

+ *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getMaxTime <em>Max Time</em>}</li>

  * </ul>

  *

  * @generated

  */

-public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements SimpleScenario {

+public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implements CrossingScenario {

         /**

          * The default value of the '{@link #getXSize() <em>XSize</em>}' attribute.

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

@@ -126,7 +126,7 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

-        protected SimpleScenarioImpl() {

+        protected CrossingScenarioImpl() {

                 super();

         }

 

@@ -137,7 +137,7 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.SIMPLE_SCENARIO;

+                return CrossingScenarioPackage.Literals.CROSSING_SCENARIO;

         }

 

         /**

@@ -160,7 +160,7 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
                 double oldXSize = xSize;

                 xSize = newXSize;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SIMPLE_SCENARIO__XSIZE, oldXSize, xSize));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.CROSSING_SCENARIO__XSIZE, oldXSize, xSize));

         }

 

         /**

@@ -183,7 +183,7 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
                 double oldYSize = ySize;

                 ySize = newYSize;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SIMPLE_SCENARIO__YSIZE, oldYSize, ySize));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.CROSSING_SCENARIO__YSIZE, oldYSize, ySize));

         }

 

         /**

@@ -194,7 +194,7 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
         @Override

         public EList<Actor> getActors() {

                 if (actors == null) {

-                        actors = new EObjectContainmentEList<Actor>(Actor.class, this, SimpleScenarioPackage.SIMPLE_SCENARIO__ACTORS);

+                        actors = new EObjectContainmentEList<Actor>(Actor.class, this, CrossingScenarioPackage.CROSSING_SCENARIO__ACTORS);

                 }

                 return actors;

         }

@@ -207,7 +207,7 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
         @Override

         public EList<Lane> getLanes() {

                 if (lanes == null) {

-                        lanes = new EObjectContainmentEList<Lane>(Lane.class, this, SimpleScenarioPackage.SIMPLE_SCENARIO__LANES);

+                        lanes = new EObjectContainmentEList<Lane>(Lane.class, this, CrossingScenarioPackage.CROSSING_SCENARIO__LANES);

                 }

                 return lanes;

         }

@@ -232,7 +232,7 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
                 double oldMaxTime = maxTime;

                 maxTime = newMaxTime;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME, oldMaxTime, maxTime));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME, oldMaxTime, maxTime));

         }

 

         /**

@@ -243,9 +243,9 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
         @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__ACTORS:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__ACTORS:

                                 return ((InternalEList<?>)getActors()).basicRemove(otherEnd, msgs);

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__LANES:

                                 return ((InternalEList<?>)getLanes()).basicRemove(otherEnd, msgs);

                 }

                 return super.eInverseRemove(otherEnd, featureID, msgs);

@@ -259,15 +259,15 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__XSIZE:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__XSIZE:

                                 return getXSize();

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__YSIZE:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__YSIZE:

                                 return getYSize();

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__ACTORS:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__ACTORS:

                                 return getActors();

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__LANES:

                                 return getLanes();

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME:

                                 return getMaxTime();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -282,21 +282,21 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__XSIZE:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__XSIZE:

                                 setXSize((Double)newValue);

                                 return;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__YSIZE:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__YSIZE:

                                 setYSize((Double)newValue);

                                 return;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__ACTORS:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__ACTORS:

                                 getActors().clear();

                                 getActors().addAll((Collection<? extends Actor>)newValue);

                                 return;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__LANES:

                                 getLanes().clear();

                                 getLanes().addAll((Collection<? extends Lane>)newValue);

                                 return;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME:

                                 setMaxTime((Double)newValue);

                                 return;

                 }

@@ -311,19 +311,19 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__XSIZE:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__XSIZE:

                                 setXSize(XSIZE_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__YSIZE:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__YSIZE:

                                 setYSize(YSIZE_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__ACTORS:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__ACTORS:

                                 getActors().clear();

                                 return;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__LANES:

                                 getLanes().clear();

                                 return;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME:

                                 setMaxTime(MAX_TIME_EDEFAULT);

                                 return;

                 }

@@ -338,15 +338,15 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__XSIZE:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__XSIZE:

                                 return xSize != XSIZE_EDEFAULT;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__YSIZE:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__YSIZE:

                                 return ySize != YSIZE_EDEFAULT;

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__ACTORS:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__ACTORS:

                                 return actors != null && !actors.isEmpty();

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__LANES:

                                 return lanes != null && !lanes.isEmpty();

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME:

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME:

                                 return maxTime != MAX_TIME_EDEFAULT;

                 }

                 return super.eIsSet(featureID);

@@ -372,4 +372,4 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
                 return result.toString();

         }

 

-} //SimpleScenarioImpl

+} //CrossingScenarioImpl

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
index d68c10c9..6819135b 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
@@ -1,6 +1,24 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

+

+import crossingScenario.Actor;

+import crossingScenario.CollisionDoesNotExist;

+import crossingScenario.CollisionExists;

+import crossingScenario.CrossingScenario;

+import crossingScenario.CrossingScenarioFactory;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.Distance;

+import crossingScenario.Lane;

+import crossingScenario.Orientation;

+import crossingScenario.Pedestrian;

+import crossingScenario.Relation;

+import crossingScenario.SeparationDistance;

+import crossingScenario.Size;

+import crossingScenario.SpatialRelation;

+import crossingScenario.TemporalRelation;

+import crossingScenario.Vehicle;

+import crossingScenario.VisionBlocked;

 

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EClass;

@@ -10,37 +28,19 @@ import org.eclipse.emf.ecore.EReference;
 

 import org.eclipse.emf.ecore.impl.EPackageImpl;

 

-import simpleScenario.Actor;

-import simpleScenario.CollisionDoesNotExist;

-import simpleScenario.CollisionExists;

-import simpleScenario.Distance;

-import simpleScenario.Lane;

-import simpleScenario.Orientation;

-import simpleScenario.Pedestrian;

-import simpleScenario.Relation;

-import simpleScenario.SeperationDistance;

-import simpleScenario.SimpleScenario;

-import simpleScenario.SimpleScenarioFactory;

-import simpleScenario.SimpleScenarioPackage;

-import simpleScenario.Size;

-import simpleScenario.SpatialRelation;

-import simpleScenario.TemporalRelation;

-import simpleScenario.Vehicle;

-import simpleScenario.VisionBlocked;

-

 /**

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

  * An implementation of the model <b>Package</b>.

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

  * @generated

  */

-public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleScenarioPackage {

+public class CrossingScenarioPackageImpl extends EPackageImpl implements CrossingScenarioPackage {

         /**

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

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

          * @generated

          */

-        private EClass simpleScenarioEClass = null;

+        private EClass crossingScenarioEClass = null;

 

         /**

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

@@ -89,7 +89,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * <!-- end-user-doc -->

          * @generated

          */

-        private EClass seperationDistanceEClass = null;

+        private EClass separationDistanceEClass = null;

 

         /**

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

@@ -151,12 +151,12 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * <!-- begin-user-doc -->

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

          * @see org.eclipse.emf.ecore.EPackage.Registry

-         * @see simpleScenario.SimpleScenarioPackage#eNS_URI

+         * @see crossingScenario.CrossingScenarioPackage#eNS_URI

          * @see #init()

          * @generated

          */

-        private SimpleScenarioPackageImpl() {

-                super(eNS_URI, SimpleScenarioFactory.eINSTANCE);

+        private CrossingScenarioPackageImpl() {

+                super(eNS_URI, CrossingScenarioFactory.eINSTANCE);

         }

 

         /**

@@ -169,7 +169,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
         /**

          * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

          *

-         * <p>This method is used to initialize {@link SimpleScenarioPackage#eINSTANCE} when that field is accessed.

+         * <p>This method is used to initialize {@link CrossingScenarioPackage#eINSTANCE} when that field is accessed.

          * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

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

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

@@ -178,27 +178,27 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @see #initializePackageContents()

          * @generated

          */

-        public static SimpleScenarioPackage init() {

-                if (isInited) return (SimpleScenarioPackage)EPackage.Registry.INSTANCE.getEPackage(SimpleScenarioPackage.eNS_URI);

+        public static CrossingScenarioPackage init() {

+                if (isInited) return (CrossingScenarioPackage)EPackage.Registry.INSTANCE.getEPackage(CrossingScenarioPackage.eNS_URI);

 

                 // Obtain or create and register package

-                Object registeredSimpleScenarioPackage = EPackage.Registry.INSTANCE.get(eNS_URI);

-                SimpleScenarioPackageImpl theSimpleScenarioPackage = registeredSimpleScenarioPackage instanceof SimpleScenarioPackageImpl ? (SimpleScenarioPackageImpl)registeredSimpleScenarioPackage : new SimpleScenarioPackageImpl();

+                Object registeredCrossingScenarioPackage = EPackage.Registry.INSTANCE.get(eNS_URI);

+                CrossingScenarioPackageImpl theCrossingScenarioPackage = registeredCrossingScenarioPackage instanceof CrossingScenarioPackageImpl ? (CrossingScenarioPackageImpl)registeredCrossingScenarioPackage : new CrossingScenarioPackageImpl();

 

                 isInited = true;

 

                 // Create package meta-data objects

-                theSimpleScenarioPackage.createPackageContents();

+                theCrossingScenarioPackage.createPackageContents();

 

                 // Initialize created meta-data

-                theSimpleScenarioPackage.initializePackageContents();

+                theCrossingScenarioPackage.initializePackageContents();

 

                 // Mark meta-data to indicate it can't be changed

-                theSimpleScenarioPackage.freeze();

+                theCrossingScenarioPackage.freeze();

 

                 // Update the registry and return the package

-                EPackage.Registry.INSTANCE.put(SimpleScenarioPackage.eNS_URI, theSimpleScenarioPackage);

-                return theSimpleScenarioPackage;

+                EPackage.Registry.INSTANCE.put(CrossingScenarioPackage.eNS_URI, theCrossingScenarioPackage);

+                return theCrossingScenarioPackage;

         }

 

         /**

@@ -207,8 +207,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @generated

          */

         @Override

-        public EClass getSimpleScenario() {

-                return simpleScenarioEClass;

+        public EClass getCrossingScenario() {

+                return crossingScenarioEClass;

         }

 

         /**

@@ -217,8 +217,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @generated

          */

         @Override

-        public EAttribute getSimpleScenario_XSize() {

-                return (EAttribute)simpleScenarioEClass.getEStructuralFeatures().get(0);

+        public EAttribute getCrossingScenario_XSize() {

+                return (EAttribute)crossingScenarioEClass.getEStructuralFeatures().get(0);

         }

 

         /**

@@ -227,8 +227,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @generated

          */

         @Override

-        public EAttribute getSimpleScenario_YSize() {

-                return (EAttribute)simpleScenarioEClass.getEStructuralFeatures().get(1);

+        public EAttribute getCrossingScenario_YSize() {

+                return (EAttribute)crossingScenarioEClass.getEStructuralFeatures().get(1);

         }

 

         /**

@@ -237,8 +237,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @generated

          */

         @Override

-        public EReference getSimpleScenario_Actors() {

-                return (EReference)simpleScenarioEClass.getEStructuralFeatures().get(2);

+        public EReference getCrossingScenario_Actors() {

+                return (EReference)crossingScenarioEClass.getEStructuralFeatures().get(2);

         }

 

         /**

@@ -247,8 +247,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @generated

          */

         @Override

-        public EReference getSimpleScenario_Lanes() {

-                return (EReference)simpleScenarioEClass.getEStructuralFeatures().get(3);

+        public EReference getCrossingScenario_Lanes() {

+                return (EReference)crossingScenarioEClass.getEStructuralFeatures().get(3);

         }

 

         /**

@@ -257,8 +257,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @generated

          */

         @Override

-        public EAttribute getSimpleScenario_MaxTime() {

-                return (EAttribute)simpleScenarioEClass.getEStructuralFeatures().get(4);

+        public EAttribute getCrossingScenario_MaxTime() {

+                return (EAttribute)crossingScenarioEClass.getEStructuralFeatures().get(4);

         }

 

         /**

@@ -487,8 +487,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @generated

          */

         @Override

-        public EClass getSeperationDistance() {

-                return seperationDistanceEClass;

+        public EClass getSeparationDistance() {

+                return separationDistanceEClass;

         }

 

         /**

@@ -497,8 +497,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @generated

          */

         @Override

-        public EAttribute getSeperationDistance_Distance() {

-                return (EAttribute)seperationDistanceEClass.getEStructuralFeatures().get(0);

+        public EAttribute getSeparationDistance_Distance() {

+                return (EAttribute)separationDistanceEClass.getEStructuralFeatures().get(0);

         }

 

         /**

@@ -587,8 +587,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
          * @generated

          */

         @Override

-        public SimpleScenarioFactory getSimpleScenarioFactory() {

-                return (SimpleScenarioFactory)getEFactoryInstance();

+        public CrossingScenarioFactory getCrossingScenarioFactory() {

+                return (CrossingScenarioFactory)getEFactoryInstance();

         }

 

         /**

@@ -610,12 +610,12 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
                 isCreated = true;

 

                 // Create classes and their features

-                simpleScenarioEClass = createEClass(SIMPLE_SCENARIO);

-                createEAttribute(simpleScenarioEClass, SIMPLE_SCENARIO__XSIZE);

-                createEAttribute(simpleScenarioEClass, SIMPLE_SCENARIO__YSIZE);

-                createEReference(simpleScenarioEClass, SIMPLE_SCENARIO__ACTORS);

-                createEReference(simpleScenarioEClass, SIMPLE_SCENARIO__LANES);

-                createEAttribute(simpleScenarioEClass, SIMPLE_SCENARIO__MAX_TIME);

+                crossingScenarioEClass = createEClass(CROSSING_SCENARIO);

+                createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__XSIZE);

+                createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__YSIZE);

+                createEReference(crossingScenarioEClass, CROSSING_SCENARIO__ACTORS);

+                createEReference(crossingScenarioEClass, CROSSING_SCENARIO__LANES);

+                createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__MAX_TIME);

 

                 laneEClass = createEClass(LANE);

                 createEAttribute(laneEClass, LANE__ORIENTATION);

@@ -645,8 +645,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
                 visionBlockedEClass = createEClass(VISION_BLOCKED);

                 createEReference(visionBlockedEClass, VISION_BLOCKED__BLOCKED_BY);

 

-                seperationDistanceEClass = createEClass(SEPERATION_DISTANCE);

-                createEAttribute(seperationDistanceEClass, SEPERATION_DISTANCE__DISTANCE);

+                separationDistanceEClass = createEClass(SEPARATION_DISTANCE);

+                createEAttribute(separationDistanceEClass, SEPARATION_DISTANCE__DISTANCE);

 

                 collisionExistsEClass = createEClass(COLLISION_EXISTS);

                 createEAttribute(collisionExistsEClass, COLLISION_EXISTS__COLLISION_TIME);

@@ -694,19 +694,19 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
                 spatialRelationEClass.getESuperTypes().add(this.getRelation());

                 temporalRelationEClass.getESuperTypes().add(this.getRelation());

                 visionBlockedEClass.getESuperTypes().add(this.getSpatialRelation());

-                seperationDistanceEClass.getESuperTypes().add(this.getSpatialRelation());

+                separationDistanceEClass.getESuperTypes().add(this.getSpatialRelation());

                 collisionExistsEClass.getESuperTypes().add(this.getTemporalRelation());

                 collisionDoesNotExistEClass.getESuperTypes().add(this.getTemporalRelation());

                 pedestrianEClass.getESuperTypes().add(this.getActor());

                 vehicleEClass.getESuperTypes().add(this.getActor());

 

                 // Initialize classes, features, and operations; add parameters

-                initEClass(simpleScenarioEClass, SimpleScenario.class, "SimpleScenario", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-                initEAttribute(getSimpleScenario_XSize(), ecorePackage.getEDouble(), "xSize", null, 0, 1, SimpleScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-                initEAttribute(getSimpleScenario_YSize(), ecorePackage.getEDouble(), "ySize", null, 0, 1, SimpleScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-                initEReference(getSimpleScenario_Actors(), this.getActor(), null, "actors", null, 0, -1, SimpleScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-                initEReference(getSimpleScenario_Lanes(), this.getLane(), null, "lanes", null, 0, -1, SimpleScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

-                initEAttribute(getSimpleScenario_MaxTime(), ecorePackage.getEDouble(), "maxTime", null, 0, 1, SimpleScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEClass(crossingScenarioEClass, CrossingScenario.class, "CrossingScenario", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEAttribute(getCrossingScenario_XSize(), ecorePackage.getEDouble(), "xSize", null, 0, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEAttribute(getCrossingScenario_YSize(), ecorePackage.getEDouble(), "ySize", null, 0, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getCrossingScenario_Actors(), this.getActor(), null, "actors", null, 0, -1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEReference(getCrossingScenario_Lanes(), this.getLane(), null, "lanes", null, 0, -1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEAttribute(getCrossingScenario_MaxTime(), ecorePackage.getEDouble(), "maxTime", null, 0, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(laneEClass, Lane.class, "Lane", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEAttribute(getLane_Orientation(), this.getOrientation(), "orientation", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -736,8 +736,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
                 initEClass(visionBlockedEClass, VisionBlocked.class, "VisionBlocked", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEReference(getVisionBlocked_BlockedBy(), this.getActor(), null, "blockedBy", null, 1, 1, VisionBlocked.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

-                initEClass(seperationDistanceEClass, SeperationDistance.class, "SeperationDistance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

-                initEAttribute(getSeperationDistance_Distance(), this.getDistance(), "distance", null, 1, 1, SeperationDistance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEClass(separationDistanceEClass, SeparationDistance.class, "SeparationDistance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

+                initEAttribute(getSeparationDistance_Distance(), this.getDistance(), "distance", null, 1, 1, SeparationDistance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(collisionExistsEClass, CollisionExists.class, "CollisionExists", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 initEAttribute(getCollisionExists_CollisionTime(), ecorePackage.getEDouble(), "collisionTime", null, 1, 1, CollisionExists.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

@@ -767,4 +767,4 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
                 createResource(eNS_URI);

         }

 

-} //SimpleScenarioPackageImpl

+} //CrossingScenarioPackageImpl

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java
index 929f8d9c..a97c02fc 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java
@@ -1,8 +1,15 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

+

+import crossingScenario.Actor;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.Lane;

+import crossingScenario.Orientation;

+import crossingScenario.Size;

 

 import java.util.Collection;

+

 import org.eclipse.emf.common.notify.Notification;

 import org.eclipse.emf.common.notify.NotificationChain;

 

@@ -13,15 +20,10 @@ import org.eclipse.emf.ecore.InternalEObject;
 

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

+

 import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

 import org.eclipse.emf.ecore.util.InternalEList;

 

-import simpleScenario.Actor;

-import simpleScenario.Lane;

-import simpleScenario.Orientation;

-import simpleScenario.SimpleScenarioPackage;

-import simpleScenario.Size;

-

 /**

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

  * An implementation of the model object '<em><b>Lane</b></em>'.

@@ -30,12 +32,12 @@ import simpleScenario.Size;
  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.impl.LaneImpl#getOrientation <em>Orientation</em>}</li>

- *   <li>{@link simpleScenario.impl.LaneImpl#getWidth <em>Width</em>}</li>

- *   <li>{@link simpleScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li>

- *   <li>{@link simpleScenario.impl.LaneImpl#getPrevLane <em>Prev Lane</em>}</li>

- *   <li>{@link simpleScenario.impl.LaneImpl#getActors <em>Actors</em>}</li>

- *   <li>{@link simpleScenario.impl.LaneImpl#getNumWidth <em>Num Width</em>}</li>

+ *   <li>{@link crossingScenario.impl.LaneImpl#getOrientation <em>Orientation</em>}</li>

+ *   <li>{@link crossingScenario.impl.LaneImpl#getWidth <em>Width</em>}</li>

+ *   <li>{@link crossingScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li>

+ *   <li>{@link crossingScenario.impl.LaneImpl#getPrevLane <em>Prev Lane</em>}</li>

+ *   <li>{@link crossingScenario.impl.LaneImpl#getActors <em>Actors</em>}</li>

+ *   <li>{@link crossingScenario.impl.LaneImpl#getNumWidth <em>Num Width</em>}</li>

  * </ul>

  *

  * @generated

@@ -157,7 +159,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.LANE;

+                return CrossingScenarioPackage.Literals.LANE;

         }

 

         /**

@@ -180,7 +182,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
                 Orientation oldOrientation = orientation;

                 orientation = newOrientation == null ? ORIENTATION_EDEFAULT : newOrientation;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__ORIENTATION, oldOrientation, orientation));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.LANE__ORIENTATION, oldOrientation, orientation));

         }

 

         /**

@@ -203,7 +205,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
                 Size oldWidth = width;

                 width = newWidth == null ? WIDTH_EDEFAULT : newWidth;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__WIDTH, oldWidth, width));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.LANE__WIDTH, oldWidth, width));

         }

 

         /**

@@ -226,7 +228,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
                 double oldReferenceCoord = referenceCoord;

                 referenceCoord = newReferenceCoord;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__REFERENCE_COORD, oldReferenceCoord, referenceCoord));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.LANE__REFERENCE_COORD, oldReferenceCoord, referenceCoord));

         }

 

         /**

@@ -241,7 +243,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
                         prevLane = (Lane)eResolveProxy(oldPrevLane);

                         if (prevLane != oldPrevLane) {

                                 if (eNotificationRequired())

-                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, SimpleScenarioPackage.LANE__PREV_LANE, oldPrevLane, prevLane));

+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.LANE__PREV_LANE, oldPrevLane, prevLane));

                         }

                 }

                 return prevLane;

@@ -266,7 +268,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
                 Lane oldPrevLane = prevLane;

                 prevLane = newPrevLane;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__PREV_LANE, oldPrevLane, prevLane));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.LANE__PREV_LANE, oldPrevLane, prevLane));

         }

 

         /**

@@ -277,7 +279,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
         @Override

         public EList<Actor> getActors() {

                 if (actors == null) {

-                        actors = new EObjectWithInverseResolvingEList<Actor>(Actor.class, this, SimpleScenarioPackage.LANE__ACTORS, SimpleScenarioPackage.ACTOR__PLACED_ON);

+                        actors = new EObjectWithInverseResolvingEList<Actor>(Actor.class, this, CrossingScenarioPackage.LANE__ACTORS, CrossingScenarioPackage.ACTOR__PLACED_ON);

                 }

                 return actors;

         }

@@ -302,7 +304,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
                 double oldNumWidth = numWidth;

                 numWidth = newNumWidth;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__NUM_WIDTH, oldNumWidth, numWidth));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.LANE__NUM_WIDTH, oldNumWidth, numWidth));

         }

 

         /**

@@ -314,7 +316,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
         @Override

         public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.LANE__ACTORS:

+                        case CrossingScenarioPackage.LANE__ACTORS:

                                 return ((InternalEList<InternalEObject>)(InternalEList<?>)getActors()).basicAdd(otherEnd, msgs);

                 }

                 return super.eInverseAdd(otherEnd, featureID, msgs);

@@ -328,7 +330,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
         @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.LANE__ACTORS:

+                        case CrossingScenarioPackage.LANE__ACTORS:

                                 return ((InternalEList<?>)getActors()).basicRemove(otherEnd, msgs);

                 }

                 return super.eInverseRemove(otherEnd, featureID, msgs);

@@ -342,18 +344,18 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.LANE__ORIENTATION:

+                        case CrossingScenarioPackage.LANE__ORIENTATION:

                                 return getOrientation();

-                        case SimpleScenarioPackage.LANE__WIDTH:

+                        case CrossingScenarioPackage.LANE__WIDTH:

                                 return getWidth();

-                        case SimpleScenarioPackage.LANE__REFERENCE_COORD:

+                        case CrossingScenarioPackage.LANE__REFERENCE_COORD:

                                 return getReferenceCoord();

-                        case SimpleScenarioPackage.LANE__PREV_LANE:

+                        case CrossingScenarioPackage.LANE__PREV_LANE:

                                 if (resolve) return getPrevLane();

                                 return basicGetPrevLane();

-                        case SimpleScenarioPackage.LANE__ACTORS:

+                        case CrossingScenarioPackage.LANE__ACTORS:

                                 return getActors();

-                        case SimpleScenarioPackage.LANE__NUM_WIDTH:

+                        case CrossingScenarioPackage.LANE__NUM_WIDTH:

                                 return getNumWidth();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -368,23 +370,23 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.LANE__ORIENTATION:

+                        case CrossingScenarioPackage.LANE__ORIENTATION:

                                 setOrientation((Orientation)newValue);

                                 return;

-                        case SimpleScenarioPackage.LANE__WIDTH:

+                        case CrossingScenarioPackage.LANE__WIDTH:

                                 setWidth((Size)newValue);

                                 return;

-                        case SimpleScenarioPackage.LANE__REFERENCE_COORD:

+                        case CrossingScenarioPackage.LANE__REFERENCE_COORD:

                                 setReferenceCoord((Double)newValue);

                                 return;

-                        case SimpleScenarioPackage.LANE__PREV_LANE:

+                        case CrossingScenarioPackage.LANE__PREV_LANE:

                                 setPrevLane((Lane)newValue);

                                 return;

-                        case SimpleScenarioPackage.LANE__ACTORS:

+                        case CrossingScenarioPackage.LANE__ACTORS:

                                 getActors().clear();

                                 getActors().addAll((Collection<? extends Actor>)newValue);

                                 return;

-                        case SimpleScenarioPackage.LANE__NUM_WIDTH:

+                        case CrossingScenarioPackage.LANE__NUM_WIDTH:

                                 setNumWidth((Double)newValue);

                                 return;

                 }

@@ -399,22 +401,22 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.LANE__ORIENTATION:

+                        case CrossingScenarioPackage.LANE__ORIENTATION:

                                 setOrientation(ORIENTATION_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.LANE__WIDTH:

+                        case CrossingScenarioPackage.LANE__WIDTH:

                                 setWidth(WIDTH_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.LANE__REFERENCE_COORD:

+                        case CrossingScenarioPackage.LANE__REFERENCE_COORD:

                                 setReferenceCoord(REFERENCE_COORD_EDEFAULT);

                                 return;

-                        case SimpleScenarioPackage.LANE__PREV_LANE:

+                        case CrossingScenarioPackage.LANE__PREV_LANE:

                                 setPrevLane((Lane)null);

                                 return;

-                        case SimpleScenarioPackage.LANE__ACTORS:

+                        case CrossingScenarioPackage.LANE__ACTORS:

                                 getActors().clear();

                                 return;

-                        case SimpleScenarioPackage.LANE__NUM_WIDTH:

+                        case CrossingScenarioPackage.LANE__NUM_WIDTH:

                                 setNumWidth(NUM_WIDTH_EDEFAULT);

                                 return;

                 }

@@ -429,17 +431,17 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.LANE__ORIENTATION:

+                        case CrossingScenarioPackage.LANE__ORIENTATION:

                                 return orientation != ORIENTATION_EDEFAULT;

-                        case SimpleScenarioPackage.LANE__WIDTH:

+                        case CrossingScenarioPackage.LANE__WIDTH:

                                 return width != WIDTH_EDEFAULT;

-                        case SimpleScenarioPackage.LANE__REFERENCE_COORD:

+                        case CrossingScenarioPackage.LANE__REFERENCE_COORD:

                                 return referenceCoord != REFERENCE_COORD_EDEFAULT;

-                        case SimpleScenarioPackage.LANE__PREV_LANE:

+                        case CrossingScenarioPackage.LANE__PREV_LANE:

                                 return prevLane != null;

-                        case SimpleScenarioPackage.LANE__ACTORS:

+                        case CrossingScenarioPackage.LANE__ACTORS:

                                 return actors != null && !actors.isEmpty();

-                        case SimpleScenarioPackage.LANE__NUM_WIDTH:

+                        case CrossingScenarioPackage.LANE__NUM_WIDTH:

                                 return numWidth != NUM_WIDTH_EDEFAULT;

                 }

                 return super.eIsSet(featureID);

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/PedestrianImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/PedestrianImpl.java
index 6cd18543..b7bf48f0 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/PedestrianImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/PedestrianImpl.java
@@ -1,11 +1,11 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

 

-import org.eclipse.emf.ecore.EClass;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.Pedestrian;

 

-import simpleScenario.Pedestrian;

-import simpleScenario.SimpleScenarioPackage;

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

 

 /**

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

@@ -31,7 +31,7 @@ public class PedestrianImpl extends ActorImpl implements Pedestrian {
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.PEDESTRIAN;

+                return CrossingScenarioPackage.Literals.PEDESTRIAN;

         }

 

 } //PedestrianImpl

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/RelationImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/RelationImpl.java
index a8ddd386..5b8ec921 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/RelationImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/RelationImpl.java
@@ -1,6 +1,10 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

+

+import crossingScenario.Actor;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.Relation;

 

 import org.eclipse.emf.common.notify.Notification;

 

@@ -10,10 +14,6 @@ import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;

 

-import simpleScenario.Actor;

-import simpleScenario.Relation;

-import simpleScenario.SimpleScenarioPackage;

-

 /**

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

  * An implementation of the model object '<em><b>Relation</b></em>'.

@@ -22,7 +22,7 @@ import simpleScenario.SimpleScenarioPackage;
  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.impl.RelationImpl#getTarget <em>Target</em>}</li>

+ *   <li>{@link crossingScenario.impl.RelationImpl#getTarget <em>Target</em>}</li>

  * </ul>

  *

  * @generated

@@ -54,7 +54,7 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.RELATION;

+                return CrossingScenarioPackage.Literals.RELATION;

         }

 

         /**

@@ -69,7 +69,7 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen
                         target = (Actor)eResolveProxy(oldTarget);

                         if (target != oldTarget) {

                                 if (eNotificationRequired())

-                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, SimpleScenarioPackage.RELATION__TARGET, oldTarget, target));

+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.RELATION__TARGET, oldTarget, target));

                         }

                 }

                 return target;

@@ -94,7 +94,7 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen
                 Actor oldTarget = target;

                 target = newTarget;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.RELATION__TARGET, oldTarget, target));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.RELATION__TARGET, oldTarget, target));

         }

 

         /**

@@ -105,7 +105,7 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.RELATION__TARGET:

+                        case CrossingScenarioPackage.RELATION__TARGET:

                                 if (resolve) return getTarget();

                                 return basicGetTarget();

                 }

@@ -120,7 +120,7 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.RELATION__TARGET:

+                        case CrossingScenarioPackage.RELATION__TARGET:

                                 setTarget((Actor)newValue);

                                 return;

                 }

@@ -135,7 +135,7 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.RELATION__TARGET:

+                        case CrossingScenarioPackage.RELATION__TARGET:

                                 setTarget((Actor)null);

                                 return;

                 }

@@ -150,7 +150,7 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.RELATION__TARGET:

+                        case CrossingScenarioPackage.RELATION__TARGET:

                                 return target != null;

                 }

                 return super.eIsSet(featureID);

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SeparationDistanceImpl.java
index dfa19427..bad91f1c 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SeparationDistanceImpl.java
@@ -1,6 +1,10 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

+

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.Distance;

+import crossingScenario.SeparationDistance;

 

 import org.eclipse.emf.common.notify.Notification;

 

@@ -8,24 +12,20 @@ import org.eclipse.emf.ecore.EClass;
 

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

-import simpleScenario.Distance;

-import simpleScenario.SeperationDistance;

-import simpleScenario.SimpleScenarioPackage;

-

 /**

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

- * An implementation of the model object '<em><b>Seperation Distance</b></em>'.

+ * An implementation of the model object '<em><b>Separation Distance</b></em>'.

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

  * <p>

  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.impl.SeperationDistanceImpl#getDistance <em>Distance</em>}</li>

+ *   <li>{@link crossingScenario.impl.SeparationDistanceImpl#getDistance <em>Distance</em>}</li>

  * </ul>

  *

  * @generated

  */

-public class SeperationDistanceImpl extends SpatialRelationImpl implements SeperationDistance {

+public class SeparationDistanceImpl extends SpatialRelationImpl implements SeparationDistance {

         /**

          * The default value of the '{@link #getDistance() <em>Distance</em>}' attribute.

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

@@ -51,7 +51,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
          * <!-- end-user-doc -->

          * @generated

          */

-        protected SeperationDistanceImpl() {

+        protected SeparationDistanceImpl() {

                 super();

         }

 

@@ -62,7 +62,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.SEPERATION_DISTANCE;

+                return CrossingScenarioPackage.Literals.SEPARATION_DISTANCE;

         }

 

         /**

@@ -85,7 +85,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
                 Distance oldDistance = distance;

                 distance = newDistance == null ? DISTANCE_EDEFAULT : newDistance;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE, oldDistance, distance));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.SEPARATION_DISTANCE__DISTANCE, oldDistance, distance));

         }

 

         /**

@@ -96,7 +96,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:

+                        case CrossingScenarioPackage.SEPARATION_DISTANCE__DISTANCE:

                                 return getDistance();

                 }

                 return super.eGet(featureID, resolve, coreType);

@@ -110,7 +110,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:

+                        case CrossingScenarioPackage.SEPARATION_DISTANCE__DISTANCE:

                                 setDistance((Distance)newValue);

                                 return;

                 }

@@ -125,7 +125,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:

+                        case CrossingScenarioPackage.SEPARATION_DISTANCE__DISTANCE:

                                 setDistance(DISTANCE_EDEFAULT);

                                 return;

                 }

@@ -140,7 +140,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:

+                        case CrossingScenarioPackage.SEPARATION_DISTANCE__DISTANCE:

                                 return distance != DISTANCE_EDEFAULT;

                 }

                 return super.eIsSet(featureID);

@@ -162,4 +162,4 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
                 return result.toString();

         }

 

-} //SeperationDistanceImpl

+} //SeparationDistanceImpl

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SpatialRelationImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SpatialRelationImpl.java
index b4e0f4b4..29dcf9f8 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SpatialRelationImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SpatialRelationImpl.java
@@ -1,11 +1,11 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

 

-import org.eclipse.emf.ecore.EClass;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.SpatialRelation;

 

-import simpleScenario.SimpleScenarioPackage;

-import simpleScenario.SpatialRelation;

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

 

 /**

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

@@ -31,7 +31,7 @@ public abstract class SpatialRelationImpl extends RelationImpl implements Spatia
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.SPATIAL_RELATION;

+                return CrossingScenarioPackage.Literals.SPATIAL_RELATION;

         }

 

 } //SpatialRelationImpl

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/TemporalRelationImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/TemporalRelationImpl.java
index 26f2c712..7fc113b7 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/TemporalRelationImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/TemporalRelationImpl.java
@@ -1,11 +1,11 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

 

-import org.eclipse.emf.ecore.EClass;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.TemporalRelation;

 

-import simpleScenario.SimpleScenarioPackage;

-import simpleScenario.TemporalRelation;

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

 

 /**

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

@@ -31,7 +31,7 @@ public abstract class TemporalRelationImpl extends RelationImpl implements Tempo
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.TEMPORAL_RELATION;

+                return CrossingScenarioPackage.Literals.TEMPORAL_RELATION;

         }

 

 } //TemporalRelationImpl

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/VehicleImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/VehicleImpl.java
index fc4be628..15f25fd5 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/VehicleImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/VehicleImpl.java
@@ -1,11 +1,11 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

 

-import org.eclipse.emf.ecore.EClass;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.Vehicle;

 

-import simpleScenario.SimpleScenarioPackage;

-import simpleScenario.Vehicle;

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

 

 /**

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

@@ -31,7 +31,7 @@ public class VehicleImpl extends ActorImpl implements Vehicle {
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.VEHICLE;

+                return CrossingScenarioPackage.Literals.VEHICLE;

         }

 

 } //VehicleImpl

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/VisionBlockedImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/VisionBlockedImpl.java
index 88222d67..169cd57c 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/VisionBlockedImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/VisionBlockedImpl.java
@@ -1,6 +1,10 @@
 /**

  */

-package simpleScenario.impl;

+package crossingScenario.impl;

+

+import crossingScenario.Actor;

+import crossingScenario.CrossingScenarioPackage;

+import crossingScenario.VisionBlocked;

 

 import org.eclipse.emf.common.notify.Notification;

 

@@ -9,10 +13,6 @@ import org.eclipse.emf.ecore.InternalEObject;
 

 import org.eclipse.emf.ecore.impl.ENotificationImpl;

 

-import simpleScenario.Actor;

-import simpleScenario.SimpleScenarioPackage;

-import simpleScenario.VisionBlocked;

-

 /**

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

  * An implementation of the model object '<em><b>Vision Blocked</b></em>'.

@@ -21,7 +21,7 @@ import simpleScenario.VisionBlocked;
  * The following features are implemented:

  * </p>

  * <ul>

- *   <li>{@link simpleScenario.impl.VisionBlockedImpl#getBlockedBy <em>Blocked By</em>}</li>

+ *   <li>{@link crossingScenario.impl.VisionBlockedImpl#getBlockedBy <em>Blocked By</em>}</li>

  * </ul>

  *

  * @generated

@@ -53,7 +53,7 @@ public class VisionBlockedImpl extends SpatialRelationImpl implements VisionBloc
          */

         @Override

         protected EClass eStaticClass() {

-                return SimpleScenarioPackage.Literals.VISION_BLOCKED;

+                return CrossingScenarioPackage.Literals.VISION_BLOCKED;

         }

 

         /**

@@ -68,7 +68,7 @@ public class VisionBlockedImpl extends SpatialRelationImpl implements VisionBloc
                         blockedBy = (Actor)eResolveProxy(oldBlockedBy);

                         if (blockedBy != oldBlockedBy) {

                                 if (eNotificationRequired())

-                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, SimpleScenarioPackage.VISION_BLOCKED__BLOCKED_BY, oldBlockedBy, blockedBy));

+                                        eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.VISION_BLOCKED__BLOCKED_BY, oldBlockedBy, blockedBy));

                         }

                 }

                 return blockedBy;

@@ -93,7 +93,7 @@ public class VisionBlockedImpl extends SpatialRelationImpl implements VisionBloc
                 Actor oldBlockedBy = blockedBy;

                 blockedBy = newBlockedBy;

                 if (eNotificationRequired())

-                        eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.VISION_BLOCKED__BLOCKED_BY, oldBlockedBy, blockedBy));

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.VISION_BLOCKED__BLOCKED_BY, oldBlockedBy, blockedBy));

         }

 

         /**

@@ -104,7 +104,7 @@ public class VisionBlockedImpl extends SpatialRelationImpl implements VisionBloc
         @Override

         public Object eGet(int featureID, boolean resolve, boolean coreType) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.VISION_BLOCKED__BLOCKED_BY:

+                        case CrossingScenarioPackage.VISION_BLOCKED__BLOCKED_BY:

                                 if (resolve) return getBlockedBy();

                                 return basicGetBlockedBy();

                 }

@@ -119,7 +119,7 @@ public class VisionBlockedImpl extends SpatialRelationImpl implements VisionBloc
         @Override

         public void eSet(int featureID, Object newValue) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.VISION_BLOCKED__BLOCKED_BY:

+                        case CrossingScenarioPackage.VISION_BLOCKED__BLOCKED_BY:

                                 setBlockedBy((Actor)newValue);

                                 return;

                 }

@@ -134,7 +134,7 @@ public class VisionBlockedImpl extends SpatialRelationImpl implements VisionBloc
         @Override

         public void eUnset(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.VISION_BLOCKED__BLOCKED_BY:

+                        case CrossingScenarioPackage.VISION_BLOCKED__BLOCKED_BY:

                                 setBlockedBy((Actor)null);

                                 return;

                 }

@@ -149,7 +149,7 @@ public class VisionBlockedImpl extends SpatialRelationImpl implements VisionBloc
         @Override

         public boolean eIsSet(int featureID) {

                 switch (featureID) {

-                        case SimpleScenarioPackage.VISION_BLOCKED__BLOCKED_BY:

+                        case CrossingScenarioPackage.VISION_BLOCKED__BLOCKED_BY:

                                 return blockedBy != null;

                 }

                 return super.eIsSet(featureID);

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioAdapterFactory.java b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java
index 88cb187c..0035a0ee 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioAdapterFactory.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java
@@ -1,6 +1,8 @@
 /**

  */

-package simpleScenario.util;

+package crossingScenario.util;

+

+import crossingScenario.*;

 

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.Notifier;

@@ -9,24 +11,22 @@ import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 

 import org.eclipse.emf.ecore.EObject;

 

-import simpleScenario.*;

-

 /**

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

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

  * It provides an adapter <code>createXXX</code> method for each class of the model.

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

- * @see simpleScenario.SimpleScenarioPackage

+ * @see crossingScenario.CrossingScenarioPackage

  * @generated

  */

-public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {

+public class CrossingScenarioAdapterFactory extends AdapterFactoryImpl {

         /**

          * The cached model package.

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

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

          * @generated

          */

-        protected static SimpleScenarioPackage modelPackage;

+        protected static CrossingScenarioPackage modelPackage;

 

         /**

          * Creates an instance of the adapter factory.

@@ -34,9 +34,9 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
          * <!-- end-user-doc -->

          * @generated

          */

-        public SimpleScenarioAdapterFactory() {

+        public CrossingScenarioAdapterFactory() {

                 if (modelPackage == null) {

-                        modelPackage = SimpleScenarioPackage.eINSTANCE;

+                        modelPackage = CrossingScenarioPackage.eINSTANCE;

                 }

         }

 

@@ -65,11 +65,11 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
          * <!-- end-user-doc -->

          * @generated

          */

-        protected SimpleScenarioSwitch<Adapter> modelSwitch =

-                new SimpleScenarioSwitch<Adapter>() {

+        protected CrossingScenarioSwitch<Adapter> modelSwitch =

+                new CrossingScenarioSwitch<Adapter>() {

                         @Override

-                        public Adapter caseSimpleScenario(SimpleScenario object) {

-                                return createSimpleScenarioAdapter();

+                        public Adapter caseCrossingScenario(CrossingScenario object) {

+                                return createCrossingScenarioAdapter();

                         }

                         @Override

                         public Adapter caseLane(Lane object) {

@@ -96,8 +96,8 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
                                 return createVisionBlockedAdapter();

                         }

                         @Override

-                        public Adapter caseSeperationDistance(SeperationDistance object) {

-                                return createSeperationDistanceAdapter();

+                        public Adapter caseSeparationDistance(SeparationDistance object) {

+                                return createSeparationDistanceAdapter();

                         }

                         @Override

                         public Adapter caseCollisionExists(CollisionExists object) {

@@ -136,27 +136,27 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
 

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.SimpleScenario <em>Simple Scenario</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.CrossingScenario <em>Crossing Scenario</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.SimpleScenario

+         * @see crossingScenario.CrossingScenario

          * @generated

          */

-        public Adapter createSimpleScenarioAdapter() {

+        public Adapter createCrossingScenarioAdapter() {

                 return null;

         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.Lane <em>Lane</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.Lane <em>Lane</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.Lane

+         * @see crossingScenario.Lane

          * @generated

          */

         public Adapter createLaneAdapter() {

@@ -164,13 +164,13 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.Actor <em>Actor</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.Actor <em>Actor</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.Actor

+         * @see crossingScenario.Actor

          * @generated

          */

         public Adapter createActorAdapter() {

@@ -178,13 +178,13 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.Relation <em>Relation</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.Relation <em>Relation</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.Relation

+         * @see crossingScenario.Relation

          * @generated

          */

         public Adapter createRelationAdapter() {

@@ -192,13 +192,13 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.SpatialRelation <em>Spatial Relation</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.SpatialRelation <em>Spatial Relation</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.SpatialRelation

+         * @see crossingScenario.SpatialRelation

          * @generated

          */

         public Adapter createSpatialRelationAdapter() {

@@ -206,13 +206,13 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.TemporalRelation <em>Temporal Relation</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.TemporalRelation <em>Temporal Relation</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.TemporalRelation

+         * @see crossingScenario.TemporalRelation

          * @generated

          */

         public Adapter createTemporalRelationAdapter() {

@@ -220,13 +220,13 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.VisionBlocked <em>Vision Blocked</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.VisionBlocked <em>Vision Blocked</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.VisionBlocked

+         * @see crossingScenario.VisionBlocked

          * @generated

          */

         public Adapter createVisionBlockedAdapter() {

@@ -234,27 +234,27 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.SeperationDistance <em>Seperation Distance</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.SeparationDistance <em>Separation Distance</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.SeperationDistance

+         * @see crossingScenario.SeparationDistance

          * @generated

          */

-        public Adapter createSeperationDistanceAdapter() {

+        public Adapter createSeparationDistanceAdapter() {

                 return null;

         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.CollisionExists <em>Collision Exists</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.CollisionExists <em>Collision Exists</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.CollisionExists

+         * @see crossingScenario.CollisionExists

          * @generated

          */

         public Adapter createCollisionExistsAdapter() {

@@ -262,13 +262,13 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.CollisionDoesNotExist <em>Collision Does Not Exist</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.CollisionDoesNotExist <em>Collision Does Not Exist</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.CollisionDoesNotExist

+         * @see crossingScenario.CollisionDoesNotExist

          * @generated

          */

         public Adapter createCollisionDoesNotExistAdapter() {

@@ -276,13 +276,13 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.Pedestrian <em>Pedestrian</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.Pedestrian <em>Pedestrian</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.Pedestrian

+         * @see crossingScenario.Pedestrian

          * @generated

          */

         public Adapter createPedestrianAdapter() {

@@ -290,13 +290,13 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
         }

 

         /**

-         * Creates a new adapter for an object of class '{@link simpleScenario.Vehicle <em>Vehicle</em>}'.

+         * Creates a new adapter for an object of class '{@link crossingScenario.Vehicle <em>Vehicle</em>}'.

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

          * This default implementation returns null so that we can easily ignore cases;

          * it's useful to ignore a case when inheritance will catch all the cases anyway.

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

          * @return the new adapter.

-         * @see simpleScenario.Vehicle

+         * @see crossingScenario.Vehicle

          * @generated

          */

         public Adapter createVehicleAdapter() {

@@ -315,4 +315,4 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
                 return null;

         }

 

-} //SimpleScenarioAdapterFactory

+} //CrossingScenarioAdapterFactory

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioSwitch.java b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java
index 86131abb..b14a5c24 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioSwitch.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java
@@ -1,14 +1,14 @@
 /**

  */

-package simpleScenario.util;

+package crossingScenario.util;

+

+import crossingScenario.*;

 

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 

 import org.eclipse.emf.ecore.util.Switch;

 

-import simpleScenario.*;

-

 /**

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

  * The <b>Switch</b> for the model's inheritance hierarchy.

@@ -19,17 +19,17 @@ import simpleScenario.*;
  * until a non-null result is returned,

  * which is the result of the switch.

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

- * @see simpleScenario.SimpleScenarioPackage

+ * @see crossingScenario.CrossingScenarioPackage

  * @generated

  */

-public class SimpleScenarioSwitch<T> extends Switch<T> {

+public class CrossingScenarioSwitch<T> extends Switch<T> {

         /**

          * The cached model package

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

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

          * @generated

          */

-        protected static SimpleScenarioPackage modelPackage;

+        protected static CrossingScenarioPackage modelPackage;

 

         /**

          * Creates an instance of the switch.

@@ -37,9 +37,9 @@ public class SimpleScenarioSwitch<T> extends Switch<T> {
          * <!-- end-user-doc -->

          * @generated

          */

-        public SimpleScenarioSwitch() {

+        public CrossingScenarioSwitch() {

                 if (modelPackage == null) {

-                        modelPackage = SimpleScenarioPackage.eINSTANCE;

+                        modelPackage = CrossingScenarioPackage.eINSTANCE;

                 }

         }

 

@@ -66,45 +66,45 @@ public class SimpleScenarioSwitch<T> extends Switch<T> {
         @Override

         protected T doSwitch(int classifierID, EObject theEObject) {

                 switch (classifierID) {

-                        case SimpleScenarioPackage.SIMPLE_SCENARIO: {

-                                SimpleScenario simpleScenario = (SimpleScenario)theEObject;

-                                T result = caseSimpleScenario(simpleScenario);

+                        case CrossingScenarioPackage.CROSSING_SCENARIO: {

+                                CrossingScenario crossingScenario = (CrossingScenario)theEObject;

+                                T result = caseCrossingScenario(crossingScenario);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.LANE: {

+                        case CrossingScenarioPackage.LANE: {

                                 Lane lane = (Lane)theEObject;

                                 T result = caseLane(lane);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.ACTOR: {

+                        case CrossingScenarioPackage.ACTOR: {

                                 Actor actor = (Actor)theEObject;

                                 T result = caseActor(actor);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.RELATION: {

+                        case CrossingScenarioPackage.RELATION: {

                                 Relation relation = (Relation)theEObject;

                                 T result = caseRelation(relation);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.SPATIAL_RELATION: {

+                        case CrossingScenarioPackage.SPATIAL_RELATION: {

                                 SpatialRelation spatialRelation = (SpatialRelation)theEObject;

                                 T result = caseSpatialRelation(spatialRelation);

                                 if (result == null) result = caseRelation(spatialRelation);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.TEMPORAL_RELATION: {

+                        case CrossingScenarioPackage.TEMPORAL_RELATION: {

                                 TemporalRelation temporalRelation = (TemporalRelation)theEObject;

                                 T result = caseTemporalRelation(temporalRelation);

                                 if (result == null) result = caseRelation(temporalRelation);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.VISION_BLOCKED: {

+                        case CrossingScenarioPackage.VISION_BLOCKED: {

                                 VisionBlocked visionBlocked = (VisionBlocked)theEObject;

                                 T result = caseVisionBlocked(visionBlocked);

                                 if (result == null) result = caseSpatialRelation(visionBlocked);

@@ -112,15 +112,15 @@ public class SimpleScenarioSwitch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.SEPERATION_DISTANCE: {

-                                SeperationDistance seperationDistance = (SeperationDistance)theEObject;

-                                T result = caseSeperationDistance(seperationDistance);

-                                if (result == null) result = caseSpatialRelation(seperationDistance);

-                                if (result == null) result = caseRelation(seperationDistance);

+                        case CrossingScenarioPackage.SEPARATION_DISTANCE: {

+                                SeparationDistance separationDistance = (SeparationDistance)theEObject;

+                                T result = caseSeparationDistance(separationDistance);

+                                if (result == null) result = caseSpatialRelation(separationDistance);

+                                if (result == null) result = caseRelation(separationDistance);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.COLLISION_EXISTS: {

+                        case CrossingScenarioPackage.COLLISION_EXISTS: {

                                 CollisionExists collisionExists = (CollisionExists)theEObject;

                                 T result = caseCollisionExists(collisionExists);

                                 if (result == null) result = caseTemporalRelation(collisionExists);

@@ -128,7 +128,7 @@ public class SimpleScenarioSwitch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.COLLISION_DOES_NOT_EXIST: {

+                        case CrossingScenarioPackage.COLLISION_DOES_NOT_EXIST: {

                                 CollisionDoesNotExist collisionDoesNotExist = (CollisionDoesNotExist)theEObject;

                                 T result = caseCollisionDoesNotExist(collisionDoesNotExist);

                                 if (result == null) result = caseTemporalRelation(collisionDoesNotExist);

@@ -136,14 +136,14 @@ public class SimpleScenarioSwitch<T> extends Switch<T> {
                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.PEDESTRIAN: {

+                        case CrossingScenarioPackage.PEDESTRIAN: {

                                 Pedestrian pedestrian = (Pedestrian)theEObject;

                                 T result = casePedestrian(pedestrian);

                                 if (result == null) result = caseActor(pedestrian);

                                 if (result == null) result = defaultCase(theEObject);

                                 return result;

                         }

-                        case SimpleScenarioPackage.VEHICLE: {

+                        case CrossingScenarioPackage.VEHICLE: {

                                 Vehicle vehicle = (Vehicle)theEObject;

                                 T result = caseVehicle(vehicle);

                                 if (result == null) result = caseActor(vehicle);

@@ -155,17 +155,17 @@ public class SimpleScenarioSwitch<T> extends Switch<T> {
         }

 

         /**

-         * Returns the result of interpreting the object as an instance of '<em>Simple Scenario</em>'.

+         * Returns the result of interpreting the object as an instance of '<em>Crossing Scenario</em>'.

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

          * This implementation returns null;

          * returning a non-null result will terminate the switch.

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

          * @param object the target of the switch.

-         * @return the result of interpreting the object as an instance of '<em>Simple Scenario</em>'.

+         * @return the result of interpreting the object as an instance of '<em>Crossing Scenario</em>'.

          * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

          * @generated

          */

-        public T caseSimpleScenario(SimpleScenario object) {

+        public T caseCrossingScenario(CrossingScenario object) {

                 return null;

         }

 

@@ -260,17 +260,17 @@ public class SimpleScenarioSwitch<T> extends Switch<T> {
         }

 

         /**

-         * Returns the result of interpreting the object as an instance of '<em>Seperation Distance</em>'.

+         * Returns the result of interpreting the object as an instance of '<em>Separation Distance</em>'.

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

          * This implementation returns null;

          * returning a non-null result will terminate the switch.

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

          * @param object the target of the switch.

-         * @return the result of interpreting the object as an instance of '<em>Seperation Distance</em>'.

+         * @return the result of interpreting the object as an instance of '<em>Separation Distance</em>'.

          * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

          * @generated

          */

-        public T caseSeperationDistance(SeperationDistance object) {

+        public T caseSeparationDistance(SeparationDistance object) {

                 return null;

         }

 

@@ -350,4 +350,4 @@ public class SimpleScenarioSwitch<T> extends Switch<T> {
                 return null;

         }

 

-} //SimpleScenarioSwitch

+} //CrossingScenarioSwitch

diff --git a/Domains/simpleScenario/inputs/Debug/partial-int.xmi b/Domains/crossingScenario/inputs/Debug/partial-int.xmi
index eaddaafc..eaddaafc 100644
--- a/Domains/simpleScenario/inputs/Debug/partial-int.xmi
+++ b/Domains/crossingScenario/inputs/Debug/partial-int.xmi
diff --git a/Domains/simpleScenario/inputs/Debug/partial.xmi b/Domains/crossingScenario/inputs/Debug/partial.xmi
index 2b25e65e..2b25e65e 100644
--- a/Domains/simpleScenario/inputs/Debug/partial.xmi
+++ b/Domains/crossingScenario/inputs/Debug/partial.xmi
diff --git a/Domains/simpleScenario/inputs/Debug/sample.xmi b/Domains/crossingScenario/inputs/Debug/sample.xmi
index cb4057fb..cb4057fb 100644
--- a/Domains/simpleScenario/inputs/Debug/sample.xmi
+++ b/Domains/crossingScenario/inputs/Debug/sample.xmi
diff --git a/Domains/simpleScenario/inputs/simpleScenarioGen.vsconfig b/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
index a411d968..8ac31bb2 100644
--- a/Domains/simpleScenario/inputs/simpleScenarioGen.vsconfig
+++ b/Domains/crossingScenario/inputs/crossingScenarioGen.vsconfig
@@ -1,10 +1,10 @@
-import epackage "model/simpleScenario.ecore"

-import viatra   "queries/simpleScenarioQueries.vql"

+import epackage "model/crossingScenario.ecore"

+import viatra   "queries/crossingScenarioQueries.vql"

 

 generate {

-        metamodel = { package simpleScenario }

+        metamodel = { package crossingScenario }

         constraints = { package queries}

-        partial-model = { "inputs/SimpleScenarioInstance.xmi"}

+        partial-model = { "inputs/CrossingScenarioInit.xmi"}

         solver = ViatraSolver

         scope = {

                 #node = 10..30,

diff --git a/Domains/crossingScenario/inputs/crossingScenarioInit.xmi b/Domains/crossingScenario/inputs/crossingScenarioInit.xmi
new file mode 100644
index 00000000..91dfb7b2
--- /dev/null
+++ b/Domains/crossingScenario/inputs/crossingScenarioInit.xmi
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<crossingScenario:CrossingScenario xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"

+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:crossingScenario="http://www.example.com/crossingScenario"

+    xsi:schemaLocation="http://www.example.com/crossingScenario crossingScenario.ecore"/>

diff --git a/Domains/simpleScenario/model/simpleScenario.ecore b/Domains/crossingScenario/model/crossingScenario.ecore
index f167e615..a0797672 100644
--- a/Domains/simpleScenario/model/simpleScenario.ecore
+++ b/Domains/crossingScenario/model/crossingScenario.ecore
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="simpleScenario" nsURI="http://www.example.com/simpleScenario"

-    nsPrefix="simpleScenario">

-  <eClassifiers xsi:type="ecore:EClass" name="SimpleScenario">

+    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="crossingScenario" nsURI="http://www.example.com/crossingScenario"

+    nsPrefix="crossingScenario">

+  <eClassifiers xsi:type="ecore:EClass" name="CrossingScenario">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="xSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="ySize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="actors" upperBound="-1"

diff --git a/Domains/crossingScenario/model/crossingScenario.genmodel b/Domains/crossingScenario/model/crossingScenario.genmodel
new file mode 100644
index 00000000..53117561
--- /dev/null
+++ b/Domains/crossingScenario/model/crossingScenario.genmodel
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/crossingScenario/ecore-gen" modelPluginID="crossingScenario"

+    modelName="CrossingScenario" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"

+    operationReflection="true" importOrganizing="true">

+  <foreignModel>crossingScenario.ecore</foreignModel>

+  <genPackages prefix="CrossingScenario" disposableProviderFactory="true" ecorePackage="crossingScenario.ecore#/">

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="crossingScenario.ecore#//Orientation">

+      <genEnumLiterals ecoreEnumLiteral="crossingScenario.ecore#//Orientation/Vertical"/>

+      <genEnumLiterals ecoreEnumLiteral="crossingScenario.ecore#//Orientation/Horizontal"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="crossingScenario.ecore#//Size">

+      <genEnumLiterals ecoreEnumLiteral="crossingScenario.ecore#//Size/Small"/>

+      <genEnumLiterals ecoreEnumLiteral="crossingScenario.ecore#//Size/Medium"/>

+      <genEnumLiterals ecoreEnumLiteral="crossingScenario.ecore#//Size/Large"/>

+    </genEnums>

+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="crossingScenario.ecore#//Distance">

+      <genEnumLiterals ecoreEnumLiteral="crossingScenario.ecore#//Distance/Near"/>

+      <genEnumLiterals ecoreEnumLiteral="crossingScenario.ecore#//Distance/Medium"/>

+      <genEnumLiterals ecoreEnumLiteral="crossingScenario.ecore#//Distance/Far"/>

+    </genEnums>

+    <genClasses ecoreClass="crossingScenario.ecore#//CrossingScenario">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//CrossingScenario/xSize"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//CrossingScenario/ySize"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference crossingScenario.ecore#//CrossingScenario/actors"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference crossingScenario.ecore#//CrossingScenario/lanes"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//CrossingScenario/maxTime"/>

+    </genClasses>

+    <genClasses ecoreClass="crossingScenario.ecore#//Lane">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Lane/orientation"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Lane/width"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Lane/referenceCoord"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference crossingScenario.ecore#//Lane/prevLane"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference crossingScenario.ecore#//Lane/actors"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Lane/numWidth"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="crossingScenario.ecore#//Actor">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Actor/xPos"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Actor/yPos"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Actor/length"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Actor/width"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Actor/xSpeed"/>

+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference crossingScenario.ecore#//Actor/relations"/>

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference crossingScenario.ecore#//Actor/placedOn"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//Actor/ySpeed"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="crossingScenario.ecore#//Relation">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference crossingScenario.ecore#//Relation/target"/>

+    </genClasses>

+    <genClasses image="false" ecoreClass="crossingScenario.ecore#//SpatialRelation"/>

+    <genClasses image="false" ecoreClass="crossingScenario.ecore#//TemporalRelation"/>

+    <genClasses ecoreClass="crossingScenario.ecore#//VisionBlocked">

+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference crossingScenario.ecore#//VisionBlocked/blockedBy"/>

+    </genClasses>

+    <genClasses ecoreClass="crossingScenario.ecore#//SeparationDistance">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//SeparationDistance/distance"/>

+    </genClasses>

+    <genClasses ecoreClass="crossingScenario.ecore#//CollisionExists">

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute crossingScenario.ecore#//CollisionExists/collisionTime"/>

+    </genClasses>

+    <genClasses ecoreClass="crossingScenario.ecore#//CollisionDoesNotExist"/>

+    <genClasses ecoreClass="crossingScenario.ecore#//Pedestrian"/>

+    <genClasses ecoreClass="crossingScenario.ecore#//Vehicle"/>

+  </genPackages>

+</genmodel:GenModel>

diff --git a/Domains/simpleScenario/plugin.properties b/Domains/crossingScenario/plugin.properties
index 08367736..08367736 100644
--- a/Domains/simpleScenario/plugin.properties
+++ b/Domains/crossingScenario/plugin.properties
diff --git a/Domains/crossingScenario/plugin.xml b/Domains/crossingScenario/plugin.xml
new file mode 100644
index 00000000..6a1c7f69
--- /dev/null
+++ b/Domains/crossingScenario/plugin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.0"?><!--
+--><plugin>

+  <extension point="org.eclipse.emf.ecore.generated_package">

+    <!-- @generated crossingScenario -->

+    <package class="crossingScenario.CrossingScenarioPackage" genModel="model/crossingScenario.genmodel" uri="http://www.example.com/crossingScenario"/>

+  </extension>

+</plugin>

diff --git a/Domains/crossingScenario/queries/crossingScenarioQueries.vql b/Domains/crossingScenario/queries/crossingScenarioQueries.vql
new file mode 100644
index 00000000..fbd68472
--- /dev/null
+++ b/Domains/crossingScenario/queries/crossingScenarioQueries.vql
@@ -0,0 +1,402 @@
+package queries
+
+import "http://www.example.com/crossingScenario"
+import "http://www.eclipse.org/emf/2002/Ecore"
+
+//Minimal Failing Example
+@Constraint(severity = "error", key = {l}, message = "this defines the placedOn relation")
+pattern patterThatOnlyWorksWithInt(l : Lane) {
+        Lane.referenceCoord(l, w);
+        check(w <= 2.0);
+}
+
+////////////////
+////Lane
+////////////////
+//
+///////////width, numWidth
+//@Constraint(severity="error", key={l}, message="x")
+//pattern define_numWidth_small(l : Lane) { 
+//      Lane.width(l, Size::Small);
+//      Lane.numWidth(l, nw);
+//      check(nw <= 5);
+//} or {
+//      Lane.width(l, Size::Small);
+//      Lane.numWidth(l, nw);
+//      check(nw >= 10);
+//}
+//
+//@Constraint(severity="error", key={l}, message="x")
+//pattern define_numWidth_medium(l : Lane) { 
+//      Lane.width(l, Size::Medium);
+//      Lane.numWidth(l, nw);
+//      check(nw <= 10);
+//} or {
+//      Lane.width(l, Size::Medium);
+//      Lane.numWidth(l, nw);
+//      check(nw >= 15);
+//}
+//
+//@Constraint(severity="error", key={l}, message="x")
+//pattern define_numWidth_large(l : Lane) { 
+//      Lane.width(l, Size::Large);
+//      Lane.numWidth(l, nw);
+//      check(nw <= 15);
+//} or {
+//      Lane.width(l, Size::Large);
+//      Lane.numWidth(l, nw);
+//      check(nw >= 20);
+//}
+//
+///////////referenceCoord
+//@Constraint(severity="error", key={l}, message="x")
+//pattern define_referenceCoord_horizontalAtOrigin(l:Lane) {
+//      1 == count find find_horizontalLaneAtOrigin(l);
+//}
+//
+//private pattern find_horizontalLaneAtOrigin(l:Lane){
+//      Lane.orientation(l, Orientation::Horizontal);
+//      Lane.referenceCoord(l, rc);
+//      Lane.prevLane(l, _);
+//      rc != 0.0;      
+//}
+//
+//@Constraint(severity="error", key={l}, message="x")
+//pattern define_referenceCoord_verticalAtOrigin(l:Lane) {
+//      1 == count find find_verticalLaneAtOrigin(l);
+//}
+//
+//private pattern find_verticalLaneAtOrigin(l:Lane){
+//      Lane.orientation(l, Orientation::Vertical);
+//      Lane.referenceCoord(l, rc);
+//      rc == 0.0;      
+//}
+//
+//pattern define_referenceCoord_VerticalifMultipleLanes(l1:Lane, l2:Lane) {
+//      //calculated risk???
+//      Lane.orientation(l1, Orientation::Vertical);
+//      Lane.orientation(l2, Orientation::Vertical);
+//      Lane.referenceCoord(l1, rc1);
+//      Lane.numWidth(l1, nw1);
+//      Lane.referenceCoord(l2, rc2);
+//      check(rc2 == rc1 + nw1);
+//}
+//
+//
+////@Constraint(severity = "error", key = {a}, message = "this defines the placedOn relation for vertical lanes")
+////pattern actorOnVerticalLane(a : Actor) {
+////    Actor.placedOn(a, l);
+////    Lane.orientation(l, Orientation::Vertical);
+////    Actor.xPos(a, x);
+////    Lane.referenceCoord(l, r);
+////    check(x <= r);
+////} or {
+////    Actor.placedOn(a, l);
+////    Lane.orientation(l, Orientation::Vertical);
+////    Actor.xPos(a, x);
+////    Lane.referenceCoord(l, r);
+////    Lane.numWidth(l, w);
+////    check(x >= (r + w));
+////}
+////
+////@Constraint(severity = "error", key = {a}, message = "this defines the placedOn relation for horizontal lanes")
+////pattern actorOnHorizontalLane(a : Actor) {
+////    Actor.placedOn(a, l);
+////    Lane.orientation(l, Orientation::Horizontal);
+////    Actor.yPos(a, y);
+////    Lane.referenceCoord(l, r);
+////    check(y <= r);
+////} or {
+////    Actor.placedOn(a, l);
+////    Lane.orientation(l, Orientation::Horizontal);
+////    Actor.yPos(a, y);
+////    Lane.referenceCoord(l, r);
+////    Lane.numWidth(l, w);
+////    check(y >= (r + w));
+////}
+//
+////@Constraint(severity = "error", key = {a}, message = "this defines the placedOn relation")
+////pattern actorOnLane(a : Actor) {
+////    find actorOnVerticalLane(a);
+//////  neg find actorOnHorizontalLane(a);
+////}
+////
+////private pattern actorOnVerticalLane(a : Actor) {
+////    Actor.placedOn(a, l);
+////    Lane.orientation(l, Orientation::Vertical);
+////    Actor.xPos(a, x);
+////    Lane.referenceCoord(l, r);
+////    Lane.numWidth(l, w);
+////    check(x >= r);
+////    check(x <= (r + w));
+////}
+//
+////@Constraint(severity = "error", key = {l}, message = "this defines the placedOn relation")
+////pattern widthSpec(l : Lane) {
+////    Lane.numWidth(l, w);
+////    check(w != 5);
+////}
+//
+////private pattern actorOnHorizontalLane(a : Actor) {
+////    Actor.placedOn(a, l);
+////    Lane.orientation(l, Orientation::Vertical);
+////    Actor.yPos(a, y);
+////    Lane.referenceCoord(l, r);
+////    Lane.widthNum(l, w);
+////    check(y >= r);
+////    check(y <= (r + w));
+////}
+//
+////////////////
+////CollisionExists
+////////////////
+//
+//@Constraint(severity="error", key={c}, message="x")
+//pattern collisionExists_timeWithinBound(ss:CrossingScenario, c:CollisionExists) {
+//      CrossingScenario.actors.relations(ss, c);
+//      CrossingScenario.maxTime(ss, maxTime);
+//      CollisionExists. collisionTime(c, cTime);
+//      check(cTime >= maxTime);}
+//
+//@Constraint(severity="error", key={c}, message="x")
+//pattern collisionExists_timeNotNegative(c:CollisionExists) {
+//      CollisionExists. collisionTime(c, cTime);
+//      check(cTime <= 0);}
+//
+//@Constraint(severity="error", key={a1, c}, message="x")
+//pattern collisionExists_defineCollision_y1(a1:Actor, a2:Actor, c:CollisionExists) {
+//      Actor.relations(a1, c);
+//      CollisionExists.target(c, a2);
+//      
+//      Actor.length(a1, l1);
+//      Actor.yPos(a1, yPos1);
+//      Actor.ySpeed(a1, ySpeed1);
+//      Actor.length(a2, l2);
+//      Actor.yPos(a2, yPos2);
+//      Actor.ySpeed(a2, ySpeed2);
+//      CollisionExists. collisionTime(c, cTime);
+//      //check(y_1_bottom > y_2_top
+//      check((yPos1 + (ySpeed1 * cTime)) - (l1/2) > (yPos2 + (ySpeed2 * cTime)) + (l2/2));     
+//}
+//
+//@Constraint(severity="error", key={a1, c}, message="x")
+//pattern collisionExists_defineCollision_y2(a1:Actor, a2:Actor, c:CollisionExists) {
+//      //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+//      Actor.relations(a1, c);
+//      CollisionExists.target(c, a2);
+//      
+//      Actor.length(a1, l1);
+//      Actor.yPos(a1, yPos1);
+//      Actor.ySpeed(a1, ySpeed1);
+//      Actor.length(a2, l2);
+//      Actor.yPos(a2, yPos2);
+//      Actor.ySpeed(a2, ySpeed2);
+//      CollisionExists. collisionTime(c, cTime);
+//      //check(y_1_top < y_2_bottom)
+//      check((yPos1 + (ySpeed1 * cTime)) + (l1/2) < (yPos2 + (ySpeed2 * cTime)) - (l2/2));     
+//}
+//
+//@Constraint(severity="error", key={a1, c}, message="x")
+//pattern collisionExists_defineCollision_x1(a1:Actor, a2:Actor, c:CollisionExists) {
+//      Actor.relations(a1, c);
+//      CollisionExists.target(c, a2);
+//      
+//      Actor.width(a1, w1);
+//      Actor.xPos(a1, xPos1);
+//      Actor.xSpeed(a1, xSpeed1);
+//      Actor.width(a2, w2);
+//      Actor.xPos(a2, xPos2);
+//      Actor.xSpeed(a2, xSpeed2);
+//      CollisionExists. collisionTime(c, cTime);
+//      //check(x_1_left > x_2_right)
+//      check((xPos1 + (xSpeed1 * cTime)) - (w1/2) > (xPos2 + (xSpeed2 * cTime)) + (w2/2));     
+//}
+//
+//@Constraint(severity="error", key={a1, c}, message="x")
+//pattern collisionExists_defineCollision_x2(a1:Actor, a2:Actor, c:CollisionExists) {
+//      //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+//      Actor.relations(a1, c);
+//      CollisionExists.target(c, a2);
+//      
+//      Actor.width(a1, w1);
+//      Actor.xPos(a1, xPos1);
+//      Actor.xSpeed(a1, xSpeed1);
+//      Actor.width(a2, w2);
+//      Actor.xPos(a2, xPos2);
+//      Actor.xSpeed(a2, xSpeed2);
+//      CollisionExists. collisionTime(c, cTime);
+//      //check(x_1_right < x_2_left)
+//      check((xPos1 + (xSpeed1 * cTime)) + (w1/2) < (xPos2 + (xSpeed2 * cTime)) - (w2/2));     
+//}
+//
+////////////////
+////SeparationDistance
+////////////////
+//@Constraint(severity="error", key={a1, sd}, message="x")
+//pattern SeparationDistance_near_lb(a1:Actor, a2:Actor, sd:SeparationDistance) {
+//      //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+//      Actor.relations(a1, sd);
+//      SeparationDistance.target(sd, a2);
+//      SeparationDistance.distance(sd, Distance::Near);
+//      
+//      Actor.xPos(a1, x1);
+//      Actor.yPos(a1, y1);
+//      Actor.xPos(a2, x2);
+//      Actor.yPos(a2, y2);
+//      //check(dx^2 + dy^2 < 5^2)
+//      check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) < 5*5); 
+//}
+//
+//@Constraint(severity="error", key={a1, sd}, message="x")
+//pattern SeparationDistance_near_ub(a1:Actor, a2:Actor, sd:SeparationDistance) {
+//      //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+//      Actor.relations(a1, sd);
+//      SeparationDistance.target(sd, a2);
+//      SeparationDistance.distance(sd, Distance::Near);
+//      
+//      Actor.xPos(a1, x1);
+//      Actor.yPos(a1, y1);
+//      Actor.xPos(a2, x2);
+//      Actor.yPos(a2, y2);
+//      //check(dx^2 + dy^2 > 10^2)
+//      check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) > 10*10);       
+//}
+//
+//@Constraint(severity="error", key={a1, sd}, message="x")
+//pattern SeparationDistance_medium_lb(a1:Actor, a2:Actor, sd:SeparationDistance) {
+//      //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+//      Actor.relations(a1, sd);
+//      SeparationDistance.target(sd, a2);
+//      SeparationDistance.distance(sd, Distance::Medium);
+//      
+//      Actor.xPos(a1, x1);
+//      Actor.yPos(a1, y1);
+//      Actor.xPos(a2, x2);
+//      Actor.yPos(a2, y2);
+//      //check(dx^2 + dy^2 < 10^2)
+//      check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) < 10*10);       
+//}
+//
+//@Constraint(severity="error", key={a1, sd}, message="x")
+//pattern SeparationDistance_medium_ub(a1:Actor, a2:Actor, sd:SeparationDistance) {
+//      //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+//      Actor.relations(a1, sd);
+//      SeparationDistance.target(sd, a2);
+//      SeparationDistance.distance(sd, Distance::Medium);
+//      
+//      Actor.xPos(a1, x1);
+//      Actor.yPos(a1, y1);
+//      Actor.xPos(a2, x2);
+//      Actor.yPos(a2, y2);
+//      //check(dx^2 + dy^2 > 1^2)
+//      check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) > 15*15);       
+//}
+//
+//@Constraint(severity="error", key={a1, sd}, message="x")
+//pattern SeparationDistance_far_lb(a1:Actor, a2:Actor, sd:SeparationDistance) {
+//      //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+//      Actor.relations(a1, sd);
+//      SeparationDistance.target(sd, a2);
+//      SeparationDistance.distance(sd, Distance::Far);
+//      
+//      Actor.xPos(a1, x1);
+//      Actor.yPos(a1, y1);
+//      Actor.xPos(a2, x2);
+//      Actor.yPos(a2, y2);
+//      //check(dx^2 + dy^2 < 15^2)
+//      check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) < 15*15);       
+//}
+//
+////////////////
+////CollisionDoesNotExist
+////////////////
+//
+////@Constraint(severity="error", key={a1, cdne}, message="x")
+////pattern collisionDoesNotExist(a1:Actor, a2:Actor, ss:CrossingScenario, cdne:CollisionDoesNotExist) {
+////    //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+////    
+////    CrossingScenario.actors(ss, a1);
+////    CrossingScenario.actors(ss, a2);
+////    Actor.relations(a1, cdne);
+////    CollisionDoesNotExist.target(cdne, a2);
+////    CrossingScenario.maxTime(ss, maxTime);
+////    
+////    Actor.width(a1, w1);
+////    Actor.length(a1, l1);
+////    Actor.xPos(a1, xPos1);
+////    Actor.yPos(a1, yPos1);
+////    Actor.xSpeed(a1, xSpeed1);
+////    Actor.ySpeed(a1, ySpeed1);
+////    
+////    Actor.width(a2, w2);
+////    Actor.length(a2, l2);
+////    Actor.xPos(a2, xPos2);
+////    Actor.yPos(a2, yPos2);
+////    Actor.xSpeed(a2, xSpeed2);
+////    Actor.ySpeed(a2, ySpeed2);
+////    //check(dx^2 + dy^2 < 15^2)
+////    check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) < 15*15);       
+////}
+//
+////////////////
+////VisionBlocked
+////////////////
+//
+////OPTIONS 1: everything is from a single check expression containing ITEs
+////Currently unhandled bygenerator
+//@Constraint(severity="error", key={a1, vb}, message="x")
+//pattern visionBlocked_ites_top(a1:Actor, a2:Actor, vb:VisionBlocked) {
+//      //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+//      Actor.relations(a1, vb);
+//      VisionBlocked.target(vb, a2);
+//      VisionBlocked.blockedBy(vb, aBlocker);
+//      
+//      Actor.xPos(a1, x1);
+//      Actor.yPos(a1, y1);
+//      Actor.xPos(a2, x2);
+//      Actor.yPos(a2, y2);
+//      Actor.xPos(aBlocker, xBlocker);
+//      Actor.yPos(aBlocker, yBlocker);
+//      Actor.length(aBlocker, lenBlocker);
+//      Actor.width(aBlocker, widBlocker);
+//      
+//      //check(slope of a1-to-BlockerTop < slope of a1-to-a2)
+//      check(
+//              ( yBlocker - y1 + (if(xBlocker > x1){lenBlocker/2}else{0-lenBlocker/2})) / 
+//              ( xBlocker - x1 + (if(yBlocker > y1){0-widBlocker/2}else{widBlocker/2}))
+//              < ((y1-y2)/(x1-x2)));   
+//}
+//
+//@Constraint(severity="error", key={a1, vb}, message="x")
+//pattern visionBlocked_ites_bottom(a1:Actor, a2:Actor, vb:VisionBlocked) {
+//      //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
+//      Actor.relations(a1, vb);
+//      VisionBlocked.target(vb, a2);
+//      VisionBlocked.blockedBy(vb, aBlocker);
+//      
+//      Actor.xPos(a1, x1);
+//      Actor.yPos(a1, y1);
+//      Actor.xPos(a2, x2);
+//      Actor.yPos(a2, y2);
+//      Actor.xPos(aBlocker, xBlocker);
+//      Actor.yPos(aBlocker, yBlocker);
+//      Actor.length(aBlocker, lenBlocker);
+//      Actor.width(aBlocker, widBlocker);
+//      
+//      //check(slope of a1-to-BlockerBottom > slope of a1-to-a2)
+//      check(
+//              ( yBlocker - y1 + (if(xBlocker > x1){0-lenBlocker/2}else{lenBlocker/2})) / 
+//              ( xBlocker - x1 + (if(yBlocker > y1){widBlocker/2}else{0-widBlocker/2}))
+//              > ((y1-y2)/(x1-x2)));   
+//}
+//
+////OPTION 2: 
+////we handle ITE by seperating the constraints
+//
+////This will involve 1 constarint for each decision path, but will require multiple check expressions within the same pattern
+//
+////OPTION 3: 
+////If this is nott working still, we will have to add some strctural components to the MM
+////to differentiate the different cases and reduce the requirements of if, then, else
+//
+////This will involve more patterns, and some that are pstructural as well.
\ No newline at end of file
diff --git a/Domains/simpleScenario/queries/logProb._vql b/Domains/crossingScenario/queries/logProb._vql
index e6045909..e6045909 100644
--- a/Domains/simpleScenario/queries/logProb._vql
+++ b/Domains/crossingScenario/queries/logProb._vql
diff --git a/Domains/simpleScenario/src/simpleScenario/run/simpleScenarioMain.java b/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java
index 63e31e64..bbef5665 100644
--- a/Domains/simpleScenario/src/simpleScenario/run/simpleScenarioMain.java
+++ b/Domains/crossingScenario/src/crossingScenario/run/CrossingScenarioMain.java
@@ -1,14 +1,14 @@
-package simpleScenario.run;

+package crossingScenario.run;

 

 import hu.bme.mit.inf.dslreasoner.application.execution.StandaloneScriptExecutor;

 

-public class simpleScenarioMain {

-        private simpleScenarioMain() {

+public class CrossingScenarioMain {

+        private CrossingScenarioMain() {

                 throw new IllegalStateException("This is a static utility class and should not be instantiated directly.");

         }

         

         public static void main(String[] args) {

-                String errorMessages = StandaloneScriptExecutor.executeScript("inputs/simpleScenarioGen.vsconfig");

+                String errorMessages = StandaloneScriptExecutor.executeScript("inputs/crossingScenarioGen.vsconfig");

                 if(errorMessages!=null) {

                         System.out.println(errorMessages);

                 }

diff --git a/Domains/simpleScenario/src/simpleScenario/run/QueryDebug.java b/Domains/crossingScenario/src/crossingScenario/run/QueryDebug.java
index 816a258d..7cbf626d 100644
--- a/Domains/simpleScenario/src/simpleScenario/run/QueryDebug.java
+++ b/Domains/crossingScenario/src/crossingScenario/run/QueryDebug.java
@@ -1,4 +1,4 @@
-package simpleScenario.run;

+package crossingScenario.run;

 

 public class QueryDebug {

 //      public static void main(String[] args) {

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/ActorType.java b/Domains/simpleScenario/ecore-gen/simpleScenario/ActorType.java
deleted file mode 100644
index 7d9e1988..00000000
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/ActorType.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/**

- */

-package simpleScenario;

-

-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>Actor Type</b></em>',

- * and utility methods for working with them.

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

- * @see simpleScenario.SimpleScenarioPackage#getActorType()

- * @model

- * @generated

- */

-public enum ActorType implements Enumerator {

-        /**

-         * The '<em><b>Pedestrian</b></em>' literal object.

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

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

-         * @see #PEDESTRIAN_VALUE

-         * @generated

-         * @ordered

-         */

-        PEDESTRIAN(0, "Pedestrian", "Pedestrian"),

-

-        /**

-         * The '<em><b>Vehicle</b></em>' literal object.

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

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

-         * @see #VEHICLE_VALUE

-         * @generated

-         * @ordered

-         */

-        VEHICLE(1, "Vehicle", "Vehicle");

-

-        /**

-         * The '<em><b>Pedestrian</b></em>' literal value.

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

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

-         * @see #PEDESTRIAN

-         * @model name="Pedestrian"

-         * @generated

-         * @ordered

-         */

-        public static final int PEDESTRIAN_VALUE = 0;

-

-        /**

-         * The '<em><b>Vehicle</b></em>' literal value.

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

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

-         * @see #VEHICLE

-         * @model name="Vehicle"

-         * @generated

-         * @ordered

-         */

-        public static final int VEHICLE_VALUE = 1;

-

-        /**

-         * An array of all the '<em><b>Actor Type</b></em>' enumerators.

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

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

-         * @generated

-         */

-        private static final ActorType[] VALUES_ARRAY =

-                new ActorType[] {

-                        PEDESTRIAN,

-                        VEHICLE,

-                };

-

-        /**

-         * A public read-only list of all the '<em><b>Actor Type</b></em>' enumerators.

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

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

-         * @generated

-         */

-        public static final List<ActorType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));

-

-        /**

-         * Returns the '<em><b>Actor Type</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 ActorType get(String literal) {

-                for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-                        ActorType result = VALUES_ARRAY[i];

-                        if (result.toString().equals(literal)) {

-                                return result;

-                        }

-                }

-                return null;

-        }

-

-        /**

-         * Returns the '<em><b>Actor Type</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 ActorType getByName(String name) {

-                for (int i = 0; i < VALUES_ARRAY.length; ++i) {

-                        ActorType result = VALUES_ARRAY[i];

-                        if (result.getName().equals(name)) {

-                                return result;

-                        }

-                }

-                return null;

-        }

-

-        /**

-         * Returns the '<em><b>Actor Type</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 ActorType get(int value) {

-                switch (value) {

-                        case PEDESTRIAN_VALUE: return PEDESTRIAN;

-                        case VEHICLE_VALUE: return VEHICLE;

-                }

-                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 ActorType(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;

-        }

-        

-} //ActorType

diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java b/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java
deleted file mode 100644
index 8af1f25e..00000000
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**

- */

-package simpleScenario;

-

-

-/**

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

- * A representation of the model object '<em><b>Seperation Distance</b></em>'.

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

- *

- * <p>

- * The following features are supported:

- * </p>

- * <ul>

- *   <li>{@link simpleScenario.SeperationDistance#getDistance <em>Distance</em>}</li>

- * </ul>

- *

- * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance()

- * @model

- * @generated

- */

-public interface SeperationDistance extends SpatialRelation {

-        /**

-         * Returns the value of the '<em><b>Distance</b></em>' attribute.

-         * The literals are from the enumeration {@link simpleScenario.Distance}.

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

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

-         * @return the value of the '<em>Distance</em>' attribute.

-         * @see simpleScenario.Distance

-         * @see #setDistance(Distance)

-         * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance_Distance()

-         * @model required="true"

-         * @generated

-         */

-        Distance getDistance();

-

-        /**

-         * Sets the value of the '{@link simpleScenario.SeperationDistance#getDistance <em>Distance</em>}' attribute.

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

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

-         * @param value the new value of the '<em>Distance</em>' attribute.

-         * @see simpleScenario.Distance

-         * @see #getDistance()

-         * @generated

-         */

-        void setDistance(Distance value);

-

-} // SeperationDistance

diff --git a/Domains/simpleScenario/inputs/SimpleScenarioInstance.xmi b/Domains/simpleScenario/inputs/SimpleScenarioInstance.xmi
deleted file mode 100644
index 4a85197a..00000000
--- a/Domains/simpleScenario/inputs/SimpleScenarioInstance.xmi
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<simpleScenario:SimpleScenario xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"

-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:simpleScenario="http://www.example.com/simpleScenario"

-    xsi:schemaLocation="http://www.example.com/simpleScenario ../model/simpleScenario.ecore"/>

diff --git a/Domains/simpleScenario/model/simpleScenario.aird b/Domains/simpleScenario/model/simpleScenario.aird
deleted file mode 100644
index ed02351d..00000000
--- a/Domains/simpleScenario/model/simpleScenario.aird
+++ /dev/null
@@ -1,1253 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">

-  <viewpoint:DAnalysis uid="_XP5a8FPIEeuRNIB-ivzkoA" selectedViews="_XSElMFPIEeuRNIB-ivzkoA _XSVq8FPIEeuRNIB-ivzkoA _XSZVUFPIEeuRNIB-ivzkoA _XShRIFPIEeuRNIB-ivzkoA" version="14.3.0.201909031200">

-    <semanticResources>simpleScenario.ecore</semanticResources>

-    <semanticResources>simpleScenario.genmodel</semanticResources>

-    <ownedViews xmi:type="viewpoint:DView" uid="_XSElMFPIEeuRNIB-ivzkoA">

-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>

-      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_X5RvIFPIEeuRNIB-ivzkoA" name="simpleScenario class diagram" repPath="#_X5ACUFPIEeuRNIB-ivzkoA" changeId="4a4a215d-766f-4559-8c8f-c76d95ef5fc9">

-        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>

-        <target xmi:type="ecore:EPackage" href="simpleScenario.ecore#/"/>

-      </ownedRepresentationDescriptors>

-    </ownedViews>

-    <ownedViews xmi:type="viewpoint:DView" uid="_XSVq8FPIEeuRNIB-ivzkoA">

-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>

-    </ownedViews>

-    <ownedViews xmi:type="viewpoint:DView" uid="_XSZVUFPIEeuRNIB-ivzkoA">

-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>

-    </ownedViews>

-    <ownedViews xmi:type="viewpoint:DView" uid="_XShRIFPIEeuRNIB-ivzkoA">

-      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>

-    </ownedViews>

-  </viewpoint:DAnalysis>

-  <diagram:DSemanticDiagram uid="_X5ACUFPIEeuRNIB-ivzkoA">

-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_X5RIEFPIEeuRNIB-ivzkoA" source="DANNOTATION_CUSTOMIZATION_KEY">

-      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_X5RIEVPIEeuRNIB-ivzkoA">

-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_uRTXsFPhEeubALGSMZ7-4Q" routingStyle="manhattan">

-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_uRTXsVPhEeubALGSMZ7-4Q" showIcon="false" labelExpression="service:render">

-            <labelFormat>bold</labelFormat>

-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

-          </centerLabelStyleDescription>

-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_uRTXslPhEeubALGSMZ7-4Q" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">

-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>

-          </endLabelStyleDescription>

-        </computedStyleDescriptions>

-        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_8aff8FPhEeubALGSMZ7-4Q" sourceArrow="FillDiamond" routingStyle="manhattan">

-          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

-          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_8aff8VPhEeubALGSMZ7-4Q" showIcon="false" labelExpression="service:render">

-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

-          </centerLabelStyleDescription>

-          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_8aff8lPhEeubALGSMZ7-4Q" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">

-            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>

-          </endLabelStyleDescription>

-        </computedStyleDescriptions>

-        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_egJDsFPvEeuJov5cvS3R2A" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">

-          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

-          <labelFormat>bold</labelFormat>

-          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

-          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

-        </computedStyleDescriptions>

-        <computedStyleDescriptions xmi:type="style:BundledImageDescription" xmi:id="_hK9ZklT_Eeu7HeDiE6WqMg" labelExpression="service:render" labelAlignment="LEFT" tooltipExpression="service:renderTooltip" sizeComputationExpression="1">

-          <borderColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

-          <labelFormat>bold</labelFormat>

-          <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>

-          <color xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

-        </computedStyleDescriptions>

-      </data>

-    </ownedAnnotationEntries>

-    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_X5RvIVPIEeuRNIB-ivzkoA" source="GMF_DIAGRAMS">

-      <data xmi:type="notation:Diagram" xmi:id="_X5RvIlPIEeuRNIB-ivzkoA" type="Sirius" element="_X5ACUFPIEeuRNIB-ivzkoA" measurementUnit="Pixel">

-        <children xmi:type="notation:Node" xmi:id="_OtOiYFPgEeubALGSMZ7-4Q" type="2003" element="_OtFYcFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_OtircFPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_OtircVPgEeubALGSMZ7-4Q" type="7004">

-            <children xmi:type="notation:Node" xmi:id="_P1r_QFPgEeubALGSMZ7-4Q" type="3010" element="_P1mfsFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_P1r_QVPgEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_P1r_QlPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_RTkSgFPgEeubALGSMZ7-4Q" type="3010" element="_RTc9wFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_RTkSgVPgEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_RTkSglPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="__XODwFV2Eeu8ou9WeNwDEQ" type="3010" element="__Wd10FV2Eeu8ou9WeNwDEQ">

-              <styles xmi:type="notation:FontStyle" xmi:id="__XODwVV2Eeu8ou9WeNwDEQ" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="__XODwlV2Eeu8ou9WeNwDEQ"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_OtirclPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Otirc1PgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_OtOiYVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OtOiYlPgEeubALGSMZ7-4Q" x="252" y="24" width="159" height="87"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_TwdLsFPgEeubALGSMZ7-4Q" type="2003" element="_TwYTMFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_TwdywFPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_TwdywVPgEeubALGSMZ7-4Q" type="7004">

-            <children xmi:type="notation:Node" xmi:id="_UiXJwFPgEeubALGSMZ7-4Q" type="3010" element="_UiRDIFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_UiXJwVPgEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_UiXJwlPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_lW0lcFPgEeubALGSMZ7-4Q" type="3010" element="_lWkGwFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_lW0lcVPgEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_lW0lclPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_m8jNIFPgEeubALGSMZ7-4Q" type="3010" element="_m8aDMFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_m8jNIVPgEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_m8jNIlPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_22HKAFPkEeubALGSMZ7-4Q" type="3010" element="_21oo4FPkEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_22HKAVPkEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_22HKAlPkEeubALGSMZ7-4Q"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_TwdywlPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Twdyw1PgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_TwdLsVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TwdLslPgEeubALGSMZ7-4Q" x="48" y="288" width="219" height="99"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_V7zB4FPgEeubALGSMZ7-4Q" type="2003" element="_V7s7QFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_V7zo8lPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_V70QAFPgEeubALGSMZ7-4Q" type="7004">

-            <children xmi:type="notation:Node" xmi:id="_W-U14FPgEeubALGSMZ7-4Q" type="3010" element="_W-OvQFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_W-U14VPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_W-U14lPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_XytgMFPgEeubALGSMZ7-4Q" type="3010" element="_XyonsFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_XytgMVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_XytgMlPgEeubALGSMZ7-4Q"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_V70QAVPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_V70QAlPgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_V7zo8FPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_V7zo8VPgEeubALGSMZ7-4Q" x="764" y="60" width="120" height="63"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_a4oIQFPgEeubALGSMZ7-4Q" type="2003" element="_a4aF0FPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_a4pWYFPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_a4p9cFPgEeubALGSMZ7-4Q" type="7004">

-            <children xmi:type="notation:Node" xmi:id="_b7U7YFPgEeubALGSMZ7-4Q" type="3010" element="_b7J8QFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_b7U7YVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_b7U7YlPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_cqg8oFPgEeubALGSMZ7-4Q" type="3010" element="_cqYZwFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_cqg8oVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_cqg8olPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_dafoEFPgEeubALGSMZ7-4Q" type="3010" element="_daSzwFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_dafoEVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_dafoElPgEeubALGSMZ7-4Q"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_a4p9cVPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_a4p9clPgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_a4oIQVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a4oIQlPgEeubALGSMZ7-4Q" x="911" y="60" width="120" height="87"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_pFDxwFPgEeubALGSMZ7-4Q" type="2003" element="_pE1IQFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_pFE_4FPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_pFE_4VPgEeubALGSMZ7-4Q" type="7004">

-            <children xmi:type="notation:Node" xmi:id="_rcfjMFPgEeubALGSMZ7-4Q" type="3010" element="_rcWZQFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_rcfjMVPgEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_rcfjMlPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_tUwsYFPgEeubALGSMZ7-4Q" type="3010" element="_tUgNsFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_tUwsYVPgEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_tUwsYlPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_9C9YsFPiEeubALGSMZ7-4Q" type="3010" element="_9CuvMFPiEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_9C9YsVPiEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_9C9YslPiEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_BPlKIFPjEeubALGSMZ7-4Q" type="3010" element="_BPXHsFPjEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_BPlKIVPjEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_BPlKIlPjEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_qJitkFPgEeubALGSMZ7-4Q" type="3010" element="_qJVSMFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_qJitkVPgEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_qJitklPgEeubALGSMZ7-4Q"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_lbaaUFV8Eeu8ou9WeNwDEQ" type="3010" element="_lbCm4FV8Eeu8ou9WeNwDEQ">

-              <styles xmi:type="notation:FontStyle" xmi:id="_lbaaUVV8Eeu8ou9WeNwDEQ" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_lbaaUlV8Eeu8ou9WeNwDEQ"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_pFE_4lPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_pFE_41PgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_pFDxwVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pFDxwlPgEeubALGSMZ7-4Q" x="312" y="168" width="171" height="135"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_xOORQFPgEeubALGSMZ7-4Q" type="2003" element="_xN7WUFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_xOPfYFPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_xOQGcFPgEeubALGSMZ7-4Q" type="7004">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_xOQGcVPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_xOQGclPgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_xOORQVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xOORQlPgEeubALGSMZ7-4Q" x="867" y="250" width="120" height="39"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_yn8dQFPgEeubALGSMZ7-4Q" type="2003" element="_ynvB4FPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_yn9rYFPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_yn9rYVPgEeubALGSMZ7-4Q" type="7004">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_yn9rYlPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_yn9rY1PgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_yn8dQVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_yn8dQlPgEeubALGSMZ7-4Q" x="750" y="336" width="120" height="39"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_0YHaYFPgEeubALGSMZ7-4Q" type="2003" element="_0X27sFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_0YIBcFPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_0YIBcVPgEeubALGSMZ7-4Q" type="7004">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_0YIBclPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_0YIBc1PgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_0YHaYVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0YHaYlPgEeubALGSMZ7-4Q" x="984" y="336" width="120" height="21"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_6Kj6IFPgEeubALGSMZ7-4Q" type="2003" element="_6KUpkFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_6KlIQFPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_6KlIQVPgEeubALGSMZ7-4Q" type="7004">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_6KlIQlPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_6KlIQ1PgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_6KkhMFPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_6KkhMVPgEeubALGSMZ7-4Q" x="603" y="408" width="99" height="27"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_9LNAoFPgEeubALGSMZ7-4Q" type="2003" element="_9K6swFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_9LNnsFPgEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_9LNnsVPgEeubALGSMZ7-4Q" type="7004">

-            <children xmi:type="notation:Node" xmi:id="_-gVAgFPgEeubALGSMZ7-4Q" type="3010" element="_-gIMMFPgEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_-gVAgVPgEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_-gVAglPgEeubALGSMZ7-4Q"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_9LNnslPgEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_9LNns1PgEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_9LNAoVPgEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9LNAolPgEeubALGSMZ7-4Q" x="720" y="408" width="194" height="52"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_BIq7wFPhEeubALGSMZ7-4Q" type="2003" element="_BIO24FPhEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_BIsJ4FPhEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_BItYAFPhEeubALGSMZ7-4Q" type="7004">

-            <children xmi:type="notation:Node" xmi:id="_CGiSMFPhEeubALGSMZ7-4Q" type="3010" element="_CGTosFPhEeubALGSMZ7-4Q">

-              <styles xmi:type="notation:FontStyle" xmi:id="_CGiSMVPhEeubALGSMZ7-4Q" fontColor="2697711" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_CGiSMlPhEeubALGSMZ7-4Q"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_BItYAVPhEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_BItYAlPhEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_BIq7wVPhEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BIq7wlPhEeubALGSMZ7-4Q" x="939" y="412" width="183" height="48"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_F-iegFPhEeubALGSMZ7-4Q" type="2003" element="_F-VqMFPhEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_F-jFkFPhEeubALGSMZ7-4Q" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_F-jFkVPhEeubALGSMZ7-4Q" type="7004">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_F-jFklPhEeubALGSMZ7-4Q"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_F-jFk1PhEeubALGSMZ7-4Q"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_F-iegVPhEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F-ieglPhEeubALGSMZ7-4Q" x="1143" y="415" width="147" height="27"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_TprY0FPhEeubALGSMZ7-4Q" type="Note" fontName="Segoe UI" description="MORE COMPLEX: xVel and yVel, adjusted according to lane orientation" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_TprY0VPhEeubALGSMZ7-4Q" source="specificStyles">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_TprY0lPhEeubALGSMZ7-4Q" key="verticalAlignment" value="8"/>

-          </eAnnotations>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_Tpr_4FPhEeubALGSMZ7-4Q" type="DiagramName">

-            <element xsi:nil="true"/>

-          </children>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_Tpr_4VPhEeubALGSMZ7-4Q" type="Description">

-            <element xsi:nil="true"/>

-          </children>

-          <styles xmi:type="notation:TextStyle" xmi:id="_TprY01PhEeubALGSMZ7-4Q" textAlignment="Center"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_TprY1FPhEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TprY1VPhEeubALGSMZ7-4Q" x="444" y="36" width="145" height="74"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_ZlSboFPhEeubALGSMZ7-4Q" type="Note" fontName="Segoe UI" description="No junctions, only straight lanes. Action limited to forward motion." fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_ZlSboVPhEeubALGSMZ7-4Q" source="specificStyles">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_ZlSbolPhEeubALGSMZ7-4Q" key="verticalAlignment" value="8"/>

-          </eAnnotations>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_ZlTCsFPhEeubALGSMZ7-4Q" type="DiagramName">

-            <element xsi:nil="true"/>

-          </children>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_ZlTCsVPhEeubALGSMZ7-4Q" type="Description">

-            <element xsi:nil="true"/>

-          </children>

-          <styles xmi:type="notation:TextStyle" xmi:id="_ZlSbo1PhEeubALGSMZ7-4Q" textAlignment="Center"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_ZlSbpFPhEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZlSbpVPhEeubALGSMZ7-4Q" x="48" y="36" width="162"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_eFrdoFPhEeubALGSMZ7-4Q" type="Note" fontName="Segoe UI" description="referenceCoord is (x of left side for vertical lanes) and (y of bottomfor horizontal lanes). Assumption that lanes are infinite length. Limitations are bound of SimpleScenario." fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_eFrdoVPhEeubALGSMZ7-4Q" source="specificStyles">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_eFrdolPhEeubALGSMZ7-4Q" key="verticalAlignment" value="8"/>

-          </eAnnotations>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_eFsEsFPhEeubALGSMZ7-4Q" type="DiagramName">

-            <element xsi:nil="true"/>

-          </children>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_eFsEsVPhEeubALGSMZ7-4Q" type="Description">

-            <element xsi:nil="true"/>

-          </children>

-          <styles xmi:type="notation:TextStyle" xmi:id="_eFrdo1PhEeubALGSMZ7-4Q" textAlignment="Center"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_eFrdpFPhEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_eFrdpVPhEeubALGSMZ7-4Q" x="48" y="420" width="217" height="97"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_2t_QIFPhEeubALGSMZ7-4Q" type="Note" fontName="Segoe UI" description="This might be 0..1: because we might not care about which is the bloking actorm as long as vision is blocked. TO FURTHER RESTRICT: might need to make this 1..1, or enforce this to a certain extent from queries." fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2t_QIVPhEeubALGSMZ7-4Q" source="specificStyles">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2t_QIlPhEeubALGSMZ7-4Q" key="verticalAlignment" value="8"/>

-          </eAnnotations>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_2t_3MFPhEeubALGSMZ7-4Q" type="DiagramName">

-            <element xsi:nil="true"/>

-          </children>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_2t_3MVPhEeubALGSMZ7-4Q" type="Description">

-            <element xsi:nil="true"/>

-          </children>

-          <styles xmi:type="notation:TextStyle" xmi:id="_2t_QI1PhEeubALGSMZ7-4Q" textAlignment="Center"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_2t_QJFPhEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2t_QJVPhEeubALGSMZ7-4Q" x="539" y="492" width="226" height="109"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_DfudQFPiEeubALGSMZ7-4Q" type="Note" fontName="Segoe UI" description="might not be relevant" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_DfudQVPiEeubALGSMZ7-4Q" source="specificStyles">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_DfudQlPiEeubALGSMZ7-4Q" key="verticalAlignment" value="8"/>

-          </eAnnotations>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_DfvEUFPiEeubALGSMZ7-4Q" type="DiagramName">

-            <element xsi:nil="true"/>

-          </children>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_DfvrYFPiEeubALGSMZ7-4Q" type="Description">

-            <element xsi:nil="true"/>

-          </children>

-          <styles xmi:type="notation:TextStyle" xmi:id="_DfudQ1PiEeubALGSMZ7-4Q" textAlignment="Center"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_DfudRFPiEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_DfudRVPiEeubALGSMZ7-4Q" x="48" y="133" width="82" height="55"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_EVHXsFPjEeubALGSMZ7-4Q" type="Note" fontName="Segoe UI" description="length and width hard-coded wrt. actor type for now. speed is in the direction of the lane tht it is in." fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_EVHXsVPjEeubALGSMZ7-4Q" source="specificStyles">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_EVHXslPjEeubALGSMZ7-4Q" key="verticalAlignment" value="8"/>

-          </eAnnotations>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_EVHXtlPjEeubALGSMZ7-4Q" type="DiagramName">

-            <element xsi:nil="true"/>

-          </children>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_EVH-wFPjEeubALGSMZ7-4Q" type="Description">

-            <element xsi:nil="true"/>

-          </children>

-          <styles xmi:type="notation:TextStyle" xmi:id="_EVHXs1PjEeubALGSMZ7-4Q" textAlignment="Center"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_EVHXtFPjEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_EVHXtVPjEeubALGSMZ7-4Q" x="300" y="457" width="193" height="72"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_pgXlUFT_Eeu7HeDiE6WqMg" type="Note" fontName="Segoe UI" description="Actor.CollisionExists(a, b) implies that a nad b collide at time collisionTime. However, this is NOT A DOUBLE-IMPLICATION" fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_pgXlUVT_Eeu7HeDiE6WqMg" source="specificStyles">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_pgYMYFT_Eeu7HeDiE6WqMg" key="verticalAlignment" value="8"/>

-          </eAnnotations>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_pglAsFT_Eeu7HeDiE6WqMg" type="DiagramName">

-            <element xsi:nil="true"/>

-          </children>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_pglnwFT_Eeu7HeDiE6WqMg" type="Description">

-            <element xsi:nil="true"/>

-          </children>

-          <styles xmi:type="notation:TextStyle" xmi:id="_pgYMYVT_Eeu7HeDiE6WqMg" textAlignment="Center"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_pgYMYlT_Eeu7HeDiE6WqMg"/>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_pgYMY1T_Eeu7HeDiE6WqMg" x="840" y="525" width="218" height="76"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_4YZwkFT_Eeu7HeDiE6WqMg" type="Note" fontName="Segoe UI" description="Actor.CollisionDoesNotExist(a, b) implies that a and b NEVER collide. However, this is NOT A DOUBLE-IMPLICATION." fillColor="13369343" transparency="0" lineColor="6737151" lineWidth="1">

-          <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_4YZwkVT_Eeu7HeDiE6WqMg" source="specificStyles">

-            <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_4YZwklT_Eeu7HeDiE6WqMg" key="verticalAlignment" value="8"/>

-          </eAnnotations>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_4YZwk1T_Eeu7HeDiE6WqMg" type="DiagramName">

-            <element xsi:nil="true"/>

-          </children>

-          <children xmi:type="notation:BasicDecorationNode" xmi:id="_4YZwlFT_Eeu7HeDiE6WqMg" type="Description">

-            <element xsi:nil="true"/>

-          </children>

-          <styles xmi:type="notation:TextStyle" xmi:id="_4YZwlVT_Eeu7HeDiE6WqMg" textAlignment="Center"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_4YZwllT_Eeu7HeDiE6WqMg"/>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_4YZwl1T_Eeu7HeDiE6WqMg" x="1080" y="528" width="218" height="76"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_Cn4cUFUAEeu7HeDiE6WqMg" type="2003" element="_Cnc-gFUAEeu7HeDiE6WqMg">

-          <children xmi:type="notation:Node" xmi:id="_Cn8GsFUAEeu7HeDiE6WqMg" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_Cn9U0FUAEeu7HeDiE6WqMg" type="7004">

-            <children xmi:type="notation:Node" xmi:id="_D9bS8FUAEeu7HeDiE6WqMg" type="3010" element="_D9F7wFUAEeu7HeDiE6WqMg">

-              <styles xmi:type="notation:FontStyle" xmi:id="_D9bS8VUAEeu7HeDiE6WqMg" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_D9bS8lUAEeu7HeDiE6WqMg"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_MUcBMFUAEeu7HeDiE6WqMg" type="3010" element="_MUIfMFUAEeu7HeDiE6WqMg">

-              <styles xmi:type="notation:FontStyle" xmi:id="_MUcBMVUAEeu7HeDiE6WqMg" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_MUcBMlUAEeu7HeDiE6WqMg"/>

-            </children>

-            <children xmi:type="notation:Node" xmi:id="_N0dCcFUAEeu7HeDiE6WqMg" type="3010" element="_N0KHgFUAEeu7HeDiE6WqMg">

-              <styles xmi:type="notation:FontStyle" xmi:id="_N0dCcVUAEeu7HeDiE6WqMg" fontName="Segoe UI" fontHeight="8"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_N0dCclUAEeu7HeDiE6WqMg"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Cn9U0VUAEeu7HeDiE6WqMg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Cn9U0lUAEeu7HeDiE6WqMg"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_Cn4cUVUAEeu7HeDiE6WqMg" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cn4cUlUAEeu7HeDiE6WqMg" x="617" y="60" width="120" height="87"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_Z1wbsFUBEeu7HeDiE6WqMg" type="2003" element="_Z1GUYFUBEeu7HeDiE6WqMg">

-          <children xmi:type="notation:Node" xmi:id="_Z1xCwFUBEeu7HeDiE6WqMg" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_Z1xCwVUBEeu7HeDiE6WqMg" type="7004">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_Z1xCwlUBEeu7HeDiE6WqMg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_Z1xCw1UBEeu7HeDiE6WqMg"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_Z1wbsVUBEeu7HeDiE6WqMg" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z1wbslUBEeu7HeDiE6WqMg" x="348" y="384" width="87" height="27"/>

-        </children>

-        <children xmi:type="notation:Node" xmi:id="_a0_rIFUBEeu7HeDiE6WqMg" type="2003" element="_a0iYIFUBEeu7HeDiE6WqMg">

-          <children xmi:type="notation:Node" xmi:id="_a0_rI1UBEeu7HeDiE6WqMg" type="5007"/>

-          <children xmi:type="notation:Node" xmi:id="_a1ASMFUBEeu7HeDiE6WqMg" type="7004">

-            <styles xmi:type="notation:SortingStyle" xmi:id="_a1ASMVUBEeu7HeDiE6WqMg"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_a1ASMlUBEeu7HeDiE6WqMg"/>

-          </children>

-          <styles xmi:type="notation:ShapeStyle" xmi:id="_a0_rIVUBEeu7HeDiE6WqMg" fontName="Segoe UI" fontHeight="8"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a0_rIlUBEeu7HeDiE6WqMg" x="408" y="336" width="75" height="41"/>

-        </children>

-        <styles xmi:type="notation:DiagramStyle" xmi:id="_X5RvI1PIEeuRNIB-ivzkoA"/>

-        <edges xmi:type="notation:Edge" xmi:id="_QQsq0FPhEeubALGSMZ7-4Q" type="4001" element="_QQgdkFPhEeubALGSMZ7-4Q" source="_F-iegFPhEeubALGSMZ7-4Q" target="_0YHaYFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_QQt48FPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QQt48VPhEeubALGSMZ7-4Q" y="-10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_QQt48lPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QQt481PhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_QQugAFPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QQugAVPhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_QQsq0VPhEeubALGSMZ7-4Q" routing="Tree"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_QQsq0lPhEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QQsq01PhEeubALGSMZ7-4Q" points="[0, 0, 84, 40]$[-84, -40, 0, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QQw8QFPhEeubALGSMZ7-4Q" id="(0.16551724137931034,0.0)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QQw8QVPhEeubALGSMZ7-4Q" id="(0.5,0.5)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_QsrcMFPhEeubALGSMZ7-4Q" type="4001" element="_Qsen4FPhEeubALGSMZ7-4Q" source="_BIq7wFPhEeubALGSMZ7-4Q" target="_0YHaYFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_QsrcNFPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsrcNVPhEeubALGSMZ7-4Q" y="-10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_QsrcNlPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QsrcN1PhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_QssDQFPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QssDQVPhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_QsrcMVPhEeubALGSMZ7-4Q" routing="Tree"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_QsrcMlPhEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_QsrcM1PhEeubALGSMZ7-4Q" points="[0, 0, 0, 37]$[0, -37, 0, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QssDQlPhEeubALGSMZ7-4Q" id="(0.574585635359116,0.0)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_QssDQ1PhEeubALGSMZ7-4Q" id="(0.5,0.5)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_RJCBAFPhEeubALGSMZ7-4Q" type="4001" element="_RI43FlPhEeubALGSMZ7-4Q" source="_9LNAoFPgEeubALGSMZ7-4Q" target="_yn8dQFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_RJCoEFPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RJCoEVPhEeubALGSMZ7-4Q" y="-10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_RJCoElPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RJCoE1PhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_RJCoFFPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RJCoFVPhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_RJCBAVPhEeubALGSMZ7-4Q" routing="Tree"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_RJCBAlPhEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RJCBA1PhEeubALGSMZ7-4Q" points="[0, 0, 0, 33]$[0, -33, 0, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJDPIFPhEeubALGSMZ7-4Q" id="(0.453125,0.0)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RJDPIVPhEeubALGSMZ7-4Q" id="(0.5,0.5)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_RrDI8FPhEeubALGSMZ7-4Q" type="4001" element="_Rq5_BlPhEeubALGSMZ7-4Q" source="_6Kj6IFPgEeubALGSMZ7-4Q" target="_yn8dQFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_RrDwAFPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RrDwAVPhEeubALGSMZ7-4Q" y="-10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_RrDwAlPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RrDwA1PhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_RrEXEFPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RrEXEVPhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_RrDI8VPhEeubALGSMZ7-4Q" routing="Tree"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_RrDI8lPhEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_RrDI81PhEeubALGSMZ7-4Q" points="[0, 0, -110, 53]$[0, -15, -110, 38]$[111, -15, 1, 38]$[111, -33, 1, 20]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RrEXElPhEeubALGSMZ7-4Q" id="(0.7319587628865979,0.02564102564102564)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_RrEXE1PhEeubALGSMZ7-4Q" id="(0.5,0.5)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_SJweMFPhEeubALGSMZ7-4Q" type="4001" element="_SJlfFlPhEeubALGSMZ7-4Q" source="_yn8dQFPgEeubALGSMZ7-4Q" target="_xOORQFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_SJxFQFPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SJxFQVPhEeubALGSMZ7-4Q" y="-10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_SJxFQlPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SJxFQ1PhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_SJxFRFPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SJxFRVPhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_SJweMVPhEeubALGSMZ7-4Q" routing="Tree"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_SJweMlPhEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SJweM1PhEeubALGSMZ7-4Q" points="[0, 0, -117, 33]$[117, -33, 0, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SJxsUFPhEeubALGSMZ7-4Q" id="(0.5,0.0)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SJxsUVPhEeubALGSMZ7-4Q" id="(0.5,0.5)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_SyR2wFPhEeubALGSMZ7-4Q" type="4001" element="_SyG3plPhEeubALGSMZ7-4Q" source="_0YHaYFPgEeubALGSMZ7-4Q" target="_xOORQFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_SyR2xFPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyR2xVPhEeubALGSMZ7-4Q" y="-10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_SyR2xlPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyR2x1PhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_SySd0FPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SySd0VPhEeubALGSMZ7-4Q" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_SyR2wVPhEeubALGSMZ7-4Q" routing="Tree"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_SyR2wlPhEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SyR2w1PhEeubALGSMZ7-4Q" points="[0, 0, 116, 33]$[-116, -33, 0, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SySd0lPhEeubALGSMZ7-4Q" id="(0.5,0.0)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SySd01PhEeubALGSMZ7-4Q" id="(0.5,0.5)"/>

-        </edges>

-        <edges xmi:type="notation:Connector" xmi:id="_YJ7Q4FPhEeubALGSMZ7-4Q" type="NoteAttachment" source="_pFDxwFPgEeubALGSMZ7-4Q" target="_TprY0FPhEeubALGSMZ7-4Q" lineWidth="1">

-          <styles xmi:type="notation:ArrowStyle" xmi:id="_YJ7Q4VPhEeubALGSMZ7-4Q"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_YJ7Q4lPhEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YJ7Q41PhEeubALGSMZ7-4Q" points="[0, 0, -40, 59]$[39, -58, -1, 1]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YJ-7QFPhEeubALGSMZ7-4Q" id="(0.9053254437869822,0.0)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_YJ-7QVPhEeubALGSMZ7-4Q" id="(0.422360248447205,0.9864864864864865)"/>

-        </edges>

-        <edges xmi:type="notation:Connector" xmi:id="_ruhR4FPhEeubALGSMZ7-4Q" type="NoteAttachment" source="_eFrdoFPhEeubALGSMZ7-4Q" target="_TwdLsFPgEeubALGSMZ7-4Q" lineWidth="1">

-          <styles xmi:type="notation:ArrowStyle" xmi:id="_ruhR4VPhEeubALGSMZ7-4Q"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_ruhR4lPhEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_ruhR41PhEeubALGSMZ7-4Q" points="[-1, -1, 3, 42]$[-4, -36, 0, 7]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ruk8QFPhEeubALGSMZ7-4Q" id="(0.03225806451612903,0.010309278350515464)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_ruk8QVPhEeubALGSMZ7-4Q" id="(0.013824884792626729,0.9294117647058824)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_sxyFsFPhEeubALGSMZ7-4Q" type="4001" element="_sxnGkFPhEeubALGSMZ7-4Q" source="_xOORQFPgEeubALGSMZ7-4Q" target="_pFDxwFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_sxyswFPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sxyswVPhEeubALGSMZ7-4Q" x="37" y="-18"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_sxyswlPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sxysw1PhEeubALGSMZ7-4Q" x="209" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_sxysxFPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_sxysxVPhEeubALGSMZ7-4Q" x="-82" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_sxyFsVPhEeubALGSMZ7-4Q" routing="Rectilinear"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_sxyFslPhEeubALGSMZ7-4Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_sxyFs1PhEeubALGSMZ7-4Q" points="[36, -12, 446, -2]$[36, -58, 446, -48]$[-386, -58, 24, -48]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sxzT0FPhEeubALGSMZ7-4Q" id="(0.0,0.3076923076923077)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_sxzT0VPhEeubALGSMZ7-4Q" id="(0.8579881656804734,0.631578947368421)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_wBUj0FPhEeubALGSMZ7-4Q" type="4001" element="_wBI9plPhEeubALGSMZ7-4Q" source="_pFDxwFPgEeubALGSMZ7-4Q" target="_xOORQFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_wBVK4FPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wBVK4VPhEeubALGSMZ7-4Q" x="60" y="-10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_wBVK4lPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wBVK41PhEeubALGSMZ7-4Q" x="85" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_wBVK5FPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_wBVK5VPhEeubALGSMZ7-4Q" x="-1" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_wBUj0VPhEeubALGSMZ7-4Q" routing="Rectilinear"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_wBUj0lPhEeubALGSMZ7-4Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wBUj01PhEeubALGSMZ7-4Q" points="[24, -12, -482, -70]$[506, -12, 0, -70]$[506, 58, 0, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wBVx8FPhEeubALGSMZ7-4Q" id="(0.8579881656804734,0.18045112781954886)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wBVx8VPhEeubALGSMZ7-4Q" id="(0.8135593220338984,0.0)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_y3Xj4FPhEeubALGSMZ7-4Q" type="4001" element="_y3BloFPhEeubALGSMZ7-4Q" source="_6Kj6IFPgEeubALGSMZ7-4Q" target="_pFDxwFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_y3YK8FPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y3YK8VPhEeubALGSMZ7-4Q" x="35" y="-18"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_y3YK8lPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y3YK81PhEeubALGSMZ7-4Q" x="-21" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_y3YK9FPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y3YK9VPhEeubALGSMZ7-4Q" x="35" y="-10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_y3Xj4VPhEeubALGSMZ7-4Q" routing="Rectilinear"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_y3Xj4lPhEeubALGSMZ7-4Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_y3Xj41PhEeubALGSMZ7-4Q" points="[36, 0, 314, 154]$[36, -144, 314, 10]$[-134, -144, 144, 10]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y3YyAFPhEeubALGSMZ7-4Q" id="(0.12371134020618557,0.0)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_y3YyAVPhEeubALGSMZ7-4Q" id="(0.14792899408284024,0.6466165413533834)"/>

-        </edges>

-        <edges xmi:type="notation:Connector" xmi:id="_7RYi0FPhEeubALGSMZ7-4Q" type="NoteAttachment" source="_2t_QIFPhEeubALGSMZ7-4Q" target="_y3Xj4FPhEeubALGSMZ7-4Q" lineWidth="1">

-          <styles xmi:type="notation:ArrowStyle" xmi:id="_7RYi0VPhEeubALGSMZ7-4Q"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_7RYi0lPhEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_7RYi01PhEeubALGSMZ7-4Q" points="[-37, -28, 208, 162]$[-127, -98, 118, 92]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Ra_EFPhEeubALGSMZ7-4Q" id="(0.09734513274336283,0.045871559633027525)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_7Ra_EVPhEeubALGSMZ7-4Q" id="(0.42924528301886794,0.20218579234972678)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_9bPLQFPhEeubALGSMZ7-4Q" type="4001" element="_9bC-DFPhEeubALGSMZ7-4Q" source="_OtOiYFPgEeubALGSMZ7-4Q" target="_pFDxwFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_9bPLRFPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9bPLRVPhEeubALGSMZ7-4Q" x="-1" y="-42"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_9bPyUFPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9bPyUVPhEeubALGSMZ7-4Q" x="33"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_9bPyUlPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9bPyU1PhEeubALGSMZ7-4Q" x="2"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_9bPLQVPhEeubALGSMZ7-4Q" routing="Rectilinear"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_9bPLQlPhEeubALGSMZ7-4Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_9bPLQ1PhEeubALGSMZ7-4Q" points="[-23, 0, -2, -59]$[-23, 59, -2, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bPyVFPhEeubALGSMZ7-4Q" id="(0.7452229299363057,1.0)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_9bPyVVPhEeubALGSMZ7-4Q" id="(0.21301775147928995,0.0)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_-pzQIFPhEeubALGSMZ7-4Q" type="4001" element="_-poRDFPhEeubALGSMZ7-4Q" source="_OtOiYFPgEeubALGSMZ7-4Q" target="_TwdLsFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_-pz3MFPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-pz3MVPhEeubALGSMZ7-4Q" x="-72" y="11"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_-pz3MlPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-pz3M1PhEeubALGSMZ7-4Q" x="-6" y="8"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_-pz3NFPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_-pz3NVPhEeubALGSMZ7-4Q" x="-96" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_-pzQIVPhEeubALGSMZ7-4Q" routing="Rectilinear"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_-pzQIlPhEeubALGSMZ7-4Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_-pzQI1PhEeubALGSMZ7-4Q" points="[0, 0, 84, -179]$[0, 29, 84, -150]$[-123, 29, -39, -150]$[-123, 179, -39, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-pz3NlPhEeubALGSMZ7-4Q" id="(0.22929936305732485,1.0)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_-pz3N1PhEeubALGSMZ7-4Q" id="(0.7188940092165899,0.0)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="__oNZIFPhEeubALGSMZ7-4Q" type="4001" element="__n_9wFPhEeubALGSMZ7-4Q" source="_TwdLsFPgEeubALGSMZ7-4Q" target="_TwdLsFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="__oOAMFPhEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__oOAMVPhEeubALGSMZ7-4Q" x="5" y="-18"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="__oOAMlPhEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__oOAM1PhEeubALGSMZ7-4Q" x="20"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="__oOANFPhEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="__oOANVPhEeubALGSMZ7-4Q" x="-11"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="__oNZIVPhEeubALGSMZ7-4Q" routing="Rectilinear"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="__oNZIlPhEeubALGSMZ7-4Q" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__oNZI1PhEeubALGSMZ7-4Q" points="[-205, -84, 12, -84]$[-205, -120, 12, -120]$[-159, -120, 58, -120]$[-159, -84, 58, -84]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__oOANlPhEeubALGSMZ7-4Q" id="(1.0,0.865979381443299)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__oOAN1PhEeubALGSMZ7-4Q" id="(0.0,0.865979381443299)"/>

-        </edges>

-        <edges xmi:type="notation:Connector" xmi:id="_Geab8FPiEeubALGSMZ7-4Q" type="NoteAttachment" source="_DfudQFPiEeubALGSMZ7-4Q" target="__oNZIFPhEeubALGSMZ7-4Q" lineWidth="1">

-          <styles xmi:type="notation:ArrowStyle" xmi:id="_Geab8VPiEeubALGSMZ7-4Q"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_Geab8lPiEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Geab81PiEeubALGSMZ7-4Q" points="[-10, 49, 17, -86]$[-20, 100, 7, -35]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GecRIFPiEeubALGSMZ7-4Q" id="(0.9558823529411765,0.12121212121212122)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_GecRIVPiEeubALGSMZ7-4Q" id="(0.8373493975903614,0.6111111111111112)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_HiRssFPiEeubALGSMZ7-4Q" type="4001" element="_HiHUoFPiEeubALGSMZ7-4Q" source="_TwdLsFPgEeubALGSMZ7-4Q" target="_pFDxwFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_HiSTwFPiEeubALGSMZ7-4Q" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HiSTwVPiEeubALGSMZ7-4Q" x="-22" y="76"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_HiSTwlPiEeubALGSMZ7-4Q" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HiSTw1PiEeubALGSMZ7-4Q" x="-14" y="50"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_HiSTxFPiEeubALGSMZ7-4Q" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HiSTxVPiEeubALGSMZ7-4Q" y="-18"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_HiRssVPiEeubALGSMZ7-4Q" routing="Rectilinear"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_HiRsslPiEeubALGSMZ7-4Q" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HiRss1PiEeubALGSMZ7-4Q" points="[-73, -24, -120, 96]$[-73, -120, -120, 0]$[47, -120, 0, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HiSTxlPiEeubALGSMZ7-4Q" id="(1.0,0.24742268041237114)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HiSTx1PiEeubALGSMZ7-4Q" id="(0.0,0.18045112781954886)"/>

-        </edges>

-        <edges xmi:type="notation:Connector" xmi:id="_I0tIcFPjEeubALGSMZ7-4Q" type="NoteAttachment" source="_EVHXsFPjEeubALGSMZ7-4Q" target="_pFDxwFPgEeubALGSMZ7-4Q" lineWidth="1">

-          <styles xmi:type="notation:ArrowStyle" xmi:id="_I0tIcVPjEeubALGSMZ7-4Q"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_I0tIclPjEeubALGSMZ7-4Q"/>

-          <element xsi:nil="true"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_I0tIc1PjEeubALGSMZ7-4Q" points="[-2, -2, 107, 169]$[-109, -170, 0, 1]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I0xZ4FPjEeubALGSMZ7-4Q" id="(0.15544041450777202,0.0392156862745098)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_I0xZ4VPjEeubALGSMZ7-4Q" id="(0.09655172413793103,0.993103448275862)"/>

-        </edges>

-        <edges xmi:type="notation:Connector" xmi:id="_1iEcoFT_Eeu7HeDiE6WqMg" type="NoteAttachment" source="_BIq7wFPhEeubALGSMZ7-4Q" target="_pgXlUFT_Eeu7HeDiE6WqMg" lineWidth="1">

-          <styles xmi:type="notation:ArrowStyle" xmi:id="_1iEcoVT_Eeu7HeDiE6WqMg"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_1iEcolT_Eeu7HeDiE6WqMg"/>

-          <element xsi:nil="true"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1iEco1T_Eeu7HeDiE6WqMg" points="[1, 23, -4, -92]$[3, 90, -2, -25]"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_1iKjQFT_Eeu7HeDiE6WqMg" id="(0.8899082568807339,0.32894736842105265)"/>

-        </edges>

-        <edges xmi:type="notation:Connector" xmi:id="_92jbUFT_Eeu7HeDiE6WqMg" type="NoteAttachment" source="_4YZwkFT_Eeu7HeDiE6WqMg" target="_F-iegFPhEeubALGSMZ7-4Q" lineWidth="1">

-          <styles xmi:type="notation:ArrowStyle" xmi:id="_92kCYFT_Eeu7HeDiE6WqMg"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_92kCYVT_Eeu7HeDiE6WqMg"/>

-          <element xsi:nil="true"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_92kCYlT_Eeu7HeDiE6WqMg" points="[0, -4, -3, 78]$[2, -78, -1, 4]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_92nFsFT_Eeu7HeDiE6WqMg" id="(0.8486238532110092,0.05263157894736842)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_92nFsVT_Eeu7HeDiE6WqMg" id="(0.8620689655172413,0.8974358974358975)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_w4VmgFUBEeu7HeDiE6WqMg" type="4001" element="_w4APXFUBEeu7HeDiE6WqMg" source="_Z1wbsFUBEeu7HeDiE6WqMg" target="_pFDxwFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_w4Yp0FUBEeu7HeDiE6WqMg" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4Yp0VUBEeu7HeDiE6WqMg" y="-10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_w4ZQ4FUBEeu7HeDiE6WqMg" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4ZQ4VUBEeu7HeDiE6WqMg" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_w4afAFUBEeu7HeDiE6WqMg" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_w4afAVUBEeu7HeDiE6WqMg" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_w4VmgVUBEeu7HeDiE6WqMg" routing="Tree"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_w4VmglUBEeu7HeDiE6WqMg" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_w4Vmg1UBEeu7HeDiE6WqMg" points="[0, 0, 68, 134]$[0, -63, 68, 71]$[-67, -63, 1, 71]$[-67, -81, 1, 53]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w4diUFUBEeu7HeDiE6WqMg" id="(0.32941176470588235,0.05128205128205128)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_w4diUVUBEeu7HeDiE6WqMg" id="(0.5,0.5150375939849624)"/>

-        </edges>

-        <edges xmi:type="notation:Edge" xmi:id="_xShBEFUBEeu7HeDiE6WqMg" type="4001" element="_xSRwhlUBEeu7HeDiE6WqMg" source="_a0_rIFUBEeu7HeDiE6WqMg" target="_pFDxwFPgEeubALGSMZ7-4Q">

-          <children xmi:type="notation:Node" xmi:id="_xShBFFUBEeu7HeDiE6WqMg" type="6001">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xShBFVUBEeu7HeDiE6WqMg" y="-10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_xShoIFUBEeu7HeDiE6WqMg" type="6002">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xShoIVUBEeu7HeDiE6WqMg" y="10"/>

-          </children>

-          <children xmi:type="notation:Node" xmi:id="_xShoIlUBEeu7HeDiE6WqMg" type="6003">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xShoI1UBEeu7HeDiE6WqMg" y="10"/>

-          </children>

-          <styles xmi:type="notation:ConnectorStyle" xmi:id="_xShBEVUBEeu7HeDiE6WqMg" routing="Tree"/>

-          <styles xmi:type="notation:FontStyle" xmi:id="_xShBElUBEeu7HeDiE6WqMg" fontName="Segoe UI" fontHeight="8"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_xShBE1UBEeu7HeDiE6WqMg" points="[0, 0, 23, 55]$[-23, -55, 0, 0]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_gnWZYFUDEeu7HeDiE6WqMg" id="(0.5,0.5)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_xSiPMVUBEeu7HeDiE6WqMg" id="(0.8579881656804734,0.631578947368421)"/>

-        </edges>

-        <edges xmi:type="notation:Connector" xmi:id="_fmOTkFUDEeu7HeDiE6WqMg" type="NoteAttachment" source="_ZlSboFPhEeubALGSMZ7-4Q" target="_OtOiYFPgEeubALGSMZ7-4Q" lineWidth="1">

-          <styles xmi:type="notation:ArrowStyle" xmi:id="_fmOTkVUDEeu7HeDiE6WqMg"/>

-          <styles xmi:type="notation:LineTypeStyle" xmi:id="_fmOTklUDEeu7HeDiE6WqMg"/>

-          <element xsi:nil="true"/>

-          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_fmOTk1UDEeu7HeDiE6WqMg" points="[12, 2, -47, 0]$[55, 1, -4, -1]"/>

-          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fmR98FUDEeu7HeDiE6WqMg" id="(0.9197530864197531,0.49122807017543857)"/>

-          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_fmR98VUDEeu7HeDiE6WqMg" id="(0.027586206896551724,0.410958904109589)"/>

-        </edges>

-      </data>

-    </ownedAnnotationEntries>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_OtFYcFPgEeubALGSMZ7-4Q" name="SimpleScenario" tooltipText="" outgoingEdges="_9bC-DFPhEeubALGSMZ7-4Q _-poRDFPhEeubALGSMZ7-4Q" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//SimpleScenario"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//SimpleScenario"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_A4r2gVV3Eeu8ou9WeNwDEQ" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_P1mfsFPgEeubALGSMZ7-4Q" name="xSize : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//SimpleScenario/xSize"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//SimpleScenario/xSize"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_Qk_VQVPgEeubALGSMZ7-4Q" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_RTc9wFPgEeubALGSMZ7-4Q" name="ySize : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//SimpleScenario/ySize"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//SimpleScenario/ySize"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_SBH8ElPgEeubALGSMZ7-4Q" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="__Wd10FV2Eeu8ou9WeNwDEQ" name="maxTime : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//SimpleScenario/maxTime"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//SimpleScenario/maxTime"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_A4ykMlV3Eeu8ou9WeNwDEQ" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_TwYTMFPgEeubALGSMZ7-4Q" name="Lane" tooltipText="" outgoingEdges="__n_9wFPhEeubALGSMZ7-4Q _HiHUoFPiEeubALGSMZ7-4Q" incomingEdges="_-poRDFPhEeubALGSMZ7-4Q __n_9wFPhEeubALGSMZ7-4Q" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//Lane"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//Lane"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_hzhcI1UEEeu7HeDiE6WqMg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_UiRDIFPgEeubALGSMZ7-4Q" name="orientation : Orientation = Vertical" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Lane/orientation"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Lane/orientation"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_egJDslPvEeuJov5cvS3R2A" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_lWkGwFPgEeubALGSMZ7-4Q" name="width : Size = Small" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Lane/width"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Lane/width"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_JuJUYlUAEeu7HeDiE6WqMg" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_m8aDMFPgEeubALGSMZ7-4Q" name="referenceCoord : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Lane/referenceCoord"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Lane/referenceCoord"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_3aTbMlPvEeuJov5cvS3R2A" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_21oo4FPkEeubALGSMZ7-4Q" name="numWidth : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Lane/numWidth"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Lane/numWidth"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_kHRpAVVoEeu8ou9WeNwDEQ" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_V7s7QFPgEeubALGSMZ7-4Q" name="Orientation" tooltipText="" width="12" height="10">

-      <target xmi:type="ecore:EEnum" href="simpleScenario.ecore#//Orientation"/>

-      <semanticElements xmi:type="ecore:EEnum" href="simpleScenario.ecore#//Orientation"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_V7s7QVPgEeubALGSMZ7-4Q" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_W-OvQFPgEeubALGSMZ7-4Q" name="Vertical" tooltipText="">

-        <target xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Orientation/Vertical"/>

-        <semanticElements xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Orientation/Vertical"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_W-PWUFPgEeubALGSMZ7-4Q" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_XyonsFPgEeubALGSMZ7-4Q" name="Horizontal" tooltipText="">

-        <target xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Orientation/Horizontal"/>

-        <semanticElements xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Orientation/Horizontal"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_XyonsVPgEeubALGSMZ7-4Q" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>

-      </ownedElements>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_a4aF0FPgEeubALGSMZ7-4Q" name="Size" tooltipText="" width="12" height="10">

-      <target xmi:type="ecore:EEnum" href="simpleScenario.ecore#//Size"/>

-      <semanticElements xmi:type="ecore:EEnum" href="simpleScenario.ecore#//Size"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_a4as4FPgEeubALGSMZ7-4Q" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_b7J8QFPgEeubALGSMZ7-4Q" name="Small" tooltipText="">

-        <target xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Size/Small"/>

-        <semanticElements xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Size/Small"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_b7J8QVPgEeubALGSMZ7-4Q" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_cqYZwFPgEeubALGSMZ7-4Q" name="Medium" tooltipText="">

-        <target xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Size/Medium"/>

-        <semanticElements xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Size/Medium"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_cqZA0FPgEeubALGSMZ7-4Q" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_daSzwFPgEeubALGSMZ7-4Q" name="Large" tooltipText="">

-        <target xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Size/Large"/>

-        <semanticElements xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Size/Large"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_daSzwVPgEeubALGSMZ7-4Q" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>

-      </ownedElements>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_pE1IQFPgEeubALGSMZ7-4Q" name="Actor" tooltipText="" outgoingEdges="_wBI9plPhEeubALGSMZ7-4Q" incomingEdges="_sxnGkFPhEeubALGSMZ7-4Q _y3BloFPhEeubALGSMZ7-4Q _9bC-DFPhEeubALGSMZ7-4Q _HiHUoFPiEeubALGSMZ7-4Q _w4APXFUBEeu7HeDiE6WqMg _xSRwhlUBEeu7HeDiE6WqMg" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//Actor"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//Actor"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_msfnsVV8Eeu8ou9WeNwDEQ" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

-        <labelFormat>italic</labelFormat>

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_rcWZQFPgEeubALGSMZ7-4Q" name="xPos : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/xPos"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/xPos"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_xu8a4VPvEeuJov5cvS3R2A" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_tUgNsFPgEeubALGSMZ7-4Q" name="yPos : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/yPos"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/yPos"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_yT2ewVPvEeuJov5cvS3R2A" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_9CuvMFPiEeubALGSMZ7-4Q" name="/length : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/length"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/length"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_fJ7rFFUBEeu7HeDiE6WqMg" labelColor="39,76,114" labelAlignment="LEFT" description="_hK9ZklT_Eeu7HeDiE6WqMg">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_BPXHsFPjEeubALGSMZ7-4Q" name="/width : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/width"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/width"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_fsK1c1UBEeu7HeDiE6WqMg" labelColor="39,76,114" labelAlignment="LEFT" description="_hK9ZklT_Eeu7HeDiE6WqMg">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_qJVSMFPgEeubALGSMZ7-4Q" name="xSpeed : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/xSpeed"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/xSpeed"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_1QnNYlRIEeu7HeDiE6WqMg" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_lbCm4FV8Eeu8ou9WeNwDEQ" name="ySpeed : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/ySpeed"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//Actor/ySpeed"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_re1VUlV8Eeu8ou9WeNwDEQ" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_xN7WUFPgEeubALGSMZ7-4Q" name="Relation" tooltipText="" outgoingEdges="_sxnGkFPhEeubALGSMZ7-4Q" incomingEdges="_SJlfFlPhEeubALGSMZ7-4Q _SyG3plPhEeubALGSMZ7-4Q _wBI9plPhEeubALGSMZ7-4Q" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//Relation"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//Relation"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_5kxFcFPgEeubALGSMZ7-4Q" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

-        <labelFormat>italic</labelFormat>

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_ynvB4FPgEeubALGSMZ7-4Q" name="SpatialRelation" tooltipText="" outgoingEdges="_SJlfFlPhEeubALGSMZ7-4Q" incomingEdges="_RI43FlPhEeubALGSMZ7-4Q _Rq5_BlPhEeubALGSMZ7-4Q" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//SpatialRelation"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//SpatialRelation"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_5G_kUVPgEeubALGSMZ7-4Q" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

-        <labelFormat>italic</labelFormat>

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_0X27sFPgEeubALGSMZ7-4Q" name="TemporalRelation" tooltipText="" outgoingEdges="_SyG3plPhEeubALGSMZ7-4Q" incomingEdges="_QQgdkFPhEeubALGSMZ7-4Q _Qsen4FPhEeubALGSMZ7-4Q" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//TemporalRelation"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//TemporalRelation"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_4rJ85FPgEeubALGSMZ7-4Q" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

-        <labelFormat>italic</labelFormat>

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_6KUpkFPgEeubALGSMZ7-4Q" name="VisionBlocked" tooltipText="" outgoingEdges="_Rq5_BlPhEeubALGSMZ7-4Q _y3BloFPhEeubALGSMZ7-4Q" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//VisionBlocked"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//VisionBlocked"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_6KVQoFPgEeubALGSMZ7-4Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_9K6swFPgEeubALGSMZ7-4Q" name="SeparationDistance" tooltipText="" outgoingEdges="_RI43FlPhEeubALGSMZ7-4Q" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//SeparationDistance"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//SeparationDistance"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_WPtXiFUAEeu7HeDiE6WqMg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_-gIMMFPgEeubALGSMZ7-4Q" name="distance : Distance = Near" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//SeparationDistance/distance"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//SeparationDistance/distance"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_H21NcVUAEeu7HeDiE6WqMg" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_BIO24FPhEeubALGSMZ7-4Q" name="CollisionExists" tooltipText="" outgoingEdges="_Qsen4FPhEeubALGSMZ7-4Q" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//CollisionExists"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//CollisionExists"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_DAcVtVPhEeubALGSMZ7-4Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_CGTosFPhEeubALGSMZ7-4Q" name="collisionTime : EDouble = 0.0" tooltipText="">

-        <target xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//CollisionExists/collisionTime"/>

-        <semanticElements xmi:type="ecore:EAttribute" href="simpleScenario.ecore#//CollisionExists/collisionTime"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_1jkjEVPvEeuJov5cvS3R2A" labelAlignment="LEFT" description="_egJDsFPvEeuJov5cvS3R2A">

-          <labelFormat>bold</labelFormat>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@subNodeMappings[name='EC%20EAttribute']"/>

-      </ownedElements>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_F-VqMFPhEeubALGSMZ7-4Q" name="CollisionDoesNotExist" tooltipText="" outgoingEdges="_QQgdkFPhEeubALGSMZ7-4Q" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//CollisionDoesNotExist"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//CollisionDoesNotExist"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_F-WRQFPhEeubALGSMZ7-4Q" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_QQgdkFPhEeubALGSMZ7-4Q" sourceNode="_F-VqMFPhEeubALGSMZ7-4Q" targetNode="_0X27sFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//CollisionDoesNotExist"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//CollisionDoesNotExist"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_QQhEoFPhEeubALGSMZ7-4Q" targetArrow="InputClosedArrow" routingStyle="tree">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_QQhEoVPhEeubALGSMZ7-4Q" showIcon="false">

-          <labelFormat>italic</labelFormat>

-        </beginLabelStyle>

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_QQhEolPhEeubALGSMZ7-4Q" showIcon="false"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Qsen4FPhEeubALGSMZ7-4Q" sourceNode="_BIO24FPhEeubALGSMZ7-4Q" targetNode="_0X27sFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//CollisionExists"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//CollisionExists"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Qsen4VPhEeubALGSMZ7-4Q" targetArrow="InputClosedArrow" routingStyle="tree">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Qsen4lPhEeubALGSMZ7-4Q" showIcon="false">

-          <labelFormat>italic</labelFormat>

-        </beginLabelStyle>

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Qsen41PhEeubALGSMZ7-4Q" showIcon="false"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_RI43FlPhEeubALGSMZ7-4Q" sourceNode="_9K6swFPgEeubALGSMZ7-4Q" targetNode="_ynvB4FPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//SeparationDistance"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//SeparationDistance"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_WPy3IlUAEeu7HeDiE6WqMg" targetArrow="InputClosedArrow" routingStyle="tree">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_WPy3I1UAEeu7HeDiE6WqMg" showIcon="false">

-          <labelFormat>italic</labelFormat>

-        </beginLabelStyle>

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_WPy3JFUAEeu7HeDiE6WqMg" showIcon="false"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_Rq5_BlPhEeubALGSMZ7-4Q" sourceNode="_6KUpkFPgEeubALGSMZ7-4Q" targetNode="_ynvB4FPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//VisionBlocked"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//VisionBlocked"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_Rq5_B1PhEeubALGSMZ7-4Q" targetArrow="InputClosedArrow" routingStyle="tree">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_Rq5_CFPhEeubALGSMZ7-4Q" showIcon="false">

-          <labelFormat>italic</labelFormat>

-        </beginLabelStyle>

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_Rq5_CVPhEeubALGSMZ7-4Q" showIcon="false"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_SJlfFlPhEeubALGSMZ7-4Q" sourceNode="_ynvB4FPgEeubALGSMZ7-4Q" targetNode="_xN7WUFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//SpatialRelation"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//SpatialRelation"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_SJlfF1PhEeubALGSMZ7-4Q" targetArrow="InputClosedArrow" routingStyle="tree">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_SJlfGFPhEeubALGSMZ7-4Q" showIcon="false">

-          <labelFormat>italic</labelFormat>

-        </beginLabelStyle>

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_SJlfGVPhEeubALGSMZ7-4Q" showIcon="false"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_SyG3plPhEeubALGSMZ7-4Q" sourceNode="_0X27sFPgEeubALGSMZ7-4Q" targetNode="_xN7WUFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//TemporalRelation"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//TemporalRelation"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_SyHesFPhEeubALGSMZ7-4Q" targetArrow="InputClosedArrow" routingStyle="tree">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_SyHesVPhEeubALGSMZ7-4Q" showIcon="false">

-          <labelFormat>italic</labelFormat>

-        </beginLabelStyle>

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_SyHeslPhEeubALGSMZ7-4Q" showIcon="false"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_sxnGkFPhEeubALGSMZ7-4Q" name="[1..1] target" sourceNode="_xN7WUFPgEeubALGSMZ7-4Q" targetNode="_pE1IQFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EReference" href="simpleScenario.ecore#//Relation/target"/>

-      <semanticElements xmi:type="ecore:EReference" href="simpleScenario.ecore#//Relation/target"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_uRTXs1PhEeubALGSMZ7-4Q" description="_uRTXsFPhEeubALGSMZ7-4Q" routingStyle="manhattan" strokeColor="0,0,0">

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_uRTXtVPhEeubALGSMZ7-4Q" showIcon="false">

-          <labelFormat>bold</labelFormat>

-        </centerLabelStyle>

-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_uRTXtFPhEeubALGSMZ7-4Q" labelSize="6" showIcon="false" labelColor="39,76,114"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_wBI9plPhEeubALGSMZ7-4Q" name="[0..*] relations" sourceNode="_pE1IQFPgEeubALGSMZ7-4Q" targetNode="_xN7WUFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EReference" href="simpleScenario.ecore#//Actor/relations"/>

-      <semanticElements xmi:type="ecore:EReference" href="simpleScenario.ecore#//Actor/relations"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_8aff81PhEeubALGSMZ7-4Q" description="_8aff8FPhEeubALGSMZ7-4Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_8aff9VPhEeubALGSMZ7-4Q" showIcon="false"/>

-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_8aff9FPhEeubALGSMZ7-4Q" labelSize="6" showIcon="false" labelColor="39,76,114"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_y3BloFPhEeubALGSMZ7-4Q" name="[1..1] blockedBy" sourceNode="_6KUpkFPgEeubALGSMZ7-4Q" targetNode="_pE1IQFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EReference" href="simpleScenario.ecore#//VisionBlocked/blockedBy"/>

-      <semanticElements xmi:type="ecore:EReference" href="simpleScenario.ecore#//VisionBlocked/blockedBy"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_k89qI1WEEeu8ou9WeNwDEQ" description="_uRTXsFPhEeubALGSMZ7-4Q" routingStyle="manhattan" strokeColor="0,0,0">

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_k89qJVWEEeu8ou9WeNwDEQ" showIcon="false">

-          <labelFormat>bold</labelFormat>

-        </centerLabelStyle>

-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_k89qJFWEEeu8ou9WeNwDEQ" labelSize="6" showIcon="false" labelColor="39,76,114"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_9bC-DFPhEeubALGSMZ7-4Q" name="[0..*] actors" sourceNode="_OtFYcFPgEeubALGSMZ7-4Q" targetNode="_pE1IQFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EReference" href="simpleScenario.ecore#//SimpleScenario/actors"/>

-      <semanticElements xmi:type="ecore:EReference" href="simpleScenario.ecore#//SimpleScenario/actors"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_9bDlEFPhEeubALGSMZ7-4Q" description="_8aff8FPhEeubALGSMZ7-4Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_9bDlElPhEeubALGSMZ7-4Q" showIcon="false">

-          <customFeatures>labelSize</customFeatures>

-        </centerLabelStyle>

-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_9bDlEVPhEeubALGSMZ7-4Q" showIcon="false" labelColor="39,76,114">

-          <customFeatures>labelSize</customFeatures>

-        </endLabelStyle>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_-poRDFPhEeubALGSMZ7-4Q" name="[0..*] lanes" sourceNode="_OtFYcFPgEeubALGSMZ7-4Q" targetNode="_TwYTMFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EReference" href="simpleScenario.ecore#//SimpleScenario/lanes"/>

-      <semanticElements xmi:type="ecore:EReference" href="simpleScenario.ecore#//SimpleScenario/lanes"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_-po4EFPhEeubALGSMZ7-4Q" description="_8aff8FPhEeubALGSMZ7-4Q" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_-po4ElPhEeubALGSMZ7-4Q" showIcon="false">

-          <customFeatures>labelSize</customFeatures>

-        </centerLabelStyle>

-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_-po4EVPhEeubALGSMZ7-4Q" showIcon="false" labelColor="39,76,114">

-          <customFeatures>labelSize</customFeatures>

-        </endLabelStyle>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="__n_9wFPhEeubALGSMZ7-4Q" name="[0..1] prevLane" sourceNode="_TwYTMFPgEeubALGSMZ7-4Q" targetNode="_TwYTMFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EReference" href="simpleScenario.ecore#//Lane/prevLane"/>

-      <semanticElements xmi:type="ecore:EReference" href="simpleScenario.ecore#//Lane/prevLane"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="__n_9wVPhEeubALGSMZ7-4Q" routingStyle="manhattan" strokeColor="0,0,0">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']/@style"/>

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="__n_9w1PhEeubALGSMZ7-4Q" showIcon="false">

-          <customFeatures>labelSize</customFeatures>

-        </centerLabelStyle>

-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="__n_9wlPhEeubALGSMZ7-4Q" showIcon="false" labelColor="39,76,114">

-          <customFeatures>labelSize</customFeatures>

-        </endLabelStyle>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_HiHUoFPiEeubALGSMZ7-4Q" sourceNode="_TwYTMFPgEeubALGSMZ7-4Q" targetNode="_pE1IQFPgEeubALGSMZ7-4Q" beginLabel="[1..1] placedOn" endLabel="[0..*] actors">

-      <target xmi:type="ecore:EReference" href="simpleScenario.ecore#//Lane/actors"/>

-      <semanticElements xmi:type="ecore:EReference" href="simpleScenario.ecore#//Lane/actors"/>

-      <semanticElements xmi:type="ecore:EReference" href="simpleScenario.ecore#//Actor/placedOn"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_HiHUoVPiEeubALGSMZ7-4Q" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>

-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_HiHUolPiEeubALGSMZ7-4Q" showIcon="false"/>

-        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_HiHUo1PiEeubALGSMZ7-4Q" showIcon="false"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Cnc-gFUAEeu7HeDiE6WqMg" name="Distance" tooltipText="" width="12" height="10">

-      <target xmi:type="ecore:EEnum" href="simpleScenario.ecore#//Distance"/>

-      <semanticElements xmi:type="ecore:EEnum" href="simpleScenario.ecore#//Distance"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_CneMoFUAEeu7HeDiE6WqMg" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="221,236,202">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']"/>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_D9F7wFUAEeu7HeDiE6WqMg" name="Near" tooltipText="">

-        <target xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Distance/Near"/>

-        <semanticElements xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Distance/Near"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_D9Gi0FUAEeu7HeDiE6WqMg" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_MUIfMFUAEeu7HeDiE6WqMg" name="Medium" tooltipText="">

-        <target xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Distance/Medium"/>

-        <semanticElements xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Distance/Medium"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_MUJGQFUAEeu7HeDiE6WqMg" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>

-      </ownedElements>

-      <ownedElements xmi:type="diagram:DNodeListElement" uid="_N0KHgFUAEeu7HeDiE6WqMg" name="Far" tooltipText="">

-        <target xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Distance/Far"/>

-        <semanticElements xmi:type="ecore:EEnumLiteral" href="simpleScenario.ecore#//Distance/Far"/>

-        <ownedStyle xmi:type="diagram:BundledImage" uid="_N0KHgVUAEeu7HeDiE6WqMg" labelAlignment="LEFT">

-          <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']/@style"/>

-        </ownedStyle>

-        <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EEnum']/@subNodeMappings[name='EC%20EEnumLiteral']"/>

-      </ownedElements>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_Z1GUYFUBEeu7HeDiE6WqMg" name="Pedestrian" tooltipText="" outgoingEdges="_w4APXFUBEeu7HeDiE6WqMg" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//Pedestrian"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//Pedestrian"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_Z1G7cFUBEeu7HeDiE6WqMg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_a0iYIFUBEeu7HeDiE6WqMg" name="Vehicle" tooltipText="" outgoingEdges="_xSRwhlUBEeu7HeDiE6WqMg" width="12" height="10">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//Vehicle"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//Vehicle"/>

-      <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>

-      <arrangeConstraints>KEEP_SIZE</arrangeConstraints>

-      <arrangeConstraints>KEEP_RATIO</arrangeConstraints>

-      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_a0mCgFUBEeu7HeDiE6WqMg" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

-        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_w4APXFUBEeu7HeDiE6WqMg" sourceNode="_Z1GUYFUBEeu7HeDiE6WqMg" targetNode="_pE1IQFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//Pedestrian"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//Pedestrian"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_w4A2YFUBEeu7HeDiE6WqMg" targetArrow="InputClosedArrow" routingStyle="tree">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_w4A2YVUBEeu7HeDiE6WqMg" showIcon="false">

-          <labelFormat>italic</labelFormat>

-        </beginLabelStyle>

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_w4A2YlUBEeu7HeDiE6WqMg" showIcon="false"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

-    </ownedDiagramElements>

-    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_xSRwhlUBEeu7HeDiE6WqMg" sourceNode="_a0iYIFUBEeu7HeDiE6WqMg" targetNode="_pE1IQFPgEeubALGSMZ7-4Q">

-      <target xmi:type="ecore:EClass" href="simpleScenario.ecore#//Vehicle"/>

-      <semanticElements xmi:type="ecore:EClass" href="simpleScenario.ecore#//Vehicle"/>

-      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_xSRwh1UBEeu7HeDiE6WqMg" targetArrow="InputClosedArrow" routingStyle="tree">

-        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

-        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_xSRwiFUBEeu7HeDiE6WqMg" showIcon="false">

-          <labelFormat>italic</labelFormat>

-        </beginLabelStyle>

-        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_xSRwiVUBEeu7HeDiE6WqMg" showIcon="false"/>

-      </ownedStyle>

-      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

-    </ownedDiagramElements>

-    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>

-    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_X5GI8FPIEeuRNIB-ivzkoA"/>

-    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>

-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>

-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>

-    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>

-    <target xmi:type="ecore:EPackage" href="simpleScenario.ecore#/"/>

-  </diagram:DSemanticDiagram>

-</xmi:XMI>

diff --git a/Domains/simpleScenario/model/simpleScenario.genmodel b/Domains/simpleScenario/model/simpleScenario.genmodel
deleted file mode 100644
index dca1189f..00000000
--- a/Domains/simpleScenario/model/simpleScenario.genmodel
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/simpleScenario/ecore-gen" modelPluginID="simpleScenario"

-    modelName="SimpleScenario" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"

-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="8.0" copyrightFields="false"

-    operationReflection="true" importOrganizing="true">

-  <foreignModel>simpleScenario.ecore</foreignModel>

-  <genPackages prefix="SimpleScenario" disposableProviderFactory="true" ecorePackage="simpleScenario.ecore#/">

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simpleScenario.ecore#//Orientation">

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Orientation/Vertical"/>

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Orientation/Horizontal"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simpleScenario.ecore#//Size">

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Size/Small"/>

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Size/Medium"/>

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Size/Large"/>

-    </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simpleScenario.ecore#//Distance">

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Distance/Near"/>

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Distance/Medium"/>

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Distance/Far"/>

-    </genEnums>

-    <genClasses ecoreClass="simpleScenario.ecore#//SimpleScenario">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//SimpleScenario/xSize"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//SimpleScenario/ySize"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//SimpleScenario/actors"/>

-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//SimpleScenario/lanes"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//SimpleScenario/maxTime"/>

-    </genClasses>

-    <genClasses ecoreClass="simpleScenario.ecore#//Lane">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Lane/orientation"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Lane/width"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Lane/referenceCoord"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//Lane/prevLane"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//Lane/actors"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Lane/numWidth"/>

-    </genClasses>

-    <genClasses ecoreClass="simpleScenario.ecore#//Actor">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Actor/xPos"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Actor/yPos"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Actor/length"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Actor/width"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Actor/xSpeed"/>

-      <genFeatures children="true" createChild="true" propertySortChoices="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//Actor/relations"/>

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//Actor/placedOn"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Actor/ySpeed"/>

-    </genClasses>

-    <genClasses ecoreClass="simpleScenario.ecore#//Relation">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//Relation/target"/>

-    </genClasses>

-    <genClasses ecoreClass="simpleScenario.ecore#//SpatialRelation"/>

-    <genClasses ecoreClass="simpleScenario.ecore#//TemporalRelation"/>

-    <genClasses ecoreClass="simpleScenario.ecore#//VisionBlocked">

-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//VisionBlocked/blockedBy"/>

-    </genClasses>

-    <genClasses ecoreClass="simpleScenario.ecore#//SeparationDistance">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//SeparationDistance/distance"/>

-    </genClasses>

-    <genClasses ecoreClass="simpleScenario.ecore#//CollisionExists">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//CollisionExists/collisionTime"/>

-    </genClasses>

-    <genClasses ecoreClass="simpleScenario.ecore#//CollisionDoesNotExist"/>

-    <genClasses ecoreClass="simpleScenario.ecore#//Pedestrian"/>

-    <genClasses ecoreClass="simpleScenario.ecore#//Vehicle"/>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/Domains/simpleScenario/plugin.xml b/Domains/simpleScenario/plugin.xml
deleted file mode 100644
index cc83fbc6..00000000
--- a/Domains/simpleScenario/plugin.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><?eclipse version="3.0"?><!--
---><plugin>

-  <extension point="org.eclipse.emf.ecore.generated_package">

-    <!-- @generated simpleScenario -->

-    <package class="simpleScenario.SimpleScenarioPackage" genModel="model/simpleScenario.genmodel" uri="http://www.example.com/simpleScenario"/>

-  </extension>

-</plugin>

diff --git a/Domains/simpleScenario/queries/simpleScenarioQueries.vql b/Domains/simpleScenario/queries/simpleScenarioQueries.vql
deleted file mode 100644
index 735abdc5..00000000
--- a/Domains/simpleScenario/queries/simpleScenarioQueries.vql
+++ /dev/null
@@ -1,400 +0,0 @@
-package queries
-
-import "http://www.example.com/simpleScenario"
-import "http://www.eclipse.org/emf/2002/Ecore"
-
-//Minimal Failing Example
-@Constraint(severity = "error", key = {l}, message = "this defines the placedOn relation")
-pattern patterThatOnlyWorksWithInt(l : Lane) {
-        Lane.referenceCoord(l, w);
-        check(w <= 2.0);
-}
-
-//////////////
-//Lane
-//////////////
-
-/////////width, numWidth
-@Constraint(severity="error", key={l}, message="x")
-pattern define_numWidth_small(l : Lane) { 
-        Lane.width(l, Size::Small);
-        Lane.numWidth(l, nw);
-        check(nw <= 5);
-} or {
-        Lane.width(l, Size::Small);
-        Lane.numWidth(l, nw);
-        check(nw >= 10);
-}
-
-@Constraint(severity="error", key={l}, message="x")
-pattern define_numWidth_medium(l : Lane) { 
-        Lane.width(l, Size::Medium);
-        Lane.numWidth(l, nw);
-        check(nw <= 10);
-} or {
-        Lane.width(l, Size::Medium);
-        Lane.numWidth(l, nw);
-        check(nw >= 15);
-}
-
-@Constraint(severity="error", key={l}, message="x")
-pattern define_numWidth_large(l : Lane) { 
-        Lane.width(l, Size::Large);
-        Lane.numWidth(l, nw);
-        check(nw <= 15);
-} or {
-        Lane.width(l, Size::Large);
-        Lane.numWidth(l, nw);
-        check(nw >= 20);
-}
-
-/////////referenceCoord
-@Constraint(severity="error", key={l}, message="x")
-pattern define_referenceCoord_horizontalAtOrigin(l:Lane) {
-        1 == count find find_horizontalLaneAtOrigin(l);
-}
-
-private pattern find_horizontalLaneAtOrigin(l:Lane){
-        Lane.orientation(l, Orientation::Horizontal);
-        Lane.referenceCoord(l, rc);
-        Lane.prevLane(l, prev);
-        rc != 0.0;      
-}
-
-@Constraint(severity="error", key={l}, message="x")
-pattern define_referenceCoord_verticalAtOrigin(l:Lane) {
-        1 == count find find_verticalLaneAtOrigin(l);
-}
-
-private pattern find_verticalLaneAtOrigin(l:Lane){
-        Lane.orientation(l, Orientation::Vertical);
-        Lane.referenceCoord(l, rc);
-        rc == 0.0;      
-}
-
-pattern define_referenceCoord_VerticalifMultipleLanes(l1:Lane, l2:Lane) {
-        //calculated risk???
-        Lane.orientation(l1, Orientation::Vertical);
-        Lane.orientation(l2, Orientation::Vertical);
-        Lane.referenceCoord(l1, rc1);
-        Lane.numWidth(l1, nw1);
-        Lane.referenceCoord(l2, rc2);
-        check(rc2 == rc1 + nw1);
-}
-
-
-//@Constraint(severity = "error", key = {a}, message = "this defines the placedOn relation for vertical lanes")
-//pattern actorOnVerticalLane(a : Actor) {
-//    Actor.placedOn(a, l);
-//    Lane.orientation(l, Orientation::Vertical);
-//    Actor.xPos(a, x);
-//    Lane.referenceCoord(l, r);
-//    check(x <= r);
-//} or {
-//    Actor.placedOn(a, l);
-//    Lane.orientation(l, Orientation::Vertical);
-//    Actor.xPos(a, x);
-//    Lane.referenceCoord(l, r);
-//    Lane.numWidth(l, w);
-//    check(x >= (r + w));
-//}
-//
-//@Constraint(severity = "error", key = {a}, message = "this defines the placedOn relation for horizontal lanes")
-//pattern actorOnHorizontalLane(a : Actor) {
-//    Actor.placedOn(a, l);
-//    Lane.orientation(l, Orientation::Horizontal);
-//    Actor.yPos(a, y);
-//    Lane.referenceCoord(l, r);
-//    check(y <= r);
-//} or {
-//    Actor.placedOn(a, l);
-//    Lane.orientation(l, Orientation::Horizontal);
-//    Actor.yPos(a, y);
-//    Lane.referenceCoord(l, r);
-//    Lane.numWidth(l, w);
-//    check(y >= (r + w));
-//}
-
-//@Constraint(severity = "error", key = {a}, message = "this defines the placedOn relation")
-//pattern actorOnLane(a : Actor) {
-//      find actorOnVerticalLane(a);
-////    neg find actorOnHorizontalLane(a);
-//}
-//
-//private pattern actorOnVerticalLane(a : Actor) {
-//    Actor.placedOn(a, l);
-//    Lane.orientation(l, Orientation::Vertical);
-//    Actor.xPos(a, x);
-//    Lane.referenceCoord(l, r);
-//    Lane.numWidth(l, w);
-//    check(x >= r);
-//    check(x <= (r + w));
-//}
-
-//@Constraint(severity = "error", key = {l}, message = "this defines the placedOn relation")
-//pattern widthSpec(l : Lane) {
-//      Lane.numWidth(l, w);
-//      check(w != 5);
-//}
-
-//private pattern actorOnHorizontalLane(a : Actor) {
-//    Actor.placedOn(a, l);
-//    Lane.orientation(l, Orientation::Vertical);
-//    Actor.yPos(a, y);
-//    Lane.referenceCoord(l, r);
-//    Lane.widthNum(l, w);
-//    check(y >= r);
-//    check(y <= (r + w));
-//}
-
-//////////////
-//CollisionExists
-//////////////
-
-@Constraint(severity="error", key={c}, message="x")
-pattern collisionExists_timeWithinBound(ss:SimpleScenario, c:CollisionExists) {
-        SimpleScenario.actors.relations(ss, c);
-        SimpleScenario.maxTime(ss, maxTime);
-        CollisionExists. collisionTime(c, cTime);
-        check(cTime >= maxTime);}
-
-@Constraint(severity="error", key={c}, message="x")
-pattern collisionExists_timeNotNegative(c:CollisionExists) {
-        CollisionExists. collisionTime(c, cTime);
-        check(cTime <= 0);}
-
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern collisionExists_defineCollision_y1(a1:Actor, a2:Actor, c:CollisionExists) {
-        Actor.relations(a1, c);
-        CollisionExists.target(c, a2);
-        
-        Actor.length(a1, l1);
-        Actor.yPos(a1, yPos1);
-        Actor.ySpeed(a1, ySpeed1);
-        Actor.length(a2, l2);
-        Actor.yPos(a2, yPos2);
-        Actor.ySpeed(a2, ySpeed2);
-        CollisionExists. collisionTime(c, cTime);
-        //check(y_1_bottom > y_2_top
-        check((yPos1 + (ySpeed1 * cTime)) - (l1/2) > (yPos2 + (ySpeed2 * cTime)) + (l2/2));     
-}
-
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern collisionExists_defineCollision_y2(a1:Actor, a2:Actor, c:CollisionExists) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        Actor.relations(a1, c);
-        CollisionExists.target(c, a2);
-        
-        Actor.length(a1, l1);
-        Actor.yPos(a1, yPos1);
-        Actor.ySpeed(a1, ySpeed1);
-        Actor.length(a2, l2);
-        Actor.yPos(a2, yPos2);
-        Actor.ySpeed(a2, ySpeed2);
-        CollisionExists. collisionTime(c, cTime);
-        //check(y_1_top < y_2_bottom)
-        check((yPos1 + (ySpeed1 * cTime)) + (l1/2) < (yPos2 + (ySpeed2 * cTime)) - (l2/2));     
-}
-
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern collisionExists_defineCollision_x1(a1:Actor, a2:Actor, c:CollisionExists) {
-        Actor.relations(a1, c);
-        CollisionExists.target(c, a2);
-        
-        Actor.width(a1, w1);
-        Actor.xPos(a1, xPos1);
-        Actor.xSpeed(a1, xSpeed1);
-        Actor.width(a2, w2);
-        Actor.xPos(a2, xPos2);
-        Actor.xSpeed(a2, xSpeed2);
-        CollisionExists. collisionTime(c, cTime);
-        //check(x_1_left > x_2_right)
-        check((xPos1 + (xSpeed1 * cTime)) - (w1/2) > (xPos2 + (xSpeed2 * cTime)) + (w2/2));     
-}
-
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern collisionExists_defineCollision_x2(a1:Actor, a2:Actor, c:CollisionExists) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        Actor.relations(a1, c);
-        CollisionExists.target(c, a2);
-        
-        Actor.width(a1, w1);
-        Actor.xPos(a1, xPos1);
-        Actor.xSpeed(a1, xSpeed1);
-        Actor.width(a2, w2);
-        Actor.xPos(a2, xPos2);
-        Actor.xSpeed(a2, xSpeed2);
-        CollisionExists. collisionTime(c, cTime);
-        //check(x_1_right < x_2_left)
-        check((xPos1 + (xSpeed1 * cTime)) + (w1/2) < (xPos2 + (xSpeed2 * cTime)) - (w2/2));     
-}
-
-//////////////
-//SeparationDistance
-//////////////
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern SeparationDistance_near_lb(a1:Actor, a2:Actor, sd:SeparationDistance) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        Actor.relations(a1, sd);
-        SeparationDistance.target(sd, a2);
-        SeparationDistance.distance(sd, Distance::Near);
-        
-        Actor.xPos(a1, x1);
-        Actor.yPos(a1, y1);
-        Actor.xPos(a2, x2);
-        Actor.yPos(a2, y2);
-        //check(dx^2 + dy^2 < 5^2)
-        check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) < 5*5); 
-}
-
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern SeparationDistance_near_ub(a1:Actor, a2:Actor, sd:SeparationDistance) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        Actor.relations(a1, sd);
-        SeparationDistance.target(sd, a2);
-        SeparationDistance.distance(sd, Distance::Near);
-        
-        Actor.xPos(a1, x1);
-        Actor.yPos(a1, y1);
-        Actor.xPos(a2, x2);
-        Actor.yPos(a2, y2);
-        //check(dx^2 + dy^2 > 10^2)
-        check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) > 10*10);       
-}
-
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern SeparationDistance_medium_lb(a1:Actor, a2:Actor, sd:SeparationDistance) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        Actor.relations(a1, sd);
-        SeparationDistance.target(sd, a2);
-        SeparationDistance.distance(sd, Distance::Medium);
-        
-        Actor.xPos(a1, x1);
-        Actor.yPos(a1, y1);
-        Actor.xPos(a2, x2);
-        Actor.yPos(a2, y2);
-        //check(dx^2 + dy^2 < 10^2)
-        check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) < 10*10);       
-}
-
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern SeparationDistance_medium_ub(a1:Actor, a2:Actor, sd:SeparationDistance) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        Actor.relations(a1, sd);
-        SeparationDistance.target(sd, a2);
-        SeparationDistance.distance(sd, Distance::Medium);
-        
-        Actor.xPos(a1, x1);
-        Actor.yPos(a1, y1);
-        Actor.xPos(a2, x2);
-        Actor.yPos(a2, y2);
-        //check(dx^2 + dy^2 > 1^2)
-        check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) > 15*15);       
-}
-
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern SeparationDistance_far_lb(a1:Actor, a2:Actor, sd:SeparationDistance) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        Actor.relations(a1, sd);
-        SeparationDistance.target(sd, a2);
-        SeparationDistance.distance(sd, Distance::Far);
-        
-        Actor.xPos(a1, x1);
-        Actor.yPos(a1, y1);
-        Actor.xPos(a2, x2);
-        Actor.yPos(a2, y2);
-        //check(dx^2 + dy^2 < 15^2)
-        check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) < 15*15);       
-}
-
-//////////////
-//CollisionDoesNotExist
-//////////////
-
-@Constraint(severity="error", key={a1, c}, message="x")
-pattern collisionDoesNotExist(a1:Actor, a2:Actor, ss:SimpleScenario, cdne:CollisionDoesNotExist) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        
-        SimpleScenario.actors(ss, a1);
-        SimpleScenario.actors(ss, a2);
-        Actor.relations(a1, cdne);
-        CollisionDoesNotExist.target(cdne, a2);
-        SimpleScenario.maxTime(ss, maxTime);
-        
-        Actor.width(a1, w1);
-        Actor.length(a1, l1);
-        Actor.xPos(a1, xPos1);
-        Actor.yPos(a1, yPos1);
-        Actor.xSpeed(a1, xSpeed1);
-        Actor.ySpeed(a1, ySpeed1);
-        
-        Actor.width(a2, w2);
-        Actor.length(a2, l2);
-        Actor.xPos(a2, xPos2);
-        Actor.yPos(a2, yPos2);
-        Actor.xSpeed(a2, xSpeed2);
-        Actor.ySpeed(a2, ySpeed2);
-        //check(dx^2 + dy^2 < 15^2)
-        check((x1-x2)*(x1-x2) + (y1-y2)*(y1-y2) < 15*15);       
-}
-
-//////////////
-//VisionBlocked
-//////////////
-
-//OPTIONS 1: everything is from a single check expression containing ITEs
-//Currently unhandled bygenerator
-pattern visionBlocked_ites_top(a1:Actor, a2:Actor, vb:VisionBlocked) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        Actor.relations(a1, vb);
-        VisionBlocked.target(vb, a2);
-        VisionBlocked.blockedBy(vb, aBlocker);
-        
-        Actor.xPos(a1, x1);
-        Actor.yPos(a1, y1);
-        Actor.xPos(a2, x2);
-        Actor.yPos(a2, y2);
-        Actor.xPos(aBlocker, xBlocker);
-        Actor.yPos(aBlocker, yBlocker);
-        Actor.length(aBlocker, lenBlocker);
-        Actor.width(aBlocker, widBlocker);
-        
-        //check(slope of a1-to-BlockerTop < slope of a1-to-a2)
-        check(
-                ( yBlocker - y1 + (if(xBlocker > x1){lenBlocker/2}else{0-lenBlocker/2})) / 
-                ( xBlocker - x1 + (if(yBlocker > y1){0-widBlocker/2}else{widBlocker/2}))
-                < ((y1-y2)/(x1-x2)));   
-}
-
-pattern visionBlocked_ites_bottom(a1:Actor, a2:Actor, vb:VisionBlocked) {
-        //This second one is required because we do not want to enforce both a1->c->a2 and a2->c->a1
-        Actor.relations(a1, vb);
-        VisionBlocked.target(vb, a2);
-        VisionBlocked.blockedBy(vb, aBlocker);
-        
-        Actor.xPos(a1, x1);
-        Actor.yPos(a1, y1);
-        Actor.xPos(a2, x2);
-        Actor.yPos(a2, y2);
-        Actor.xPos(aBlocker, xBlocker);
-        Actor.yPos(aBlocker, yBlocker);
-        Actor.length(aBlocker, lenBlocker);
-        Actor.width(aBlocker, widBlocker);
-        
-        //check(slope of a1-to-BlockerBottom > slope of a1-to-a2)
-        check(
-                ( yBlocker - y1 + (if(xBlocker > x1){0-lenBlocker/2}else{lenBlocker/2})) / 
-                ( xBlocker - x1 + (if(yBlocker > y1){widBlocker/2}else{0-widBlocker/2}))
-                > ((y1-y2)/(x1-x2)));   
-}
-
-//OPTION 2: 
-//we handle ITE by seperating the constraints
-
-//This will involve 1 constarint for each decision path, but will require multiple check expressions within the same pattern
-
-//OPTION 3: 
-//If this is nott working still, we will have to add some strctural components to the MM
-//to differentiate the different cases and reduce the requirements of if, then, else
-
-//This will involve more patterns, and some that are pstructural as well.
\ No newline at end of file