1 files changed, 10 insertions, 10 deletions

diff --git a/Domains/simpleScenario/model/simpleScenario.ecore b/Domains/simpleScenario/model/simpleScenario.ecore
index c164b048..f167e615 100644
--- a/Domains/simpleScenario/model/simpleScenario.ecore
+++ b/Domains/simpleScenario/model/simpleScenario.ecore
@@ -9,6 +9,7 @@
         eType="#//Actor" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="lanes" upperBound="-1"

         eType="#//Lane" containment="true"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Lane">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="orientation" lowerBound="1"

@@ -16,13 +17,11 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" lowerBound="1" eType="#//Size"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceCoord" lowerBound="1"

         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>

-    <eStructuralFeatures xsi:type="ecore:EReference" name="adjacent" upperBound="2"

-        eType="#//Lane"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="prevLane" eType="#//Lane"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="actors" upperBound="-1"

         eType="#//Actor" eOpposite="#//Actor/placedOn"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="numWidth" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="0.0"

-        derived="true"/>

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="0.0"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EEnum" name="Orientation">

     <eLiterals name="Vertical"/>

@@ -41,12 +40,14 @@
         derived="true"/>

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

         derived="true"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="speed" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"

-        defaultValueLiteral="0.0"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xSpeed" lowerBound="1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="0.0"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="relations" upperBound="-1"

         eType="#//Relation" containment="true"/>

     <eStructuralFeatures xsi:type="ecore:EReference" name="placedOn" lowerBound="1"

         eType="#//Lane" eOpposite="#//Lane/actors"/>

+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ySpeed" lowerBound="1"

+        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="Relation" abstract="true">

     <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"

@@ -55,13 +56,12 @@
   <eClassifiers xsi:type="ecore:EClass" name="SpatialRelation" abstract="true" eSuperTypes="#//Relation"/>

   <eClassifiers xsi:type="ecore:EClass" name="TemporalRelation" abstract="true" eSuperTypes="#//Relation"/>

   <eClassifiers xsi:type="ecore:EClass" name="VisionBlocked" eSuperTypes="#//SpatialRelation">

-    <eStructuralFeatures xsi:type="ecore:EReference" name="blockedBy" eType="#//Actor"/>

+    <eStructuralFeatures xsi:type="ecore:EReference" name="blockedBy" lowerBound="1"

+        eType="#//Actor"/>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="SeperationDistance" eSuperTypes="#//SpatialRelation">

+  <eClassifiers xsi:type="ecore:EClass" name="SeparationDistance" eSuperTypes="#//SpatialRelation">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="distance" lowerBound="1"

         eType="#//Distance"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="numDistance" lowerBound="1"

-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" derived="true"/>

   </eClassifiers>

   <eClassifiers xsi:type="ecore:EClass" name="CollisionExists" eSuperTypes="#//TemporalRelation">

     <eStructuralFeatures xsi:type="ecore:EAttribute" name="collisionTime" lowerBound="1"