aboutsummaryrefslogtreecommitdiffstats
path: root/Domains/simpleScenario/ecore-gen/simpleScenario
diff options
context:
space:
mode:
Diffstat (limited to 'Domains/simpleScenario/ecore-gen/simpleScenario')
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java43
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java26
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java23
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenario.java23
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java148
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/VisionBlocked.java2
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java102
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java64
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java56
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioImpl.java56
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java52
11 files changed, 383 insertions, 212 deletions
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java b/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java
index 996d349c..92c0ee3f 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java
@@ -19,9 +19,10 @@ import org.eclipse.emf.ecore.EObject;
19 * <li>{@link simpleScenario.Actor#getYPos <em>YPos</em>}</li> 19 * <li>{@link simpleScenario.Actor#getYPos <em>YPos</em>}</li>
20 * <li>{@link simpleScenario.Actor#getLength <em>Length</em>}</li> 20 * <li>{@link simpleScenario.Actor#getLength <em>Length</em>}</li>
21 * <li>{@link simpleScenario.Actor#getWidth <em>Width</em>}</li> 21 * <li>{@link simpleScenario.Actor#getWidth <em>Width</em>}</li>
22 * <li>{@link simpleScenario.Actor#getSpeed <em>Speed</em>}</li> 22 * <li>{@link simpleScenario.Actor#getXSpeed <em>XSpeed</em>}</li>
23 * <li>{@link simpleScenario.Actor#getRelations <em>Relations</em>}</li> 23 * <li>{@link simpleScenario.Actor#getRelations <em>Relations</em>}</li>
24 * <li>{@link simpleScenario.Actor#getPlacedOn <em>Placed On</em>}</li> 24 * <li>{@link simpleScenario.Actor#getPlacedOn <em>Placed On</em>}</li>
25 * <li>{@link simpleScenario.Actor#getYSpeed <em>YSpeed</em>}</li>
25 * </ul> 26 * </ul>
26 * 27 *
27 * @see simpleScenario.SimpleScenarioPackage#getActor() 28 * @see simpleScenario.SimpleScenarioPackage#getActor()
@@ -119,27 +120,27 @@ public interface Actor extends EObject {
119 void setWidth(double value); 120 void setWidth(double value);
120 121
121 /** 122 /**
122 * Returns the value of the '<em><b>Speed</b></em>' attribute. 123 * Returns the value of the '<em><b>XSpeed</b></em>' attribute.
123 * The default value is <code>"0.0"</code>. 124 * The default value is <code>"0.0"</code>.
124 * <!-- begin-user-doc --> 125 * <!-- begin-user-doc -->
125 * <!-- end-user-doc --> 126 * <!-- end-user-doc -->
126 * @return the value of the '<em>Speed</em>' attribute. 127 * @return the value of the '<em>XSpeed</em>' attribute.
127 * @see #setSpeed(double) 128 * @see #setXSpeed(double)
128 * @see simpleScenario.SimpleScenarioPackage#getActor_Speed() 129 * @see simpleScenario.SimpleScenarioPackage#getActor_XSpeed()
129 * @model default="0.0" required="true" 130 * @model default="0.0" required="true"
130 * @generated 131 * @generated
131 */ 132 */
132 double getSpeed(); 133 double getXSpeed();
133 134
134 /** 135 /**
135 * Sets the value of the '{@link simpleScenario.Actor#getSpeed <em>Speed</em>}' attribute. 136 * Sets the value of the '{@link simpleScenario.Actor#getXSpeed <em>XSpeed</em>}' attribute.
136 * <!-- begin-user-doc --> 137 * <!-- begin-user-doc -->
137 * <!-- end-user-doc --> 138 * <!-- end-user-doc -->
138 * @param value the new value of the '<em>Speed</em>' attribute. 139 * @param value the new value of the '<em>XSpeed</em>' attribute.
139 * @see #getSpeed() 140 * @see #getXSpeed()
140 * @generated 141 * @generated
141 */ 142 */
142 void setSpeed(double value); 143 void setXSpeed(double value);
143 144
144 /** 145 /**
145 * Returns the value of the '<em><b>Relations</b></em>' containment reference list. 146 * Returns the value of the '<em><b>Relations</b></em>' containment reference list.
@@ -177,4 +178,26 @@ public interface Actor extends EObject {
177 */ 178 */
178 void setPlacedOn(Lane value); 179 void setPlacedOn(Lane value);
179 180
181 /**
182 * Returns the value of the '<em><b>YSpeed</b></em>' attribute.
183 * <!-- begin-user-doc -->
184 * <!-- end-user-doc -->
185 * @return the value of the '<em>YSpeed</em>' attribute.
186 * @see #setYSpeed(double)
187 * @see simpleScenario.SimpleScenarioPackage#getActor_YSpeed()
188 * @model required="true"
189 * @generated
190 */
191 double getYSpeed();
192
193 /**
194 * Sets the value of the '{@link simpleScenario.Actor#getYSpeed <em>YSpeed</em>}' attribute.
195 * <!-- begin-user-doc -->
196 * <!-- end-user-doc -->
197 * @param value the new value of the '<em>YSpeed</em>' attribute.
198 * @see #getYSpeed()
199 * @generated
200 */
201 void setYSpeed(double value);
202
180} // Actor 203} // Actor
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java b/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java
index 9532cd64..376117d0 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EObject;
18 * <li>{@link simpleScenario.Lane#getOrientation <em>Orientation</em>}</li> 18 * <li>{@link simpleScenario.Lane#getOrientation <em>Orientation</em>}</li>
19 * <li>{@link simpleScenario.Lane#getWidth <em>Width</em>}</li> 19 * <li>{@link simpleScenario.Lane#getWidth <em>Width</em>}</li>
20 * <li>{@link simpleScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li> 20 * <li>{@link simpleScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li>
21 * <li>{@link simpleScenario.Lane#getAdjacent <em>Adjacent</em>}</li> 21 * <li>{@link simpleScenario.Lane#getPrevLane <em>Prev Lane</em>}</li>
22 * <li>{@link simpleScenario.Lane#getActors <em>Actors</em>}</li> 22 * <li>{@link simpleScenario.Lane#getActors <em>Actors</em>}</li>
23 * <li>{@link simpleScenario.Lane#getNumWidth <em>Num Width</em>}</li> 23 * <li>{@link simpleScenario.Lane#getNumWidth <em>Num Width</em>}</li>
24 * </ul> 24 * </ul>
@@ -101,16 +101,26 @@ public interface Lane extends EObject {
101 void setReferenceCoord(double value); 101 void setReferenceCoord(double value);
102 102
103 /** 103 /**
104 * Returns the value of the '<em><b>Adjacent</b></em>' reference list. 104 * Returns the value of the '<em><b>Prev Lane</b></em>' reference.
105 * The list contents are of type {@link simpleScenario.Lane}.
106 * <!-- begin-user-doc --> 105 * <!-- begin-user-doc -->
107 * <!-- end-user-doc --> 106 * <!-- end-user-doc -->
108 * @return the value of the '<em>Adjacent</em>' reference list. 107 * @return the value of the '<em>Prev Lane</em>' reference.
109 * @see simpleScenario.SimpleScenarioPackage#getLane_Adjacent() 108 * @see #setPrevLane(Lane)
110 * @model upper="2" 109 * @see simpleScenario.SimpleScenarioPackage#getLane_PrevLane()
110 * @model
111 * @generated 111 * @generated
112 */ 112 */
113 EList<Lane> getAdjacent(); 113 Lane getPrevLane();
114
115 /**
116 * Sets the value of the '{@link simpleScenario.Lane#getPrevLane <em>Prev Lane</em>}' reference.
117 * <!-- begin-user-doc -->
118 * <!-- end-user-doc -->
119 * @param value the new value of the '<em>Prev Lane</em>' reference.
120 * @see #getPrevLane()
121 * @generated
122 */
123 void setPrevLane(Lane value);
114 124
115 /** 125 /**
116 * Returns the value of the '<em><b>Actors</b></em>' reference list. 126 * Returns the value of the '<em><b>Actors</b></em>' reference list.
@@ -134,7 +144,7 @@ public interface Lane extends EObject {
134 * @return the value of the '<em>Num Width</em>' attribute. 144 * @return the value of the '<em>Num Width</em>' attribute.
135 * @see #setNumWidth(double) 145 * @see #setNumWidth(double)
136 * @see simpleScenario.SimpleScenarioPackage#getLane_NumWidth() 146 * @see simpleScenario.SimpleScenarioPackage#getLane_NumWidth()
137 * @model default="0.0" required="true" derived="true" 147 * @model default="0.0" required="true"
138 * @generated 148 * @generated
139 */ 149 */
140 double getNumWidth(); 150 double getNumWidth();
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java b/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java
index 140b4e4b..8af1f25e 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java
@@ -13,7 +13,6 @@ package simpleScenario;
13 * </p> 13 * </p>
14 * <ul> 14 * <ul>
15 * <li>{@link simpleScenario.SeperationDistance#getDistance <em>Distance</em>}</li> 15 * <li>{@link simpleScenario.SeperationDistance#getDistance <em>Distance</em>}</li>
16 * <li>{@link simpleScenario.SeperationDistance#getNumDistance <em>Num Distance</em>}</li>
17 * </ul> 16 * </ul>
18 * 17 *
19 * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance() 18 * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance()
@@ -46,26 +45,4 @@ public interface SeperationDistance extends SpatialRelation {
46 */ 45 */
47 void setDistance(Distance value); 46 void setDistance(Distance value);
48 47
49 /**
50 * Returns the value of the '<em><b>Num Distance</b></em>' attribute.
51 * <!-- begin-user-doc -->
52 * <!-- end-user-doc -->
53 * @return the value of the '<em>Num Distance</em>' attribute.
54 * @see #setNumDistance(double)
55 * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance_NumDistance()
56 * @model required="true" derived="true"
57 * @generated
58 */
59 double getNumDistance();
60
61 /**
62 * Sets the value of the '{@link simpleScenario.SeperationDistance#getNumDistance <em>Num Distance</em>}' attribute.
63 * <!-- begin-user-doc -->
64 * <!-- end-user-doc -->
65 * @param value the new value of the '<em>Num Distance</em>' attribute.
66 * @see #getNumDistance()
67 * @generated
68 */
69 void setNumDistance(double value);
70
71} // SeperationDistance 48} // SeperationDistance
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenario.java b/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenario.java
index bc92c51c..718d5bea 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenario.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenario.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject;
19 * <li>{@link simpleScenario.SimpleScenario#getYSize <em>YSize</em>}</li> 19 * <li>{@link simpleScenario.SimpleScenario#getYSize <em>YSize</em>}</li>
20 * <li>{@link simpleScenario.SimpleScenario#getActors <em>Actors</em>}</li> 20 * <li>{@link simpleScenario.SimpleScenario#getActors <em>Actors</em>}</li>
21 * <li>{@link simpleScenario.SimpleScenario#getLanes <em>Lanes</em>}</li> 21 * <li>{@link simpleScenario.SimpleScenario#getLanes <em>Lanes</em>}</li>
22 * <li>{@link simpleScenario.SimpleScenario#getMaxTime <em>Max Time</em>}</li>
22 * </ul> 23 * </ul>
23 * 24 *
24 * @see simpleScenario.SimpleScenarioPackage#getSimpleScenario() 25 * @see simpleScenario.SimpleScenarioPackage#getSimpleScenario()
@@ -94,4 +95,26 @@ public interface SimpleScenario extends EObject {
94 */ 95 */
95 EList<Lane> getLanes(); 96 EList<Lane> getLanes();
96 97
98 /**
99 * Returns the value of the '<em><b>Max Time</b></em>' attribute.
100 * <!-- begin-user-doc -->
101 * <!-- end-user-doc -->
102 * @return the value of the '<em>Max Time</em>' attribute.
103 * @see #setMaxTime(double)
104 * @see simpleScenario.SimpleScenarioPackage#getSimpleScenario_MaxTime()
105 * @model
106 * @generated
107 */
108 double getMaxTime();
109
110 /**
111 * Sets the value of the '{@link simpleScenario.SimpleScenario#getMaxTime <em>Max Time</em>}' attribute.
112 * <!-- begin-user-doc -->
113 * <!-- end-user-doc -->
114 * @param value the new value of the '<em>Max Time</em>' attribute.
115 * @see #getMaxTime()
116 * @generated
117 */
118 void setMaxTime(double value);
119
97} // SimpleScenario 120} // SimpleScenario
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java b/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java
index 3458d7c7..897d4653 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java
@@ -104,13 +104,22 @@ public interface SimpleScenarioPackage extends EPackage {
104 int SIMPLE_SCENARIO__LANES = 3; 104 int SIMPLE_SCENARIO__LANES = 3;
105 105
106 /** 106 /**
107 * The feature id for the '<em><b>Max Time</b></em>' attribute.
108 * <!-- begin-user-doc -->
109 * <!-- end-user-doc -->
110 * @generated
111 * @ordered
112 */
113 int SIMPLE_SCENARIO__MAX_TIME = 4;
114
115 /**
107 * The number of structural features of the '<em>Simple Scenario</em>' class. 116 * The number of structural features of the '<em>Simple Scenario</em>' class.
108 * <!-- begin-user-doc --> 117 * <!-- begin-user-doc -->
109 * <!-- end-user-doc --> 118 * <!-- end-user-doc -->
110 * @generated 119 * @generated
111 * @ordered 120 * @ordered
112 */ 121 */
113 int SIMPLE_SCENARIO_FEATURE_COUNT = 4; 122 int SIMPLE_SCENARIO_FEATURE_COUNT = 5;
114 123
115 /** 124 /**
116 * The number of operations of the '<em>Simple Scenario</em>' class. 125 * The number of operations of the '<em>Simple Scenario</em>' class.
@@ -159,13 +168,13 @@ public interface SimpleScenarioPackage extends EPackage {
159 int LANE__REFERENCE_COORD = 2; 168 int LANE__REFERENCE_COORD = 2;
160 169
161 /** 170 /**
162 * The feature id for the '<em><b>Adjacent</b></em>' reference list. 171 * The feature id for the '<em><b>Prev Lane</b></em>' reference.
163 * <!-- begin-user-doc --> 172 * <!-- begin-user-doc -->
164 * <!-- end-user-doc --> 173 * <!-- end-user-doc -->
165 * @generated 174 * @generated
166 * @ordered 175 * @ordered
167 */ 176 */
168 int LANE__ADJACENT = 3; 177 int LANE__PREV_LANE = 3;
169 178
170 /** 179 /**
171 * The feature id for the '<em><b>Actors</b></em>' reference list. 180 * The feature id for the '<em><b>Actors</b></em>' reference list.
@@ -250,13 +259,13 @@ public interface SimpleScenarioPackage extends EPackage {
250 int ACTOR__WIDTH = 3; 259 int ACTOR__WIDTH = 3;
251 260
252 /** 261 /**
253 * The feature id for the '<em><b>Speed</b></em>' attribute. 262 * The feature id for the '<em><b>XSpeed</b></em>' attribute.
254 * <!-- begin-user-doc --> 263 * <!-- begin-user-doc -->
255 * <!-- end-user-doc --> 264 * <!-- end-user-doc -->
256 * @generated 265 * @generated
257 * @ordered 266 * @ordered
258 */ 267 */
259 int ACTOR__SPEED = 4; 268 int ACTOR__XSPEED = 4;
260 269
261 /** 270 /**
262 * The feature id for the '<em><b>Relations</b></em>' containment reference list. 271 * The feature id for the '<em><b>Relations</b></em>' containment reference list.
@@ -277,13 +286,22 @@ public interface SimpleScenarioPackage extends EPackage {
277 int ACTOR__PLACED_ON = 6; 286 int ACTOR__PLACED_ON = 6;
278 287
279 /** 288 /**
289 * The feature id for the '<em><b>YSpeed</b></em>' attribute.
290 * <!-- begin-user-doc -->
291 * <!-- end-user-doc -->
292 * @generated
293 * @ordered
294 */
295 int ACTOR__YSPEED = 7;
296
297 /**
280 * The number of structural features of the '<em>Actor</em>' class. 298 * The number of structural features of the '<em>Actor</em>' class.
281 * <!-- begin-user-doc --> 299 * <!-- begin-user-doc -->
282 * <!-- end-user-doc --> 300 * <!-- end-user-doc -->
283 * @generated 301 * @generated
284 * @ordered 302 * @ordered
285 */ 303 */
286 int ACTOR_FEATURE_COUNT = 7; 304 int ACTOR_FEATURE_COUNT = 8;
287 305
288 /** 306 /**
289 * The number of operations of the '<em>Actor</em>' class. 307 * The number of operations of the '<em>Actor</em>' class.
@@ -480,22 +498,13 @@ public interface SimpleScenarioPackage extends EPackage {
480 int SEPERATION_DISTANCE__DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 0; 498 int SEPERATION_DISTANCE__DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 0;
481 499
482 /** 500 /**
483 * The feature id for the '<em><b>Num Distance</b></em>' attribute.
484 * <!-- begin-user-doc -->
485 * <!-- end-user-doc -->
486 * @generated
487 * @ordered
488 */
489 int SEPERATION_DISTANCE__NUM_DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 1;
490
491 /**
492 * The number of structural features of the '<em>Seperation Distance</em>' class. 501 * The number of structural features of the '<em>Seperation Distance</em>' class.
493 * <!-- begin-user-doc --> 502 * <!-- begin-user-doc -->
494 * <!-- end-user-doc --> 503 * <!-- end-user-doc -->
495 * @generated 504 * @generated
496 * @ordered 505 * @ordered
497 */ 506 */
498 int SEPERATION_DISTANCE_FEATURE_COUNT = SPATIAL_RELATION_FEATURE_COUNT + 2; 507 int SEPERATION_DISTANCE_FEATURE_COUNT = SPATIAL_RELATION_FEATURE_COUNT + 1;
499 508
500 /** 509 /**
501 * The number of operations of the '<em>Seperation Distance</em>' class. 510 * The number of operations of the '<em>Seperation Distance</em>' class.
@@ -636,13 +645,13 @@ public interface SimpleScenarioPackage extends EPackage {
636 int PEDESTRIAN__WIDTH = ACTOR__WIDTH; 645 int PEDESTRIAN__WIDTH = ACTOR__WIDTH;
637 646
638 /** 647 /**
639 * The feature id for the '<em><b>Speed</b></em>' attribute. 648 * The feature id for the '<em><b>XSpeed</b></em>' attribute.
640 * <!-- begin-user-doc --> 649 * <!-- begin-user-doc -->
641 * <!-- end-user-doc --> 650 * <!-- end-user-doc -->
642 * @generated 651 * @generated
643 * @ordered 652 * @ordered
644 */ 653 */
645 int PEDESTRIAN__SPEED = ACTOR__SPEED; 654 int PEDESTRIAN__XSPEED = ACTOR__XSPEED;
646 655
647 /** 656 /**
648 * The feature id for the '<em><b>Relations</b></em>' containment reference list. 657 * The feature id for the '<em><b>Relations</b></em>' containment reference list.
@@ -663,6 +672,15 @@ public interface SimpleScenarioPackage extends EPackage {
663 int PEDESTRIAN__PLACED_ON = ACTOR__PLACED_ON; 672 int PEDESTRIAN__PLACED_ON = ACTOR__PLACED_ON;
664 673
665 /** 674 /**
675 * The feature id for the '<em><b>YSpeed</b></em>' attribute.
676 * <!-- begin-user-doc -->
677 * <!-- end-user-doc -->
678 * @generated
679 * @ordered
680 */
681 int PEDESTRIAN__YSPEED = ACTOR__YSPEED;
682
683 /**
666 * The number of structural features of the '<em>Pedestrian</em>' class. 684 * The number of structural features of the '<em>Pedestrian</em>' class.
667 * <!-- begin-user-doc --> 685 * <!-- begin-user-doc -->
668 * <!-- end-user-doc --> 686 * <!-- end-user-doc -->
@@ -727,13 +745,13 @@ public interface SimpleScenarioPackage extends EPackage {
727 int VEHICLE__WIDTH = ACTOR__WIDTH; 745 int VEHICLE__WIDTH = ACTOR__WIDTH;
728 746
729 /** 747 /**
730 * The feature id for the '<em><b>Speed</b></em>' attribute. 748 * The feature id for the '<em><b>XSpeed</b></em>' attribute.
731 * <!-- begin-user-doc --> 749 * <!-- begin-user-doc -->
732 * <!-- end-user-doc --> 750 * <!-- end-user-doc -->
733 * @generated 751 * @generated
734 * @ordered 752 * @ordered
735 */ 753 */
736 int VEHICLE__SPEED = ACTOR__SPEED; 754 int VEHICLE__XSPEED = ACTOR__XSPEED;
737 755
738 /** 756 /**
739 * The feature id for the '<em><b>Relations</b></em>' containment reference list. 757 * The feature id for the '<em><b>Relations</b></em>' containment reference list.
@@ -754,6 +772,15 @@ public interface SimpleScenarioPackage extends EPackage {
754 int VEHICLE__PLACED_ON = ACTOR__PLACED_ON; 772 int VEHICLE__PLACED_ON = ACTOR__PLACED_ON;
755 773
756 /** 774 /**
775 * The feature id for the '<em><b>YSpeed</b></em>' attribute.
776 * <!-- begin-user-doc -->
777 * <!-- end-user-doc -->
778 * @generated
779 * @ordered
780 */
781 int VEHICLE__YSPEED = ACTOR__YSPEED;
782
783 /**
757 * The number of structural features of the '<em>Vehicle</em>' class. 784 * The number of structural features of the '<em>Vehicle</em>' class.
758 * <!-- begin-user-doc --> 785 * <!-- begin-user-doc -->
759 * <!-- end-user-doc --> 786 * <!-- end-user-doc -->
@@ -856,6 +883,17 @@ public interface SimpleScenarioPackage extends EPackage {
856 EReference getSimpleScenario_Lanes(); 883 EReference getSimpleScenario_Lanes();
857 884
858 /** 885 /**
886 * Returns the meta object for the attribute '{@link simpleScenario.SimpleScenario#getMaxTime <em>Max Time</em>}'.
887 * <!-- begin-user-doc -->
888 * <!-- end-user-doc -->
889 * @return the meta object for the attribute '<em>Max Time</em>'.
890 * @see simpleScenario.SimpleScenario#getMaxTime()
891 * @see #getSimpleScenario()
892 * @generated
893 */
894 EAttribute getSimpleScenario_MaxTime();
895
896 /**
859 * Returns the meta object for class '{@link simpleScenario.Lane <em>Lane</em>}'. 897 * Returns the meta object for class '{@link simpleScenario.Lane <em>Lane</em>}'.
860 * <!-- begin-user-doc --> 898 * <!-- begin-user-doc -->
861 * <!-- end-user-doc --> 899 * <!-- end-user-doc -->
@@ -899,15 +937,15 @@ public interface SimpleScenarioPackage extends EPackage {
899 EAttribute getLane_ReferenceCoord(); 937 EAttribute getLane_ReferenceCoord();
900 938
901 /** 939 /**
902 * Returns the meta object for the reference list '{@link simpleScenario.Lane#getAdjacent <em>Adjacent</em>}'. 940 * Returns the meta object for the reference '{@link simpleScenario.Lane#getPrevLane <em>Prev Lane</em>}'.
903 * <!-- begin-user-doc --> 941 * <!-- begin-user-doc -->
904 * <!-- end-user-doc --> 942 * <!-- end-user-doc -->
905 * @return the meta object for the reference list '<em>Adjacent</em>'. 943 * @return the meta object for the reference '<em>Prev Lane</em>'.
906 * @see simpleScenario.Lane#getAdjacent() 944 * @see simpleScenario.Lane#getPrevLane()
907 * @see #getLane() 945 * @see #getLane()
908 * @generated 946 * @generated
909 */ 947 */
910 EReference getLane_Adjacent(); 948 EReference getLane_PrevLane();
911 949
912 /** 950 /**
913 * Returns the meta object for the reference list '{@link simpleScenario.Lane#getActors <em>Actors</em>}'. 951 * Returns the meta object for the reference list '{@link simpleScenario.Lane#getActors <em>Actors</em>}'.
@@ -986,15 +1024,15 @@ public interface SimpleScenarioPackage extends EPackage {
986 EAttribute getActor_Width(); 1024 EAttribute getActor_Width();
987 1025
988 /** 1026 /**
989 * Returns the meta object for the attribute '{@link simpleScenario.Actor#getSpeed <em>Speed</em>}'. 1027 * Returns the meta object for the attribute '{@link simpleScenario.Actor#getXSpeed <em>XSpeed</em>}'.
990 * <!-- begin-user-doc --> 1028 * <!-- begin-user-doc -->
991 * <!-- end-user-doc --> 1029 * <!-- end-user-doc -->
992 * @return the meta object for the attribute '<em>Speed</em>'. 1030 * @return the meta object for the attribute '<em>XSpeed</em>'.
993 * @see simpleScenario.Actor#getSpeed() 1031 * @see simpleScenario.Actor#getXSpeed()
994 * @see #getActor() 1032 * @see #getActor()
995 * @generated 1033 * @generated
996 */ 1034 */
997 EAttribute getActor_Speed(); 1035 EAttribute getActor_XSpeed();
998 1036
999 /** 1037 /**
1000 * Returns the meta object for the containment reference list '{@link simpleScenario.Actor#getRelations <em>Relations</em>}'. 1038 * Returns the meta object for the containment reference list '{@link simpleScenario.Actor#getRelations <em>Relations</em>}'.
@@ -1019,6 +1057,17 @@ public interface SimpleScenarioPackage extends EPackage {
1019 EReference getActor_PlacedOn(); 1057 EReference getActor_PlacedOn();
1020 1058
1021 /** 1059 /**
1060 * Returns the meta object for the attribute '{@link simpleScenario.Actor#getYSpeed <em>YSpeed</em>}'.
1061 * <!-- begin-user-doc -->
1062 * <!-- end-user-doc -->
1063 * @return the meta object for the attribute '<em>YSpeed</em>'.
1064 * @see simpleScenario.Actor#getYSpeed()
1065 * @see #getActor()
1066 * @generated
1067 */
1068 EAttribute getActor_YSpeed();
1069
1070 /**
1022 * Returns the meta object for class '{@link simpleScenario.Relation <em>Relation</em>}'. 1071 * Returns the meta object for class '{@link simpleScenario.Relation <em>Relation</em>}'.
1023 * <!-- begin-user-doc --> 1072 * <!-- begin-user-doc -->
1024 * <!-- end-user-doc --> 1073 * <!-- end-user-doc -->
@@ -1102,17 +1151,6 @@ public interface SimpleScenarioPackage extends EPackage {
1102 EAttribute getSeperationDistance_Distance(); 1151 EAttribute getSeperationDistance_Distance();
1103 1152
1104 /** 1153 /**
1105 * Returns the meta object for the attribute '{@link simpleScenario.SeperationDistance#getNumDistance <em>Num Distance</em>}'.
1106 * <!-- begin-user-doc -->
1107 * <!-- end-user-doc -->
1108 * @return the meta object for the attribute '<em>Num Distance</em>'.
1109 * @see simpleScenario.SeperationDistance#getNumDistance()
1110 * @see #getSeperationDistance()
1111 * @generated
1112 */
1113 EAttribute getSeperationDistance_NumDistance();
1114
1115 /**
1116 * Returns the meta object for class '{@link simpleScenario.CollisionExists <em>Collision Exists</em>}'. 1154 * Returns the meta object for class '{@link simpleScenario.CollisionExists <em>Collision Exists</em>}'.
1117 * <!-- begin-user-doc --> 1155 * <!-- begin-user-doc -->
1118 * <!-- end-user-doc --> 1156 * <!-- end-user-doc -->
@@ -1259,6 +1297,14 @@ public interface SimpleScenarioPackage extends EPackage {
1259 EReference SIMPLE_SCENARIO__LANES = eINSTANCE.getSimpleScenario_Lanes(); 1297 EReference SIMPLE_SCENARIO__LANES = eINSTANCE.getSimpleScenario_Lanes();
1260 1298
1261 /** 1299 /**
1300 * The meta object literal for the '<em><b>Max Time</b></em>' attribute feature.
1301 * <!-- begin-user-doc -->
1302 * <!-- end-user-doc -->
1303 * @generated
1304 */
1305 EAttribute SIMPLE_SCENARIO__MAX_TIME = eINSTANCE.getSimpleScenario_MaxTime();
1306
1307 /**
1262 * The meta object literal for the '{@link simpleScenario.impl.LaneImpl <em>Lane</em>}' class. 1308 * The meta object literal for the '{@link simpleScenario.impl.LaneImpl <em>Lane</em>}' class.
1263 * <!-- begin-user-doc --> 1309 * <!-- begin-user-doc -->
1264 * <!-- end-user-doc --> 1310 * <!-- end-user-doc -->
@@ -1293,12 +1339,12 @@ public interface SimpleScenarioPackage extends EPackage {
1293 EAttribute LANE__REFERENCE_COORD = eINSTANCE.getLane_ReferenceCoord(); 1339 EAttribute LANE__REFERENCE_COORD = eINSTANCE.getLane_ReferenceCoord();
1294 1340
1295 /** 1341 /**
1296 * The meta object literal for the '<em><b>Adjacent</b></em>' reference list feature. 1342 * The meta object literal for the '<em><b>Prev Lane</b></em>' reference feature.
1297 * <!-- begin-user-doc --> 1343 * <!-- begin-user-doc -->
1298 * <!-- end-user-doc --> 1344 * <!-- end-user-doc -->
1299 * @generated 1345 * @generated
1300 */ 1346 */
1301 EReference LANE__ADJACENT = eINSTANCE.getLane_Adjacent(); 1347 EReference LANE__PREV_LANE = eINSTANCE.getLane_PrevLane();
1302 1348
1303 /** 1349 /**
1304 * The meta object literal for the '<em><b>Actors</b></em>' reference list feature. 1350 * The meta object literal for the '<em><b>Actors</b></em>' reference list feature.
@@ -1359,12 +1405,12 @@ public interface SimpleScenarioPackage extends EPackage {
1359 EAttribute ACTOR__WIDTH = eINSTANCE.getActor_Width(); 1405 EAttribute ACTOR__WIDTH = eINSTANCE.getActor_Width();
1360 1406
1361 /** 1407 /**
1362 * The meta object literal for the '<em><b>Speed</b></em>' attribute feature. 1408 * The meta object literal for the '<em><b>XSpeed</b></em>' attribute feature.
1363 * <!-- begin-user-doc --> 1409 * <!-- begin-user-doc -->
1364 * <!-- end-user-doc --> 1410 * <!-- end-user-doc -->
1365 * @generated 1411 * @generated
1366 */ 1412 */
1367 EAttribute ACTOR__SPEED = eINSTANCE.getActor_Speed(); 1413 EAttribute ACTOR__XSPEED = eINSTANCE.getActor_XSpeed();
1368 1414
1369 /** 1415 /**
1370 * The meta object literal for the '<em><b>Relations</b></em>' containment reference list feature. 1416 * The meta object literal for the '<em><b>Relations</b></em>' containment reference list feature.
@@ -1383,6 +1429,14 @@ public interface SimpleScenarioPackage extends EPackage {
1383 EReference ACTOR__PLACED_ON = eINSTANCE.getActor_PlacedOn(); 1429 EReference ACTOR__PLACED_ON = eINSTANCE.getActor_PlacedOn();
1384 1430
1385 /** 1431 /**
1432 * The meta object literal for the '<em><b>YSpeed</b></em>' attribute feature.
1433 * <!-- begin-user-doc -->
1434 * <!-- end-user-doc -->
1435 * @generated
1436 */
1437 EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed();
1438
1439 /**
1386 * The meta object literal for the '{@link simpleScenario.impl.RelationImpl <em>Relation</em>}' class. 1440 * The meta object literal for the '{@link simpleScenario.impl.RelationImpl <em>Relation</em>}' class.
1387 * <!-- begin-user-doc --> 1441 * <!-- begin-user-doc -->
1388 * <!-- end-user-doc --> 1442 * <!-- end-user-doc -->
@@ -1457,14 +1511,6 @@ public interface SimpleScenarioPackage extends EPackage {
1457 EAttribute SEPERATION_DISTANCE__DISTANCE = eINSTANCE.getSeperationDistance_Distance(); 1511 EAttribute SEPERATION_DISTANCE__DISTANCE = eINSTANCE.getSeperationDistance_Distance();
1458 1512
1459 /** 1513 /**
1460 * The meta object literal for the '<em><b>Num Distance</b></em>' attribute feature.
1461 * <!-- begin-user-doc -->
1462 * <!-- end-user-doc -->
1463 * @generated
1464 */
1465 EAttribute SEPERATION_DISTANCE__NUM_DISTANCE = eINSTANCE.getSeperationDistance_NumDistance();
1466
1467 /**
1468 * The meta object literal for the '{@link simpleScenario.impl.CollisionExistsImpl <em>Collision Exists</em>}' class. 1514 * The meta object literal for the '{@link simpleScenario.impl.CollisionExistsImpl <em>Collision Exists</em>}' class.
1469 * <!-- begin-user-doc --> 1515 * <!-- begin-user-doc -->
1470 * <!-- end-user-doc --> 1516 * <!-- end-user-doc -->
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/VisionBlocked.java b/Domains/simpleScenario/ecore-gen/simpleScenario/VisionBlocked.java
index c461d323..cdf5a074 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/VisionBlocked.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/VisionBlocked.java
@@ -27,7 +27,7 @@ public interface VisionBlocked extends SpatialRelation {
27 * @return the value of the '<em>Blocked By</em>' reference. 27 * @return the value of the '<em>Blocked By</em>' reference.
28 * @see #setBlockedBy(Actor) 28 * @see #setBlockedBy(Actor)
29 * @see simpleScenario.SimpleScenarioPackage#getVisionBlocked_BlockedBy() 29 * @see simpleScenario.SimpleScenarioPackage#getVisionBlocked_BlockedBy()
30 * @model 30 * @model required="true"
31 * @generated 31 * @generated
32 */ 32 */
33 Actor getBlockedBy(); 33 Actor getBlockedBy();
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java
index ffd19846..780cd305 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java
@@ -35,9 +35,10 @@ import simpleScenario.SimpleScenarioPackage;
35 * <li>{@link simpleScenario.impl.ActorImpl#getYPos <em>YPos</em>}</li> 35 * <li>{@link simpleScenario.impl.ActorImpl#getYPos <em>YPos</em>}</li>
36 * <li>{@link simpleScenario.impl.ActorImpl#getLength <em>Length</em>}</li> 36 * <li>{@link simpleScenario.impl.ActorImpl#getLength <em>Length</em>}</li>
37 * <li>{@link simpleScenario.impl.ActorImpl#getWidth <em>Width</em>}</li> 37 * <li>{@link simpleScenario.impl.ActorImpl#getWidth <em>Width</em>}</li>
38 * <li>{@link simpleScenario.impl.ActorImpl#getSpeed <em>Speed</em>}</li> 38 * <li>{@link simpleScenario.impl.ActorImpl#getXSpeed <em>XSpeed</em>}</li>
39 * <li>{@link simpleScenario.impl.ActorImpl#getRelations <em>Relations</em>}</li> 39 * <li>{@link simpleScenario.impl.ActorImpl#getRelations <em>Relations</em>}</li>
40 * <li>{@link simpleScenario.impl.ActorImpl#getPlacedOn <em>Placed On</em>}</li> 40 * <li>{@link simpleScenario.impl.ActorImpl#getPlacedOn <em>Placed On</em>}</li>
41 * <li>{@link simpleScenario.impl.ActorImpl#getYSpeed <em>YSpeed</em>}</li>
41 * </ul> 42 * </ul>
42 * 43 *
43 * @generated 44 * @generated
@@ -124,24 +125,24 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
124 protected double width = WIDTH_EDEFAULT; 125 protected double width = WIDTH_EDEFAULT;
125 126
126 /** 127 /**
127 * The default value of the '{@link #getSpeed() <em>Speed</em>}' attribute. 128 * The default value of the '{@link #getXSpeed() <em>XSpeed</em>}' attribute.
128 * <!-- begin-user-doc --> 129 * <!-- begin-user-doc -->
129 * <!-- end-user-doc --> 130 * <!-- end-user-doc -->
130 * @see #getSpeed() 131 * @see #getXSpeed()
131 * @generated 132 * @generated
132 * @ordered 133 * @ordered
133 */ 134 */
134 protected static final double SPEED_EDEFAULT = 0.0; 135 protected static final double XSPEED_EDEFAULT = 0.0;
135 136
136 /** 137 /**
137 * The cached value of the '{@link #getSpeed() <em>Speed</em>}' attribute. 138 * The cached value of the '{@link #getXSpeed() <em>XSpeed</em>}' attribute.
138 * <!-- begin-user-doc --> 139 * <!-- begin-user-doc -->
139 * <!-- end-user-doc --> 140 * <!-- end-user-doc -->
140 * @see #getSpeed() 141 * @see #getXSpeed()
141 * @generated 142 * @generated
142 * @ordered 143 * @ordered
143 */ 144 */
144 protected double speed = SPEED_EDEFAULT; 145 protected double xSpeed = XSPEED_EDEFAULT;
145 146
146 /** 147 /**
147 * The cached value of the '{@link #getRelations() <em>Relations</em>}' containment reference list. 148 * The cached value of the '{@link #getRelations() <em>Relations</em>}' containment reference list.
@@ -164,6 +165,26 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
164 protected Lane placedOn; 165 protected Lane placedOn;
165 166
166 /** 167 /**
168 * The default value of the '{@link #getYSpeed() <em>YSpeed</em>}' attribute.
169 * <!-- begin-user-doc -->
170 * <!-- end-user-doc -->
171 * @see #getYSpeed()
172 * @generated
173 * @ordered
174 */
175 protected static final double YSPEED_EDEFAULT = 0.0;
176
177 /**
178 * The cached value of the '{@link #getYSpeed() <em>YSpeed</em>}' attribute.
179 * <!-- begin-user-doc -->
180 * <!-- end-user-doc -->
181 * @see #getYSpeed()
182 * @generated
183 * @ordered
184 */
185 protected double ySpeed = YSPEED_EDEFAULT;
186
187 /**
167 * <!-- begin-user-doc --> 188 * <!-- begin-user-doc -->
168 * <!-- end-user-doc --> 189 * <!-- end-user-doc -->
169 * @generated 190 * @generated
@@ -280,8 +301,8 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
280 * @generated 301 * @generated
281 */ 302 */
282 @Override 303 @Override
283 public double getSpeed() { 304 public double getXSpeed() {
284 return speed; 305 return xSpeed;
285 } 306 }
286 307
287 /** 308 /**
@@ -290,11 +311,11 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
290 * @generated 311 * @generated
291 */ 312 */
292 @Override 313 @Override
293 public void setSpeed(double newSpeed) { 314 public void setXSpeed(double newXSpeed) {
294 double oldSpeed = speed; 315 double oldXSpeed = xSpeed;
295 speed = newSpeed; 316 xSpeed = newXSpeed;
296 if (eNotificationRequired()) 317 if (eNotificationRequired())
297 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__SPEED, oldSpeed, speed)); 318 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__XSPEED, oldXSpeed, xSpeed));
298 } 319 }
299 320
300 /** 321 /**
@@ -378,6 +399,29 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
378 * @generated 399 * @generated
379 */ 400 */
380 @Override 401 @Override
402 public double getYSpeed() {
403 return ySpeed;
404 }
405
406 /**
407 * <!-- begin-user-doc -->
408 * <!-- end-user-doc -->
409 * @generated
410 */
411 @Override
412 public void setYSpeed(double newYSpeed) {
413 double oldYSpeed = ySpeed;
414 ySpeed = newYSpeed;
415 if (eNotificationRequired())
416 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__YSPEED, oldYSpeed, ySpeed));
417 }
418
419 /**
420 * <!-- begin-user-doc -->
421 * <!-- end-user-doc -->
422 * @generated
423 */
424 @Override
381 public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { 425 public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
382 switch (featureID) { 426 switch (featureID) {
383 case SimpleScenarioPackage.ACTOR__PLACED_ON: 427 case SimpleScenarioPackage.ACTOR__PLACED_ON:
@@ -420,13 +464,15 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
420 return getLength(); 464 return getLength();
421 case SimpleScenarioPackage.ACTOR__WIDTH: 465 case SimpleScenarioPackage.ACTOR__WIDTH:
422 return getWidth(); 466 return getWidth();
423 case SimpleScenarioPackage.ACTOR__SPEED: 467 case SimpleScenarioPackage.ACTOR__XSPEED:
424 return getSpeed(); 468 return getXSpeed();
425 case SimpleScenarioPackage.ACTOR__RELATIONS: 469 case SimpleScenarioPackage.ACTOR__RELATIONS:
426 return getRelations(); 470 return getRelations();
427 case SimpleScenarioPackage.ACTOR__PLACED_ON: 471 case SimpleScenarioPackage.ACTOR__PLACED_ON:
428 if (resolve) return getPlacedOn(); 472 if (resolve) return getPlacedOn();
429 return basicGetPlacedOn(); 473 return basicGetPlacedOn();
474 case SimpleScenarioPackage.ACTOR__YSPEED:
475 return getYSpeed();
430 } 476 }
431 return super.eGet(featureID, resolve, coreType); 477 return super.eGet(featureID, resolve, coreType);
432 } 478 }
@@ -452,8 +498,8 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
452 case SimpleScenarioPackage.ACTOR__WIDTH: 498 case SimpleScenarioPackage.ACTOR__WIDTH:
453 setWidth((Double)newValue); 499 setWidth((Double)newValue);
454 return; 500 return;
455 case SimpleScenarioPackage.ACTOR__SPEED: 501 case SimpleScenarioPackage.ACTOR__XSPEED:
456 setSpeed((Double)newValue); 502 setXSpeed((Double)newValue);
457 return; 503 return;
458 case SimpleScenarioPackage.ACTOR__RELATIONS: 504 case SimpleScenarioPackage.ACTOR__RELATIONS:
459 getRelations().clear(); 505 getRelations().clear();
@@ -462,6 +508,9 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
462 case SimpleScenarioPackage.ACTOR__PLACED_ON: 508 case SimpleScenarioPackage.ACTOR__PLACED_ON:
463 setPlacedOn((Lane)newValue); 509 setPlacedOn((Lane)newValue);
464 return; 510 return;
511 case SimpleScenarioPackage.ACTOR__YSPEED:
512 setYSpeed((Double)newValue);
513 return;
465 } 514 }
466 super.eSet(featureID, newValue); 515 super.eSet(featureID, newValue);
467 } 516 }
@@ -486,8 +535,8 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
486 case SimpleScenarioPackage.ACTOR__WIDTH: 535 case SimpleScenarioPackage.ACTOR__WIDTH:
487 setWidth(WIDTH_EDEFAULT); 536 setWidth(WIDTH_EDEFAULT);
488 return; 537 return;
489 case SimpleScenarioPackage.ACTOR__SPEED: 538 case SimpleScenarioPackage.ACTOR__XSPEED:
490 setSpeed(SPEED_EDEFAULT); 539 setXSpeed(XSPEED_EDEFAULT);
491 return; 540 return;
492 case SimpleScenarioPackage.ACTOR__RELATIONS: 541 case SimpleScenarioPackage.ACTOR__RELATIONS:
493 getRelations().clear(); 542 getRelations().clear();
@@ -495,6 +544,9 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
495 case SimpleScenarioPackage.ACTOR__PLACED_ON: 544 case SimpleScenarioPackage.ACTOR__PLACED_ON:
496 setPlacedOn((Lane)null); 545 setPlacedOn((Lane)null);
497 return; 546 return;
547 case SimpleScenarioPackage.ACTOR__YSPEED:
548 setYSpeed(YSPEED_EDEFAULT);
549 return;
498 } 550 }
499 super.eUnset(featureID); 551 super.eUnset(featureID);
500 } 552 }
@@ -515,12 +567,14 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
515 return length != LENGTH_EDEFAULT; 567 return length != LENGTH_EDEFAULT;
516 case SimpleScenarioPackage.ACTOR__WIDTH: 568 case SimpleScenarioPackage.ACTOR__WIDTH:
517 return width != WIDTH_EDEFAULT; 569 return width != WIDTH_EDEFAULT;
518 case SimpleScenarioPackage.ACTOR__SPEED: 570 case SimpleScenarioPackage.ACTOR__XSPEED:
519 return speed != SPEED_EDEFAULT; 571 return xSpeed != XSPEED_EDEFAULT;
520 case SimpleScenarioPackage.ACTOR__RELATIONS: 572 case SimpleScenarioPackage.ACTOR__RELATIONS:
521 return relations != null && !relations.isEmpty(); 573 return relations != null && !relations.isEmpty();
522 case SimpleScenarioPackage.ACTOR__PLACED_ON: 574 case SimpleScenarioPackage.ACTOR__PLACED_ON:
523 return placedOn != null; 575 return placedOn != null;
576 case SimpleScenarioPackage.ACTOR__YSPEED:
577 return ySpeed != YSPEED_EDEFAULT;
524 } 578 }
525 return super.eIsSet(featureID); 579 return super.eIsSet(featureID);
526 } 580 }
@@ -543,8 +597,10 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
543 result.append(length); 597 result.append(length);
544 result.append(", width: "); 598 result.append(", width: ");
545 result.append(width); 599 result.append(width);
546 result.append(", speed: "); 600 result.append(", xSpeed: ");
547 result.append(speed); 601 result.append(xSpeed);
602 result.append(", ySpeed: ");
603 result.append(ySpeed);
548 result.append(')'); 604 result.append(')');
549 return result.toString(); 605 return result.toString();
550 } 606 }
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java
index fa250be8..929f8d9c 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java
@@ -3,7 +3,6 @@
3package simpleScenario.impl; 3package simpleScenario.impl;
4 4
5import java.util.Collection; 5import java.util.Collection;
6
7import org.eclipse.emf.common.notify.Notification; 6import org.eclipse.emf.common.notify.Notification;
8import org.eclipse.emf.common.notify.NotificationChain; 7import org.eclipse.emf.common.notify.NotificationChain;
9 8
@@ -14,8 +13,6 @@ import org.eclipse.emf.ecore.InternalEObject;
14 13
15import org.eclipse.emf.ecore.impl.ENotificationImpl; 14import org.eclipse.emf.ecore.impl.ENotificationImpl;
16import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; 15import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
17
18import org.eclipse.emf.ecore.util.EObjectResolvingEList;
19import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList; 16import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
20import org.eclipse.emf.ecore.util.InternalEList; 17import org.eclipse.emf.ecore.util.InternalEList;
21 18
@@ -36,7 +33,7 @@ import simpleScenario.Size;
36 * <li>{@link simpleScenario.impl.LaneImpl#getOrientation <em>Orientation</em>}</li> 33 * <li>{@link simpleScenario.impl.LaneImpl#getOrientation <em>Orientation</em>}</li>
37 * <li>{@link simpleScenario.impl.LaneImpl#getWidth <em>Width</em>}</li> 34 * <li>{@link simpleScenario.impl.LaneImpl#getWidth <em>Width</em>}</li>
38 * <li>{@link simpleScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li> 35 * <li>{@link simpleScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li>
39 * <li>{@link simpleScenario.impl.LaneImpl#getAdjacent <em>Adjacent</em>}</li> 36 * <li>{@link simpleScenario.impl.LaneImpl#getPrevLane <em>Prev Lane</em>}</li>
40 * <li>{@link simpleScenario.impl.LaneImpl#getActors <em>Actors</em>}</li> 37 * <li>{@link simpleScenario.impl.LaneImpl#getActors <em>Actors</em>}</li>
41 * <li>{@link simpleScenario.impl.LaneImpl#getNumWidth <em>Num Width</em>}</li> 38 * <li>{@link simpleScenario.impl.LaneImpl#getNumWidth <em>Num Width</em>}</li>
42 * </ul> 39 * </ul>
@@ -105,14 +102,14 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
105 protected double referenceCoord = REFERENCE_COORD_EDEFAULT; 102 protected double referenceCoord = REFERENCE_COORD_EDEFAULT;
106 103
107 /** 104 /**
108 * The cached value of the '{@link #getAdjacent() <em>Adjacent</em>}' reference list. 105 * The cached value of the '{@link #getPrevLane() <em>Prev Lane</em>}' reference.
109 * <!-- begin-user-doc --> 106 * <!-- begin-user-doc -->
110 * <!-- end-user-doc --> 107 * <!-- end-user-doc -->
111 * @see #getAdjacent() 108 * @see #getPrevLane()
112 * @generated 109 * @generated
113 * @ordered 110 * @ordered
114 */ 111 */
115 protected EList<Lane> adjacent; 112 protected Lane prevLane;
116 113
117 /** 114 /**
118 * The cached value of the '{@link #getActors() <em>Actors</em>}' reference list. 115 * The cached value of the '{@link #getActors() <em>Actors</em>}' reference list.
@@ -238,11 +235,38 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
238 * @generated 235 * @generated
239 */ 236 */
240 @Override 237 @Override
241 public EList<Lane> getAdjacent() { 238 public Lane getPrevLane() {
242 if (adjacent == null) { 239 if (prevLane != null && prevLane.eIsProxy()) {
243 adjacent = new EObjectResolvingEList<Lane>(Lane.class, this, SimpleScenarioPackage.LANE__ADJACENT); 240 InternalEObject oldPrevLane = (InternalEObject)prevLane;
241 prevLane = (Lane)eResolveProxy(oldPrevLane);
242 if (prevLane != oldPrevLane) {
243 if (eNotificationRequired())
244 eNotify(new ENotificationImpl(this, Notification.RESOLVE, SimpleScenarioPackage.LANE__PREV_LANE, oldPrevLane, prevLane));
245 }
244 } 246 }
245 return adjacent; 247 return prevLane;
248 }
249
250 /**
251 * <!-- begin-user-doc -->
252 * <!-- end-user-doc -->
253 * @generated
254 */
255 public Lane basicGetPrevLane() {
256 return prevLane;
257 }
258
259 /**
260 * <!-- begin-user-doc -->
261 * <!-- end-user-doc -->
262 * @generated
263 */
264 @Override
265 public void setPrevLane(Lane newPrevLane) {
266 Lane oldPrevLane = prevLane;
267 prevLane = newPrevLane;
268 if (eNotificationRequired())
269 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__PREV_LANE, oldPrevLane, prevLane));
246 } 270 }
247 271
248 /** 272 /**
@@ -324,8 +348,9 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
324 return getWidth(); 348 return getWidth();
325 case SimpleScenarioPackage.LANE__REFERENCE_COORD: 349 case SimpleScenarioPackage.LANE__REFERENCE_COORD:
326 return getReferenceCoord(); 350 return getReferenceCoord();
327 case SimpleScenarioPackage.LANE__ADJACENT: 351 case SimpleScenarioPackage.LANE__PREV_LANE:
328 return getAdjacent(); 352 if (resolve) return getPrevLane();
353 return basicGetPrevLane();
329 case SimpleScenarioPackage.LANE__ACTORS: 354 case SimpleScenarioPackage.LANE__ACTORS:
330 return getActors(); 355 return getActors();
331 case SimpleScenarioPackage.LANE__NUM_WIDTH: 356 case SimpleScenarioPackage.LANE__NUM_WIDTH:
@@ -352,9 +377,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
352 case SimpleScenarioPackage.LANE__REFERENCE_COORD: 377 case SimpleScenarioPackage.LANE__REFERENCE_COORD:
353 setReferenceCoord((Double)newValue); 378 setReferenceCoord((Double)newValue);
354 return; 379 return;
355 case SimpleScenarioPackage.LANE__ADJACENT: 380 case SimpleScenarioPackage.LANE__PREV_LANE:
356 getAdjacent().clear(); 381 setPrevLane((Lane)newValue);
357 getAdjacent().addAll((Collection<? extends Lane>)newValue);
358 return; 382 return;
359 case SimpleScenarioPackage.LANE__ACTORS: 383 case SimpleScenarioPackage.LANE__ACTORS:
360 getActors().clear(); 384 getActors().clear();
@@ -384,8 +408,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
384 case SimpleScenarioPackage.LANE__REFERENCE_COORD: 408 case SimpleScenarioPackage.LANE__REFERENCE_COORD:
385 setReferenceCoord(REFERENCE_COORD_EDEFAULT); 409 setReferenceCoord(REFERENCE_COORD_EDEFAULT);
386 return; 410 return;
387 case SimpleScenarioPackage.LANE__ADJACENT: 411 case SimpleScenarioPackage.LANE__PREV_LANE:
388 getAdjacent().clear(); 412 setPrevLane((Lane)null);
389 return; 413 return;
390 case SimpleScenarioPackage.LANE__ACTORS: 414 case SimpleScenarioPackage.LANE__ACTORS:
391 getActors().clear(); 415 getActors().clear();
@@ -411,8 +435,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
411 return width != WIDTH_EDEFAULT; 435 return width != WIDTH_EDEFAULT;
412 case SimpleScenarioPackage.LANE__REFERENCE_COORD: 436 case SimpleScenarioPackage.LANE__REFERENCE_COORD:
413 return referenceCoord != REFERENCE_COORD_EDEFAULT; 437 return referenceCoord != REFERENCE_COORD_EDEFAULT;
414 case SimpleScenarioPackage.LANE__ADJACENT: 438 case SimpleScenarioPackage.LANE__PREV_LANE:
415 return adjacent != null && !adjacent.isEmpty(); 439 return prevLane != null;
416 case SimpleScenarioPackage.LANE__ACTORS: 440 case SimpleScenarioPackage.LANE__ACTORS:
417 return actors != null && !actors.isEmpty(); 441 return actors != null && !actors.isEmpty();
418 case SimpleScenarioPackage.LANE__NUM_WIDTH: 442 case SimpleScenarioPackage.LANE__NUM_WIDTH:
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java
index d0f6f231..dfa19427 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java
@@ -21,7 +21,6 @@ import simpleScenario.SimpleScenarioPackage;
21 * </p> 21 * </p>
22 * <ul> 22 * <ul>
23 * <li>{@link simpleScenario.impl.SeperationDistanceImpl#getDistance <em>Distance</em>}</li> 23 * <li>{@link simpleScenario.impl.SeperationDistanceImpl#getDistance <em>Distance</em>}</li>
24 * <li>{@link simpleScenario.impl.SeperationDistanceImpl#getNumDistance <em>Num Distance</em>}</li>
25 * </ul> 24 * </ul>
26 * 25 *
27 * @generated 26 * @generated
@@ -48,26 +47,6 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
48 protected Distance distance = DISTANCE_EDEFAULT; 47 protected Distance distance = DISTANCE_EDEFAULT;
49 48
50 /** 49 /**
51 * The default value of the '{@link #getNumDistance() <em>Num Distance</em>}' attribute.
52 * <!-- begin-user-doc -->
53 * <!-- end-user-doc -->
54 * @see #getNumDistance()
55 * @generated
56 * @ordered
57 */
58 protected static final double NUM_DISTANCE_EDEFAULT = 0.0;
59
60 /**
61 * The cached value of the '{@link #getNumDistance() <em>Num Distance</em>}' attribute.
62 * <!-- begin-user-doc -->
63 * <!-- end-user-doc -->
64 * @see #getNumDistance()
65 * @generated
66 * @ordered
67 */
68 protected double numDistance = NUM_DISTANCE_EDEFAULT;
69
70 /**
71 * <!-- begin-user-doc --> 50 * <!-- begin-user-doc -->
72 * <!-- end-user-doc --> 51 * <!-- end-user-doc -->
73 * @generated 52 * @generated
@@ -115,35 +94,10 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
115 * @generated 94 * @generated
116 */ 95 */
117 @Override 96 @Override
118 public double getNumDistance() {
119 return numDistance;
120 }
121
122 /**
123 * <!-- begin-user-doc -->
124 * <!-- end-user-doc -->
125 * @generated
126 */
127 @Override
128 public void setNumDistance(double newNumDistance) {
129 double oldNumDistance = numDistance;
130 numDistance = newNumDistance;
131 if (eNotificationRequired())
132 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE, oldNumDistance, numDistance));
133 }
134
135 /**
136 * <!-- begin-user-doc -->
137 * <!-- end-user-doc -->
138 * @generated
139 */
140 @Override
141 public Object eGet(int featureID, boolean resolve, boolean coreType) { 97 public Object eGet(int featureID, boolean resolve, boolean coreType) {
142 switch (featureID) { 98 switch (featureID) {
143 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE: 99 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
144 return getDistance(); 100 return getDistance();
145 case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
146 return getNumDistance();
147 } 101 }
148 return super.eGet(featureID, resolve, coreType); 102 return super.eGet(featureID, resolve, coreType);
149 } 103 }
@@ -159,9 +113,6 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
159 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE: 113 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
160 setDistance((Distance)newValue); 114 setDistance((Distance)newValue);
161 return; 115 return;
162 case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
163 setNumDistance((Double)newValue);
164 return;
165 } 116 }
166 super.eSet(featureID, newValue); 117 super.eSet(featureID, newValue);
167 } 118 }
@@ -177,9 +128,6 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
177 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE: 128 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
178 setDistance(DISTANCE_EDEFAULT); 129 setDistance(DISTANCE_EDEFAULT);
179 return; 130 return;
180 case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
181 setNumDistance(NUM_DISTANCE_EDEFAULT);
182 return;
183 } 131 }
184 super.eUnset(featureID); 132 super.eUnset(featureID);
185 } 133 }
@@ -194,8 +142,6 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
194 switch (featureID) { 142 switch (featureID) {
195 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE: 143 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
196 return distance != DISTANCE_EDEFAULT; 144 return distance != DISTANCE_EDEFAULT;
197 case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
198 return numDistance != NUM_DISTANCE_EDEFAULT;
199 } 145 }
200 return super.eIsSet(featureID); 146 return super.eIsSet(featureID);
201 } 147 }
@@ -212,8 +158,6 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
212 StringBuilder result = new StringBuilder(super.toString()); 158 StringBuilder result = new StringBuilder(super.toString());
213 result.append(" (distance: "); 159 result.append(" (distance: ");
214 result.append(distance); 160 result.append(distance);
215 result.append(", numDistance: ");
216 result.append(numDistance);
217 result.append(')'); 161 result.append(')');
218 return result.toString(); 162 return result.toString();
219 } 163 }
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioImpl.java
index 9d542c65..e027c457 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioImpl.java
@@ -35,6 +35,7 @@ import simpleScenario.SimpleScenarioPackage;
35 * <li>{@link simpleScenario.impl.SimpleScenarioImpl#getYSize <em>YSize</em>}</li> 35 * <li>{@link simpleScenario.impl.SimpleScenarioImpl#getYSize <em>YSize</em>}</li>
36 * <li>{@link simpleScenario.impl.SimpleScenarioImpl#getActors <em>Actors</em>}</li> 36 * <li>{@link simpleScenario.impl.SimpleScenarioImpl#getActors <em>Actors</em>}</li>
37 * <li>{@link simpleScenario.impl.SimpleScenarioImpl#getLanes <em>Lanes</em>}</li> 37 * <li>{@link simpleScenario.impl.SimpleScenarioImpl#getLanes <em>Lanes</em>}</li>
38 * <li>{@link simpleScenario.impl.SimpleScenarioImpl#getMaxTime <em>Max Time</em>}</li>
38 * </ul> 39 * </ul>
39 * 40 *
40 * @generated 41 * @generated
@@ -101,6 +102,26 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
101 protected EList<Lane> lanes; 102 protected EList<Lane> lanes;
102 103
103 /** 104 /**
105 * The default value of the '{@link #getMaxTime() <em>Max Time</em>}' attribute.
106 * <!-- begin-user-doc -->
107 * <!-- end-user-doc -->
108 * @see #getMaxTime()
109 * @generated
110 * @ordered
111 */
112 protected static final double MAX_TIME_EDEFAULT = 0.0;
113
114 /**
115 * The cached value of the '{@link #getMaxTime() <em>Max Time</em>}' attribute.
116 * <!-- begin-user-doc -->
117 * <!-- end-user-doc -->
118 * @see #getMaxTime()
119 * @generated
120 * @ordered
121 */
122 protected double maxTime = MAX_TIME_EDEFAULT;
123
124 /**
104 * <!-- begin-user-doc --> 125 * <!-- begin-user-doc -->
105 * <!-- end-user-doc --> 126 * <!-- end-user-doc -->
106 * @generated 127 * @generated
@@ -197,6 +218,29 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
197 * @generated 218 * @generated
198 */ 219 */
199 @Override 220 @Override
221 public double getMaxTime() {
222 return maxTime;
223 }
224
225 /**
226 * <!-- begin-user-doc -->
227 * <!-- end-user-doc -->
228 * @generated
229 */
230 @Override
231 public void setMaxTime(double newMaxTime) {
232 double oldMaxTime = maxTime;
233 maxTime = newMaxTime;
234 if (eNotificationRequired())
235 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME, oldMaxTime, maxTime));
236 }
237
238 /**
239 * <!-- begin-user-doc -->
240 * <!-- end-user-doc -->
241 * @generated
242 */
243 @Override
200 public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { 244 public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
201 switch (featureID) { 245 switch (featureID) {
202 case SimpleScenarioPackage.SIMPLE_SCENARIO__ACTORS: 246 case SimpleScenarioPackage.SIMPLE_SCENARIO__ACTORS:
@@ -223,6 +267,8 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
223 return getActors(); 267 return getActors();
224 case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES: 268 case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES:
225 return getLanes(); 269 return getLanes();
270 case SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME:
271 return getMaxTime();
226 } 272 }
227 return super.eGet(featureID, resolve, coreType); 273 return super.eGet(featureID, resolve, coreType);
228 } 274 }
@@ -250,6 +296,9 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
250 getLanes().clear(); 296 getLanes().clear();
251 getLanes().addAll((Collection<? extends Lane>)newValue); 297 getLanes().addAll((Collection<? extends Lane>)newValue);
252 return; 298 return;
299 case SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME:
300 setMaxTime((Double)newValue);
301 return;
253 } 302 }
254 super.eSet(featureID, newValue); 303 super.eSet(featureID, newValue);
255 } 304 }
@@ -274,6 +323,9 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
274 case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES: 323 case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES:
275 getLanes().clear(); 324 getLanes().clear();
276 return; 325 return;
326 case SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME:
327 setMaxTime(MAX_TIME_EDEFAULT);
328 return;
277 } 329 }
278 super.eUnset(featureID); 330 super.eUnset(featureID);
279 } 331 }
@@ -294,6 +346,8 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
294 return actors != null && !actors.isEmpty(); 346 return actors != null && !actors.isEmpty();
295 case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES: 347 case SimpleScenarioPackage.SIMPLE_SCENARIO__LANES:
296 return lanes != null && !lanes.isEmpty(); 348 return lanes != null && !lanes.isEmpty();
349 case SimpleScenarioPackage.SIMPLE_SCENARIO__MAX_TIME:
350 return maxTime != MAX_TIME_EDEFAULT;
297 } 351 }
298 return super.eIsSet(featureID); 352 return super.eIsSet(featureID);
299 } 353 }
@@ -312,6 +366,8 @@ public class SimpleScenarioImpl extends MinimalEObjectImpl.Container implements
312 result.append(xSize); 366 result.append(xSize);
313 result.append(", ySize: "); 367 result.append(", ySize: ");
314 result.append(ySize); 368 result.append(ySize);
369 result.append(", maxTime: ");
370 result.append(maxTime);
315 result.append(')'); 371 result.append(')');
316 return result.toString(); 372 return result.toString();
317 } 373 }
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java
index 837e0d0d..d68c10c9 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java
@@ -257,6 +257,16 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
257 * @generated 257 * @generated
258 */ 258 */
259 @Override 259 @Override
260 public EAttribute getSimpleScenario_MaxTime() {
261 return (EAttribute)simpleScenarioEClass.getEStructuralFeatures().get(4);
262 }
263
264 /**
265 * <!-- begin-user-doc -->
266 * <!-- end-user-doc -->
267 * @generated
268 */
269 @Override
260 public EClass getLane() { 270 public EClass getLane() {
261 return laneEClass; 271 return laneEClass;
262 } 272 }
@@ -297,7 +307,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
297 * @generated 307 * @generated
298 */ 308 */
299 @Override 309 @Override
300 public EReference getLane_Adjacent() { 310 public EReference getLane_PrevLane() {
301 return (EReference)laneEClass.getEStructuralFeatures().get(3); 311 return (EReference)laneEClass.getEStructuralFeatures().get(3);
302 } 312 }
303 313
@@ -377,7 +387,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
377 * @generated 387 * @generated
378 */ 388 */
379 @Override 389 @Override
380 public EAttribute getActor_Speed() { 390 public EAttribute getActor_XSpeed() {
381 return (EAttribute)actorEClass.getEStructuralFeatures().get(4); 391 return (EAttribute)actorEClass.getEStructuralFeatures().get(4);
382 } 392 }
383 393
@@ -407,6 +417,16 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
407 * @generated 417 * @generated
408 */ 418 */
409 @Override 419 @Override
420 public EAttribute getActor_YSpeed() {
421 return (EAttribute)actorEClass.getEStructuralFeatures().get(7);
422 }
423
424 /**
425 * <!-- begin-user-doc -->
426 * <!-- end-user-doc -->
427 * @generated
428 */
429 @Override
410 public EClass getRelation() { 430 public EClass getRelation() {
411 return relationEClass; 431 return relationEClass;
412 } 432 }
@@ -487,16 +507,6 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
487 * @generated 507 * @generated
488 */ 508 */
489 @Override 509 @Override
490 public EAttribute getSeperationDistance_NumDistance() {
491 return (EAttribute)seperationDistanceEClass.getEStructuralFeatures().get(1);
492 }
493
494 /**
495 * <!-- begin-user-doc -->
496 * <!-- end-user-doc -->
497 * @generated
498 */
499 @Override
500 public EClass getCollisionExists() { 510 public EClass getCollisionExists() {
501 return collisionExistsEClass; 511 return collisionExistsEClass;
502 } 512 }
@@ -605,12 +615,13 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
605 createEAttribute(simpleScenarioEClass, SIMPLE_SCENARIO__YSIZE); 615 createEAttribute(simpleScenarioEClass, SIMPLE_SCENARIO__YSIZE);
606 createEReference(simpleScenarioEClass, SIMPLE_SCENARIO__ACTORS); 616 createEReference(simpleScenarioEClass, SIMPLE_SCENARIO__ACTORS);
607 createEReference(simpleScenarioEClass, SIMPLE_SCENARIO__LANES); 617 createEReference(simpleScenarioEClass, SIMPLE_SCENARIO__LANES);
618 createEAttribute(simpleScenarioEClass, SIMPLE_SCENARIO__MAX_TIME);
608 619
609 laneEClass = createEClass(LANE); 620 laneEClass = createEClass(LANE);
610 createEAttribute(laneEClass, LANE__ORIENTATION); 621 createEAttribute(laneEClass, LANE__ORIENTATION);
611 createEAttribute(laneEClass, LANE__WIDTH); 622 createEAttribute(laneEClass, LANE__WIDTH);
612 createEAttribute(laneEClass, LANE__REFERENCE_COORD); 623 createEAttribute(laneEClass, LANE__REFERENCE_COORD);
613 createEReference(laneEClass, LANE__ADJACENT); 624 createEReference(laneEClass, LANE__PREV_LANE);
614 createEReference(laneEClass, LANE__ACTORS); 625 createEReference(laneEClass, LANE__ACTORS);
615 createEAttribute(laneEClass, LANE__NUM_WIDTH); 626 createEAttribute(laneEClass, LANE__NUM_WIDTH);
616 627
@@ -619,9 +630,10 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
619 createEAttribute(actorEClass, ACTOR__YPOS); 630 createEAttribute(actorEClass, ACTOR__YPOS);
620 createEAttribute(actorEClass, ACTOR__LENGTH); 631 createEAttribute(actorEClass, ACTOR__LENGTH);
621 createEAttribute(actorEClass, ACTOR__WIDTH); 632 createEAttribute(actorEClass, ACTOR__WIDTH);
622 createEAttribute(actorEClass, ACTOR__SPEED); 633 createEAttribute(actorEClass, ACTOR__XSPEED);
623 createEReference(actorEClass, ACTOR__RELATIONS); 634 createEReference(actorEClass, ACTOR__RELATIONS);
624 createEReference(actorEClass, ACTOR__PLACED_ON); 635 createEReference(actorEClass, ACTOR__PLACED_ON);
636 createEAttribute(actorEClass, ACTOR__YSPEED);
625 637
626 relationEClass = createEClass(RELATION); 638 relationEClass = createEClass(RELATION);
627 createEReference(relationEClass, RELATION__TARGET); 639 createEReference(relationEClass, RELATION__TARGET);
@@ -635,7 +647,6 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
635 647
636 seperationDistanceEClass = createEClass(SEPERATION_DISTANCE); 648 seperationDistanceEClass = createEClass(SEPERATION_DISTANCE);
637 createEAttribute(seperationDistanceEClass, SEPERATION_DISTANCE__DISTANCE); 649 createEAttribute(seperationDistanceEClass, SEPERATION_DISTANCE__DISTANCE);
638 createEAttribute(seperationDistanceEClass, SEPERATION_DISTANCE__NUM_DISTANCE);
639 650
640 collisionExistsEClass = createEClass(COLLISION_EXISTS); 651 collisionExistsEClass = createEClass(COLLISION_EXISTS);
641 createEAttribute(collisionExistsEClass, COLLISION_EXISTS__COLLISION_TIME); 652 createEAttribute(collisionExistsEClass, COLLISION_EXISTS__COLLISION_TIME);
@@ -695,23 +706,25 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
695 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); 706 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);
696 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); 707 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);
697 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); 708 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);
709 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);
698 710
699 initEClass(laneEClass, Lane.class, "Lane", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 711 initEClass(laneEClass, Lane.class, "Lane", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
700 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); 712 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);
701 initEAttribute(getLane_Width(), this.getSize(), "width", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 713 initEAttribute(getLane_Width(), this.getSize(), "width", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
702 initEAttribute(getLane_ReferenceCoord(), ecorePackage.getEDouble(), "referenceCoord", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 714 initEAttribute(getLane_ReferenceCoord(), ecorePackage.getEDouble(), "referenceCoord", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
703 initEReference(getLane_Adjacent(), this.getLane(), null, "adjacent", null, 0, 2, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 715 initEReference(getLane_PrevLane(), this.getLane(), null, "prevLane", null, 0, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
704 initEReference(getLane_Actors(), this.getActor(), this.getActor_PlacedOn(), "actors", null, 0, -1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 716 initEReference(getLane_Actors(), this.getActor(), this.getActor_PlacedOn(), "actors", null, 0, -1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
705 initEAttribute(getLane_NumWidth(), ecorePackage.getEDouble(), "numWidth", "0.0", 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); 717 initEAttribute(getLane_NumWidth(), ecorePackage.getEDouble(), "numWidth", "0.0", 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
706 718
707 initEClass(actorEClass, Actor.class, "Actor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 719 initEClass(actorEClass, Actor.class, "Actor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
708 initEAttribute(getActor_XPos(), ecorePackage.getEDouble(), "xPos", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 720 initEAttribute(getActor_XPos(), ecorePackage.getEDouble(), "xPos", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
709 initEAttribute(getActor_YPos(), ecorePackage.getEDouble(), "yPos", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 721 initEAttribute(getActor_YPos(), ecorePackage.getEDouble(), "yPos", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
710 initEAttribute(getActor_Length(), ecorePackage.getEDouble(), "length", "0.0", 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); 722 initEAttribute(getActor_Length(), ecorePackage.getEDouble(), "length", "0.0", 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
711 initEAttribute(getActor_Width(), ecorePackage.getEDouble(), "width", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED); 723 initEAttribute(getActor_Width(), ecorePackage.getEDouble(), "width", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
712 initEAttribute(getActor_Speed(), ecorePackage.getEDouble(), "speed", "0.0", 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 724 initEAttribute(getActor_XSpeed(), ecorePackage.getEDouble(), "xSpeed", "0.0", 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
713 initEReference(getActor_Relations(), this.getRelation(), null, "relations", null, 0, -1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 725 initEReference(getActor_Relations(), this.getRelation(), null, "relations", null, 0, -1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
714 initEReference(getActor_PlacedOn(), this.getLane(), this.getLane_Actors(), "placedOn", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 726 initEReference(getActor_PlacedOn(), this.getLane(), this.getLane_Actors(), "placedOn", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
727 initEAttribute(getActor_YSpeed(), ecorePackage.getEDouble(), "ySpeed", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
715 728
716 initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 729 initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
717 initEReference(getRelation_Target(), this.getActor(), null, "target", null, 1, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 730 initEReference(getRelation_Target(), this.getActor(), null, "target", null, 1, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -721,11 +734,10 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
721 initEClass(temporalRelationEClass, TemporalRelation.class, "TemporalRelation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 734 initEClass(temporalRelationEClass, TemporalRelation.class, "TemporalRelation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
722 735
723 initEClass(visionBlockedEClass, VisionBlocked.class, "VisionBlocked", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 736 initEClass(visionBlockedEClass, VisionBlocked.class, "VisionBlocked", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
724 initEReference(getVisionBlocked_BlockedBy(), this.getActor(), null, "blockedBy", null, 0, 1, VisionBlocked.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 737 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);
725 738
726 initEClass(seperationDistanceEClass, SeperationDistance.class, "SeperationDistance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 739 initEClass(seperationDistanceEClass, SeperationDistance.class, "SeperationDistance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
727 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); 740 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);
728 initEAttribute(getSeperationDistance_NumDistance(), ecorePackage.getEDouble(), "numDistance", null, 1, 1, SeperationDistance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
729 741
730 initEClass(collisionExistsEClass, CollisionExists.class, "CollisionExists", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 742 initEClass(collisionExistsEClass, CollisionExists.class, "CollisionExists", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
731 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); 743 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);
generated by cgit v1.2.3-54-g00ecf (git 2.45.1) at 2024-05-29 19:35:35 +0000