1 files changed, 8 insertions, 5 deletions

diff --git a/Domains/simpleScenario/model/simpleScenario.genmodel b/Domains/simpleScenario/model/simpleScenario.genmodel
index cdff27fe..4ef7d81f 100644
--- a/Domains/simpleScenario/model/simpleScenario.genmodel
+++ b/Domains/simpleScenario/model/simpleScenario.genmodel
@@ -15,9 +15,10 @@
       <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Size/Medium"/>

       <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//Size/Large"/>

     </genEnums>

-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="simpleScenario.ecore#//ActorType">

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//ActorType/Pedestrian"/>

-      <genEnumLiterals ecoreEnumLiteral="simpleScenario.ecore#//ActorType/Vehicle"/>

+    <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"/>

@@ -31,10 +32,9 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Lane/referenceCoord"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//Lane/adjacent"/>

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference simpleScenario.ecore#//Lane/actors"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//Lane/widthNum"/>

+      <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/type"/>

       <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"/>

@@ -53,10 +53,13 @@
     </genClasses>

     <genClasses ecoreClass="simpleScenario.ecore#//SeperationDistance">

       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//SeperationDistance/distance"/>

+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute simpleScenario.ecore#//SeperationDistance/numDistance"/>

     </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>