diff options
Diffstat (limited to 'Domains/crossingScenario/ecore-gen')
11 files changed, 491 insertions, 797 deletions
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java index 31199a91..729ad25f 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java | |||
@@ -20,9 +20,11 @@ import org.eclipse.emf.ecore.EObject; | |||
20 | * <li>{@link crossingScenario.Actor#getLength <em>Length</em>}</li> | 20 | * <li>{@link crossingScenario.Actor#getLength <em>Length</em>}</li> |
21 | * <li>{@link crossingScenario.Actor#getWidth <em>Width</em>}</li> | 21 | * <li>{@link crossingScenario.Actor#getWidth <em>Width</em>}</li> |
22 | * <li>{@link crossingScenario.Actor#getXSpeed <em>XSpeed</em>}</li> | 22 | * <li>{@link crossingScenario.Actor#getXSpeed <em>XSpeed</em>}</li> |
23 | * <li>{@link crossingScenario.Actor#getRelations <em>Relations</em>}</li> | ||
24 | * <li>{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}</li> | 23 | * <li>{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}</li> |
25 | * <li>{@link crossingScenario.Actor#getYSpeed <em>YSpeed</em>}</li> | 24 | * <li>{@link crossingScenario.Actor#getYSpeed <em>YSpeed</em>}</li> |
25 | * <li>{@link crossingScenario.Actor#getDist_near <em>Dist near</em>}</li> | ||
26 | * <li>{@link crossingScenario.Actor#getDist_med <em>Dist med</em>}</li> | ||
27 | * <li>{@link crossingScenario.Actor#getDist_far <em>Dist far</em>}</li> | ||
26 | * </ul> | 28 | * </ul> |
27 | * | 29 | * |
28 | * @see crossingScenario.CrossingScenarioPackage#getActor() | 30 | * @see crossingScenario.CrossingScenarioPackage#getActor() |
@@ -143,18 +145,6 @@ public interface Actor extends EObject { | |||
143 | void setXSpeed(double value); | 145 | void setXSpeed(double value); |
144 | 146 | ||
145 | /** | 147 | /** |
146 | * Returns the value of the '<em><b>Relations</b></em>' containment reference list. | ||
147 | * The list contents are of type {@link crossingScenario.Relation}. | ||
148 | * <!-- begin-user-doc --> | ||
149 | * <!-- end-user-doc --> | ||
150 | * @return the value of the '<em>Relations</em>' containment reference list. | ||
151 | * @see crossingScenario.CrossingScenarioPackage#getActor_Relations() | ||
152 | * @model containment="true" | ||
153 | * @generated | ||
154 | */ | ||
155 | EList<Relation> getRelations(); | ||
156 | |||
157 | /** | ||
158 | * Returns the value of the '<em><b>Placed On</b></em>' reference. | 148 | * Returns the value of the '<em><b>Placed On</b></em>' reference. |
159 | * It is bidirectional and its opposite is '{@link crossingScenario.Lane#getActors <em>Actors</em>}'. | 149 | * It is bidirectional and its opposite is '{@link crossingScenario.Lane#getActors <em>Actors</em>}'. |
160 | * <!-- begin-user-doc --> | 150 | * <!-- begin-user-doc --> |
@@ -200,4 +190,40 @@ public interface Actor extends EObject { | |||
200 | */ | 190 | */ |
201 | void setYSpeed(double value); | 191 | void setYSpeed(double value); |
202 | 192 | ||
193 | /** | ||
194 | * Returns the value of the '<em><b>Dist near</b></em>' reference list. | ||
195 | * The list contents are of type {@link crossingScenario.Actor}. | ||
196 | * <!-- begin-user-doc --> | ||
197 | * <!-- end-user-doc --> | ||
198 | * @return the value of the '<em>Dist near</em>' reference list. | ||
199 | * @see crossingScenario.CrossingScenarioPackage#getActor_Dist_near() | ||
200 | * @model transient="true" volatile="true" derived="true" | ||
201 | * @generated | ||
202 | */ | ||
203 | EList<Actor> getDist_near(); | ||
204 | |||
205 | /** | ||
206 | * Returns the value of the '<em><b>Dist med</b></em>' reference list. | ||
207 | * The list contents are of type {@link crossingScenario.Actor}. | ||
208 | * <!-- begin-user-doc --> | ||
209 | * <!-- end-user-doc --> | ||
210 | * @return the value of the '<em>Dist med</em>' reference list. | ||
211 | * @see crossingScenario.CrossingScenarioPackage#getActor_Dist_med() | ||
212 | * @model transient="true" volatile="true" derived="true" | ||
213 | * @generated | ||
214 | */ | ||
215 | EList<Actor> getDist_med(); | ||
216 | |||
217 | /** | ||
218 | * Returns the value of the '<em><b>Dist far</b></em>' reference list. | ||
219 | * The list contents are of type {@link crossingScenario.Actor}. | ||
220 | * <!-- begin-user-doc --> | ||
221 | * <!-- end-user-doc --> | ||
222 | * @return the value of the '<em>Dist far</em>' reference list. | ||
223 | * @see crossingScenario.CrossingScenarioPackage#getActor_Dist_far() | ||
224 | * @model transient="true" volatile="true" derived="true" | ||
225 | * @generated | ||
226 | */ | ||
227 | EList<Actor> getDist_far(); | ||
228 | |||
203 | } // Actor | 229 | } // Actor |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java index b4f01423..0e9f4981 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java | |||
@@ -20,8 +20,7 @@ import org.eclipse.emf.ecore.EObject; | |||
20 | * <li>{@link crossingScenario.CrossingScenario#getActors <em>Actors</em>}</li> | 20 | * <li>{@link crossingScenario.CrossingScenario#getActors <em>Actors</em>}</li> |
21 | * <li>{@link crossingScenario.CrossingScenario#getLanes <em>Lanes</em>}</li> | 21 | * <li>{@link crossingScenario.CrossingScenario#getLanes <em>Lanes</em>}</li> |
22 | * <li>{@link crossingScenario.CrossingScenario#getMaxTime <em>Max Time</em>}</li> | 22 | * <li>{@link crossingScenario.CrossingScenario#getMaxTime <em>Max Time</em>}</li> |
23 | * <li>{@link crossingScenario.CrossingScenario#getHorizontal_head <em>Horizontal head</em>}</li> | 23 | * <li>{@link crossingScenario.CrossingScenario#getRelations <em>Relations</em>}</li> |
24 | * <li>{@link crossingScenario.CrossingScenario#getVertical_head <em>Vertical head</em>}</li> | ||
25 | * </ul> | 24 | * </ul> |
26 | * | 25 | * |
27 | * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario() | 26 | * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario() |
@@ -120,47 +119,15 @@ public interface CrossingScenario extends EObject { | |||
120 | void setMaxTime(double value); | 119 | void setMaxTime(double value); |
121 | 120 | ||
122 | /** | 121 | /** |
123 | * Returns the value of the '<em><b>Horizontal head</b></em>' reference. | 122 | * Returns the value of the '<em><b>Relations</b></em>' containment reference list. |
123 | * The list contents are of type {@link crossingScenario.Relation}. | ||
124 | * <!-- begin-user-doc --> | 124 | * <!-- begin-user-doc --> |
125 | * <!-- end-user-doc --> | 125 | * <!-- end-user-doc --> |
126 | * @return the value of the '<em>Horizontal head</em>' reference. | 126 | * @return the value of the '<em>Relations</em>' containment reference list. |
127 | * @see #setHorizontal_head(Lane_Horizontal) | 127 | * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_Relations() |
128 | * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_Horizontal_head() | 128 | * @model containment="true" |
129 | * @model required="true" | ||
130 | * @generated | ||
131 | */ | ||
132 | Lane_Horizontal getHorizontal_head(); | ||
133 | |||
134 | /** | ||
135 | * Sets the value of the '{@link crossingScenario.CrossingScenario#getHorizontal_head <em>Horizontal head</em>}' reference. | ||
136 | * <!-- begin-user-doc --> | ||
137 | * <!-- end-user-doc --> | ||
138 | * @param value the new value of the '<em>Horizontal head</em>' reference. | ||
139 | * @see #getHorizontal_head() | ||
140 | * @generated | ||
141 | */ | ||
142 | void setHorizontal_head(Lane_Horizontal value); | ||
143 | |||
144 | /** | ||
145 | * Returns the value of the '<em><b>Vertical head</b></em>' reference. | ||
146 | * <!-- begin-user-doc --> | ||
147 | * <!-- end-user-doc --> | ||
148 | * @return the value of the '<em>Vertical head</em>' reference. | ||
149 | * @see #setVertical_head(Lane_Vertical) | ||
150 | * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_Vertical_head() | ||
151 | * @model required="true" | ||
152 | * @generated | ||
153 | */ | ||
154 | Lane_Vertical getVertical_head(); | ||
155 | |||
156 | /** | ||
157 | * Sets the value of the '{@link crossingScenario.CrossingScenario#getVertical_head <em>Vertical head</em>}' reference. | ||
158 | * <!-- begin-user-doc --> | ||
159 | * <!-- end-user-doc --> | ||
160 | * @param value the new value of the '<em>Vertical head</em>' reference. | ||
161 | * @see #getVertical_head() | ||
162 | * @generated | 129 | * @generated |
163 | */ | 130 | */ |
164 | void setVertical_head(Lane_Vertical value); | 131 | EList<Relation> getRelations(); |
165 | 132 | ||
166 | } // CrossingScenario | 133 | } // CrossingScenario |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java index 813466ef..45443103 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java | |||
@@ -113,22 +113,13 @@ public interface CrossingScenarioPackage extends EPackage { | |||
113 | int CROSSING_SCENARIO__MAX_TIME = 4; | 113 | int CROSSING_SCENARIO__MAX_TIME = 4; |
114 | 114 | ||
115 | /** | 115 | /** |
116 | * The feature id for the '<em><b>Horizontal head</b></em>' reference. | 116 | * The feature id for the '<em><b>Relations</b></em>' containment reference list. |
117 | * <!-- begin-user-doc --> | ||
118 | * <!-- end-user-doc --> | ||
119 | * @generated | ||
120 | * @ordered | ||
121 | */ | ||
122 | int CROSSING_SCENARIO__HORIZONTAL_HEAD = 5; | ||
123 | |||
124 | /** | ||
125 | * The feature id for the '<em><b>Vertical head</b></em>' reference. | ||
126 | * <!-- begin-user-doc --> | 117 | * <!-- begin-user-doc --> |
127 | * <!-- end-user-doc --> | 118 | * <!-- end-user-doc --> |
128 | * @generated | 119 | * @generated |
129 | * @ordered | 120 | * @ordered |
130 | */ | 121 | */ |
131 | int CROSSING_SCENARIO__VERTICAL_HEAD = 6; | 122 | int CROSSING_SCENARIO__RELATIONS = 5; |
132 | 123 | ||
133 | /** | 124 | /** |
134 | * The number of structural features of the '<em>Crossing Scenario</em>' class. | 125 | * The number of structural features of the '<em>Crossing Scenario</em>' class. |
@@ -137,7 +128,7 @@ public interface CrossingScenarioPackage extends EPackage { | |||
137 | * @generated | 128 | * @generated |
138 | * @ordered | 129 | * @ordered |
139 | */ | 130 | */ |
140 | int CROSSING_SCENARIO_FEATURE_COUNT = 7; | 131 | int CROSSING_SCENARIO_FEATURE_COUNT = 6; |
141 | 132 | ||
142 | /** | 133 | /** |
143 | * The number of operations of the '<em>Crossing Scenario</em>' class. | 134 | * The number of operations of the '<em>Crossing Scenario</em>' class. |
@@ -159,31 +150,13 @@ public interface CrossingScenarioPackage extends EPackage { | |||
159 | int LANE = 1; | 150 | int LANE = 1; |
160 | 151 | ||
161 | /** | 152 | /** |
162 | * The feature id for the '<em><b>Width</b></em>' attribute. | ||
163 | * <!-- begin-user-doc --> | ||
164 | * <!-- end-user-doc --> | ||
165 | * @generated | ||
166 | * @ordered | ||
167 | */ | ||
168 | int LANE__WIDTH = 0; | ||
169 | |||
170 | /** | ||
171 | * The feature id for the '<em><b>Reference Coord</b></em>' attribute. | 153 | * The feature id for the '<em><b>Reference Coord</b></em>' attribute. |
172 | * <!-- begin-user-doc --> | 154 | * <!-- begin-user-doc --> |
173 | * <!-- end-user-doc --> | 155 | * <!-- end-user-doc --> |
174 | * @generated | 156 | * @generated |
175 | * @ordered | 157 | * @ordered |
176 | */ | 158 | */ |
177 | int LANE__REFERENCE_COORD = 1; | 159 | int LANE__REFERENCE_COORD = 0; |
178 | |||
179 | /** | ||
180 | * The feature id for the '<em><b>Prev Lane</b></em>' reference. | ||
181 | * <!-- begin-user-doc --> | ||
182 | * <!-- end-user-doc --> | ||
183 | * @generated | ||
184 | * @ordered | ||
185 | */ | ||
186 | int LANE__PREV_LANE = 2; | ||
187 | 160 | ||
188 | /** | 161 | /** |
189 | * The feature id for the '<em><b>Actors</b></em>' reference list. | 162 | * The feature id for the '<em><b>Actors</b></em>' reference list. |
@@ -192,16 +165,7 @@ public interface CrossingScenarioPackage extends EPackage { | |||
192 | * @generated | 165 | * @generated |
193 | * @ordered | 166 | * @ordered |
194 | */ | 167 | */ |
195 | int LANE__ACTORS = 3; | 168 | int LANE__ACTORS = 1; |
196 | |||
197 | /** | ||
198 | * The feature id for the '<em><b>Num Width</b></em>' attribute. | ||
199 | * <!-- begin-user-doc --> | ||
200 | * <!-- end-user-doc --> | ||
201 | * @generated | ||
202 | * @ordered | ||
203 | */ | ||
204 | int LANE__NUM_WIDTH = 4; | ||
205 | 169 | ||
206 | /** | 170 | /** |
207 | * The number of structural features of the '<em>Lane</em>' class. | 171 | * The number of structural features of the '<em>Lane</em>' class. |
@@ -210,7 +174,7 @@ public interface CrossingScenarioPackage extends EPackage { | |||
210 | * @generated | 174 | * @generated |
211 | * @ordered | 175 | * @ordered |
212 | */ | 176 | */ |
213 | int LANE_FEATURE_COUNT = 5; | 177 | int LANE_FEATURE_COUNT = 2; |
214 | 178 | ||
215 | /** | 179 | /** |
216 | * The number of operations of the '<em>Lane</em>' class. | 180 | * The number of operations of the '<em>Lane</em>' class. |
@@ -277,31 +241,49 @@ public interface CrossingScenarioPackage extends EPackage { | |||
277 | int ACTOR__XSPEED = 4; | 241 | int ACTOR__XSPEED = 4; |
278 | 242 | ||
279 | /** | 243 | /** |
280 | * The feature id for the '<em><b>Relations</b></em>' containment reference list. | 244 | * The feature id for the '<em><b>Placed On</b></em>' reference. |
281 | * <!-- begin-user-doc --> | 245 | * <!-- begin-user-doc --> |
282 | * <!-- end-user-doc --> | 246 | * <!-- end-user-doc --> |
283 | * @generated | 247 | * @generated |
284 | * @ordered | 248 | * @ordered |
285 | */ | 249 | */ |
286 | int ACTOR__RELATIONS = 5; | 250 | int ACTOR__PLACED_ON = 5; |
287 | 251 | ||
288 | /** | 252 | /** |
289 | * The feature id for the '<em><b>Placed On</b></em>' reference. | 253 | * The feature id for the '<em><b>YSpeed</b></em>' attribute. |
290 | * <!-- begin-user-doc --> | 254 | * <!-- begin-user-doc --> |
291 | * <!-- end-user-doc --> | 255 | * <!-- end-user-doc --> |
292 | * @generated | 256 | * @generated |
293 | * @ordered | 257 | * @ordered |
294 | */ | 258 | */ |
295 | int ACTOR__PLACED_ON = 6; | 259 | int ACTOR__YSPEED = 6; |
296 | 260 | ||
297 | /** | 261 | /** |
298 | * The feature id for the '<em><b>YSpeed</b></em>' attribute. | 262 | * The feature id for the '<em><b>Dist near</b></em>' reference list. |
299 | * <!-- begin-user-doc --> | 263 | * <!-- begin-user-doc --> |
300 | * <!-- end-user-doc --> | 264 | * <!-- end-user-doc --> |
301 | * @generated | 265 | * @generated |
302 | * @ordered | 266 | * @ordered |
303 | */ | 267 | */ |
304 | int ACTOR__YSPEED = 7; | 268 | int ACTOR__DIST_NEAR = 7; |
269 | |||
270 | /** | ||
271 | * The feature id for the '<em><b>Dist med</b></em>' reference list. | ||
272 | * <!-- begin-user-doc --> | ||
273 | * <!-- end-user-doc --> | ||
274 | * @generated | ||
275 | * @ordered | ||
276 | */ | ||
277 | int ACTOR__DIST_MED = 8; | ||
278 | |||
279 | /** | ||
280 | * The feature id for the '<em><b>Dist far</b></em>' reference list. | ||
281 | * <!-- begin-user-doc --> | ||
282 | * <!-- end-user-doc --> | ||
283 | * @generated | ||
284 | * @ordered | ||
285 | */ | ||
286 | int ACTOR__DIST_FAR = 9; | ||
305 | 287 | ||
306 | /** | 288 | /** |
307 | * The number of structural features of the '<em>Actor</em>' class. | 289 | * The number of structural features of the '<em>Actor</em>' class. |
@@ -310,7 +292,7 @@ public interface CrossingScenarioPackage extends EPackage { | |||
310 | * @generated | 292 | * @generated |
311 | * @ordered | 293 | * @ordered |
312 | */ | 294 | */ |
313 | int ACTOR_FEATURE_COUNT = 8; | 295 | int ACTOR_FEATURE_COUNT = 10; |
314 | 296 | ||
315 | /** | 297 | /** |
316 | * The number of operations of the '<em>Actor</em>' class. | 298 | * The number of operations of the '<em>Actor</em>' class. |
@@ -341,13 +323,22 @@ public interface CrossingScenarioPackage extends EPackage { | |||
341 | int RELATION__TARGET = 0; | 323 | int RELATION__TARGET = 0; |
342 | 324 | ||
343 | /** | 325 | /** |
326 | * The feature id for the '<em><b>Source</b></em>' reference. | ||
327 | * <!-- begin-user-doc --> | ||
328 | * <!-- end-user-doc --> | ||
329 | * @generated | ||
330 | * @ordered | ||
331 | */ | ||
332 | int RELATION__SOURCE = 1; | ||
333 | |||
334 | /** | ||
344 | * The number of structural features of the '<em>Relation</em>' class. | 335 | * The number of structural features of the '<em>Relation</em>' class. |
345 | * <!-- begin-user-doc --> | 336 | * <!-- begin-user-doc --> |
346 | * <!-- end-user-doc --> | 337 | * <!-- end-user-doc --> |
347 | * @generated | 338 | * @generated |
348 | * @ordered | 339 | * @ordered |
349 | */ | 340 | */ |
350 | int RELATION_FEATURE_COUNT = 1; | 341 | int RELATION_FEATURE_COUNT = 2; |
351 | 342 | ||
352 | /** | 343 | /** |
353 | * The number of operations of the '<em>Relation</em>' class. | 344 | * The number of operations of the '<em>Relation</em>' class. |
@@ -378,6 +369,15 @@ public interface CrossingScenarioPackage extends EPackage { | |||
378 | int SPATIAL_RELATION__TARGET = RELATION__TARGET; | 369 | int SPATIAL_RELATION__TARGET = RELATION__TARGET; |
379 | 370 | ||
380 | /** | 371 | /** |
372 | * The feature id for the '<em><b>Source</b></em>' reference. | ||
373 | * <!-- begin-user-doc --> | ||
374 | * <!-- end-user-doc --> | ||
375 | * @generated | ||
376 | * @ordered | ||
377 | */ | ||
378 | int SPATIAL_RELATION__SOURCE = RELATION__SOURCE; | ||
379 | |||
380 | /** | ||
381 | * The number of structural features of the '<em>Spatial Relation</em>' class. | 381 | * The number of structural features of the '<em>Spatial Relation</em>' class. |
382 | * <!-- begin-user-doc --> | 382 | * <!-- begin-user-doc --> |
383 | * <!-- end-user-doc --> | 383 | * <!-- end-user-doc --> |
@@ -415,6 +415,15 @@ public interface CrossingScenarioPackage extends EPackage { | |||
415 | int TEMPORAL_RELATION__TARGET = RELATION__TARGET; | 415 | int TEMPORAL_RELATION__TARGET = RELATION__TARGET; |
416 | 416 | ||
417 | /** | 417 | /** |
418 | * The feature id for the '<em><b>Source</b></em>' reference. | ||
419 | * <!-- begin-user-doc --> | ||
420 | * <!-- end-user-doc --> | ||
421 | * @generated | ||
422 | * @ordered | ||
423 | */ | ||
424 | int TEMPORAL_RELATION__SOURCE = RELATION__SOURCE; | ||
425 | |||
426 | /** | ||
418 | * The number of structural features of the '<em>Temporal Relation</em>' class. | 427 | * The number of structural features of the '<em>Temporal Relation</em>' class. |
419 | * <!-- begin-user-doc --> | 428 | * <!-- begin-user-doc --> |
420 | * <!-- end-user-doc --> | 429 | * <!-- end-user-doc --> |
@@ -452,6 +461,15 @@ public interface CrossingScenarioPackage extends EPackage { | |||
452 | int VISION_BLOCKED__TARGET = SPATIAL_RELATION__TARGET; | 461 | int VISION_BLOCKED__TARGET = SPATIAL_RELATION__TARGET; |
453 | 462 | ||
454 | /** | 463 | /** |
464 | * The feature id for the '<em><b>Source</b></em>' reference. | ||
465 | * <!-- begin-user-doc --> | ||
466 | * <!-- end-user-doc --> | ||
467 | * @generated | ||
468 | * @ordered | ||
469 | */ | ||
470 | int VISION_BLOCKED__SOURCE = SPATIAL_RELATION__SOURCE; | ||
471 | |||
472 | /** | ||
455 | * The feature id for the '<em><b>Blocked By</b></em>' reference. | 473 | * The feature id for the '<em><b>Blocked By</b></em>' reference. |
456 | * <!-- begin-user-doc --> | 474 | * <!-- begin-user-doc --> |
457 | * <!-- end-user-doc --> | 475 | * <!-- end-user-doc --> |
@@ -498,6 +516,15 @@ public interface CrossingScenarioPackage extends EPackage { | |||
498 | int SEPARATION_DISTANCE__TARGET = SPATIAL_RELATION__TARGET; | 516 | int SEPARATION_DISTANCE__TARGET = SPATIAL_RELATION__TARGET; |
499 | 517 | ||
500 | /** | 518 | /** |
519 | * The feature id for the '<em><b>Source</b></em>' reference. | ||
520 | * <!-- begin-user-doc --> | ||
521 | * <!-- end-user-doc --> | ||
522 | * @generated | ||
523 | * @ordered | ||
524 | */ | ||
525 | int SEPARATION_DISTANCE__SOURCE = SPATIAL_RELATION__SOURCE; | ||
526 | |||
527 | /** | ||
501 | * The feature id for the '<em><b>Distance</b></em>' attribute. | 528 | * The feature id for the '<em><b>Distance</b></em>' attribute. |
502 | * <!-- begin-user-doc --> | 529 | * <!-- begin-user-doc --> |
503 | * <!-- end-user-doc --> | 530 | * <!-- end-user-doc --> |
@@ -544,6 +571,15 @@ public interface CrossingScenarioPackage extends EPackage { | |||
544 | int COLLISION_EXISTS__TARGET = TEMPORAL_RELATION__TARGET; | 571 | int COLLISION_EXISTS__TARGET = TEMPORAL_RELATION__TARGET; |
545 | 572 | ||
546 | /** | 573 | /** |
574 | * The feature id for the '<em><b>Source</b></em>' reference. | ||
575 | * <!-- begin-user-doc --> | ||
576 | * <!-- end-user-doc --> | ||
577 | * @generated | ||
578 | * @ordered | ||
579 | */ | ||
580 | int COLLISION_EXISTS__SOURCE = TEMPORAL_RELATION__SOURCE; | ||
581 | |||
582 | /** | ||
547 | * The feature id for the '<em><b>Collision Time</b></em>' attribute. | 583 | * The feature id for the '<em><b>Collision Time</b></em>' attribute. |
548 | * <!-- begin-user-doc --> | 584 | * <!-- begin-user-doc --> |
549 | * <!-- end-user-doc --> | 585 | * <!-- end-user-doc --> |
@@ -590,6 +626,15 @@ public interface CrossingScenarioPackage extends EPackage { | |||
590 | int COLLISION_DOES_NOT_EXIST__TARGET = TEMPORAL_RELATION__TARGET; | 626 | int COLLISION_DOES_NOT_EXIST__TARGET = TEMPORAL_RELATION__TARGET; |
591 | 627 | ||
592 | /** | 628 | /** |
629 | * The feature id for the '<em><b>Source</b></em>' reference. | ||
630 | * <!-- begin-user-doc --> | ||
631 | * <!-- end-user-doc --> | ||
632 | * @generated | ||
633 | * @ordered | ||
634 | */ | ||
635 | int COLLISION_DOES_NOT_EXIST__SOURCE = TEMPORAL_RELATION__SOURCE; | ||
636 | |||
637 | /** | ||
593 | * The number of structural features of the '<em>Collision Does Not Exist</em>' class. | 638 | * The number of structural features of the '<em>Collision Does Not Exist</em>' class. |
594 | * <!-- begin-user-doc --> | 639 | * <!-- begin-user-doc --> |
595 | * <!-- end-user-doc --> | 640 | * <!-- end-user-doc --> |
@@ -663,31 +708,49 @@ public interface CrossingScenarioPackage extends EPackage { | |||
663 | int PEDESTRIAN__XSPEED = ACTOR__XSPEED; | 708 | int PEDESTRIAN__XSPEED = ACTOR__XSPEED; |
664 | 709 | ||
665 | /** | 710 | /** |
666 | * The feature id for the '<em><b>Relations</b></em>' containment reference list. | 711 | * The feature id for the '<em><b>Placed On</b></em>' reference. |
667 | * <!-- begin-user-doc --> | 712 | * <!-- begin-user-doc --> |
668 | * <!-- end-user-doc --> | 713 | * <!-- end-user-doc --> |
669 | * @generated | 714 | * @generated |
670 | * @ordered | 715 | * @ordered |
671 | */ | 716 | */ |
672 | int PEDESTRIAN__RELATIONS = ACTOR__RELATIONS; | 717 | int PEDESTRIAN__PLACED_ON = ACTOR__PLACED_ON; |
673 | 718 | ||
674 | /** | 719 | /** |
675 | * The feature id for the '<em><b>Placed On</b></em>' reference. | 720 | * The feature id for the '<em><b>YSpeed</b></em>' attribute. |
676 | * <!-- begin-user-doc --> | 721 | * <!-- begin-user-doc --> |
677 | * <!-- end-user-doc --> | 722 | * <!-- end-user-doc --> |
678 | * @generated | 723 | * @generated |
679 | * @ordered | 724 | * @ordered |
680 | */ | 725 | */ |
681 | int PEDESTRIAN__PLACED_ON = ACTOR__PLACED_ON; | 726 | int PEDESTRIAN__YSPEED = ACTOR__YSPEED; |
682 | 727 | ||
683 | /** | 728 | /** |
684 | * The feature id for the '<em><b>YSpeed</b></em>' attribute. | 729 | * The feature id for the '<em><b>Dist near</b></em>' reference list. |
685 | * <!-- begin-user-doc --> | 730 | * <!-- begin-user-doc --> |
686 | * <!-- end-user-doc --> | 731 | * <!-- end-user-doc --> |
687 | * @generated | 732 | * @generated |
688 | * @ordered | 733 | * @ordered |
689 | */ | 734 | */ |
690 | int PEDESTRIAN__YSPEED = ACTOR__YSPEED; | 735 | int PEDESTRIAN__DIST_NEAR = ACTOR__DIST_NEAR; |
736 | |||
737 | /** | ||
738 | * The feature id for the '<em><b>Dist med</b></em>' reference list. | ||
739 | * <!-- begin-user-doc --> | ||
740 | * <!-- end-user-doc --> | ||
741 | * @generated | ||
742 | * @ordered | ||
743 | */ | ||
744 | int PEDESTRIAN__DIST_MED = ACTOR__DIST_MED; | ||
745 | |||
746 | /** | ||
747 | * The feature id for the '<em><b>Dist far</b></em>' reference list. | ||
748 | * <!-- begin-user-doc --> | ||
749 | * <!-- end-user-doc --> | ||
750 | * @generated | ||
751 | * @ordered | ||
752 | */ | ||
753 | int PEDESTRIAN__DIST_FAR = ACTOR__DIST_FAR; | ||
691 | 754 | ||
692 | /** | 755 | /** |
693 | * The number of structural features of the '<em>Pedestrian</em>' class. | 756 | * The number of structural features of the '<em>Pedestrian</em>' class. |
@@ -763,15 +826,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
763 | int VEHICLE__XSPEED = ACTOR__XSPEED; | 826 | int VEHICLE__XSPEED = ACTOR__XSPEED; |
764 | 827 | ||
765 | /** | 828 | /** |
766 | * The feature id for the '<em><b>Relations</b></em>' containment reference list. | ||
767 | * <!-- begin-user-doc --> | ||
768 | * <!-- end-user-doc --> | ||
769 | * @generated | ||
770 | * @ordered | ||
771 | */ | ||
772 | int VEHICLE__RELATIONS = ACTOR__RELATIONS; | ||
773 | |||
774 | /** | ||
775 | * The feature id for the '<em><b>Placed On</b></em>' reference. | 829 | * The feature id for the '<em><b>Placed On</b></em>' reference. |
776 | * <!-- begin-user-doc --> | 830 | * <!-- begin-user-doc --> |
777 | * <!-- end-user-doc --> | 831 | * <!-- end-user-doc --> |
@@ -790,77 +844,77 @@ public interface CrossingScenarioPackage extends EPackage { | |||
790 | int VEHICLE__YSPEED = ACTOR__YSPEED; | 844 | int VEHICLE__YSPEED = ACTOR__YSPEED; |
791 | 845 | ||
792 | /** | 846 | /** |
793 | * The number of structural features of the '<em>Vehicle</em>' class. | 847 | * The feature id for the '<em><b>Dist near</b></em>' reference list. |
794 | * <!-- begin-user-doc --> | 848 | * <!-- begin-user-doc --> |
795 | * <!-- end-user-doc --> | 849 | * <!-- end-user-doc --> |
796 | * @generated | 850 | * @generated |
797 | * @ordered | 851 | * @ordered |
798 | */ | 852 | */ |
799 | int VEHICLE_FEATURE_COUNT = ACTOR_FEATURE_COUNT + 0; | 853 | int VEHICLE__DIST_NEAR = ACTOR__DIST_NEAR; |
800 | 854 | ||
801 | /** | 855 | /** |
802 | * The number of operations of the '<em>Vehicle</em>' class. | 856 | * The feature id for the '<em><b>Dist med</b></em>' reference list. |
803 | * <!-- begin-user-doc --> | 857 | * <!-- begin-user-doc --> |
804 | * <!-- end-user-doc --> | 858 | * <!-- end-user-doc --> |
805 | * @generated | 859 | * @generated |
806 | * @ordered | 860 | * @ordered |
807 | */ | 861 | */ |
808 | int VEHICLE_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0; | 862 | int VEHICLE__DIST_MED = ACTOR__DIST_MED; |
809 | 863 | ||
810 | /** | 864 | /** |
811 | * The meta object id for the '{@link crossingScenario.impl.Lane_HorizontalImpl <em>Lane Horizontal</em>}' class. | 865 | * The feature id for the '<em><b>Dist far</b></em>' reference list. |
812 | * <!-- begin-user-doc --> | 866 | * <!-- begin-user-doc --> |
813 | * <!-- end-user-doc --> | 867 | * <!-- end-user-doc --> |
814 | * @see crossingScenario.impl.Lane_HorizontalImpl | ||
815 | * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane_Horizontal() | ||
816 | * @generated | 868 | * @generated |
869 | * @ordered | ||
817 | */ | 870 | */ |
818 | int LANE_HORIZONTAL = 12; | 871 | int VEHICLE__DIST_FAR = ACTOR__DIST_FAR; |
819 | 872 | ||
820 | /** | 873 | /** |
821 | * The feature id for the '<em><b>Width</b></em>' attribute. | 874 | * The number of structural features of the '<em>Vehicle</em>' class. |
822 | * <!-- begin-user-doc --> | 875 | * <!-- begin-user-doc --> |
823 | * <!-- end-user-doc --> | 876 | * <!-- end-user-doc --> |
824 | * @generated | 877 | * @generated |
825 | * @ordered | 878 | * @ordered |
826 | */ | 879 | */ |
827 | int LANE_HORIZONTAL__WIDTH = LANE__WIDTH; | 880 | int VEHICLE_FEATURE_COUNT = ACTOR_FEATURE_COUNT + 0; |
828 | 881 | ||
829 | /** | 882 | /** |
830 | * The feature id for the '<em><b>Reference Coord</b></em>' attribute. | 883 | * The number of operations of the '<em>Vehicle</em>' class. |
831 | * <!-- begin-user-doc --> | 884 | * <!-- begin-user-doc --> |
832 | * <!-- end-user-doc --> | 885 | * <!-- end-user-doc --> |
833 | * @generated | 886 | * @generated |
834 | * @ordered | 887 | * @ordered |
835 | */ | 888 | */ |
836 | int LANE_HORIZONTAL__REFERENCE_COORD = LANE__REFERENCE_COORD; | 889 | int VEHICLE_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0; |
837 | 890 | ||
838 | /** | 891 | /** |
839 | * The feature id for the '<em><b>Prev Lane</b></em>' reference. | 892 | * The meta object id for the '{@link crossingScenario.impl.Lane_HorizontalImpl <em>Lane Horizontal</em>}' class. |
840 | * <!-- begin-user-doc --> | 893 | * <!-- begin-user-doc --> |
841 | * <!-- end-user-doc --> | 894 | * <!-- end-user-doc --> |
895 | * @see crossingScenario.impl.Lane_HorizontalImpl | ||
896 | * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane_Horizontal() | ||
842 | * @generated | 897 | * @generated |
843 | * @ordered | ||
844 | */ | 898 | */ |
845 | int LANE_HORIZONTAL__PREV_LANE = LANE__PREV_LANE; | 899 | int LANE_HORIZONTAL = 12; |
846 | 900 | ||
847 | /** | 901 | /** |
848 | * The feature id for the '<em><b>Actors</b></em>' reference list. | 902 | * The feature id for the '<em><b>Reference Coord</b></em>' attribute. |
849 | * <!-- begin-user-doc --> | 903 | * <!-- begin-user-doc --> |
850 | * <!-- end-user-doc --> | 904 | * <!-- end-user-doc --> |
851 | * @generated | 905 | * @generated |
852 | * @ordered | 906 | * @ordered |
853 | */ | 907 | */ |
854 | int LANE_HORIZONTAL__ACTORS = LANE__ACTORS; | 908 | int LANE_HORIZONTAL__REFERENCE_COORD = LANE__REFERENCE_COORD; |
855 | 909 | ||
856 | /** | 910 | /** |
857 | * The feature id for the '<em><b>Num Width</b></em>' attribute. | 911 | * The feature id for the '<em><b>Actors</b></em>' reference list. |
858 | * <!-- begin-user-doc --> | 912 | * <!-- begin-user-doc --> |
859 | * <!-- end-user-doc --> | 913 | * <!-- end-user-doc --> |
860 | * @generated | 914 | * @generated |
861 | * @ordered | 915 | * @ordered |
862 | */ | 916 | */ |
863 | int LANE_HORIZONTAL__NUM_WIDTH = LANE__NUM_WIDTH; | 917 | int LANE_HORIZONTAL__ACTORS = LANE__ACTORS; |
864 | 918 | ||
865 | /** | 919 | /** |
866 | * The number of structural features of the '<em>Lane Horizontal</em>' class. | 920 | * The number of structural features of the '<em>Lane Horizontal</em>' class. |
@@ -891,15 +945,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
891 | int LANE_VERTICAL = 13; | 945 | int LANE_VERTICAL = 13; |
892 | 946 | ||
893 | /** | 947 | /** |
894 | * The feature id for the '<em><b>Width</b></em>' attribute. | ||
895 | * <!-- begin-user-doc --> | ||
896 | * <!-- end-user-doc --> | ||
897 | * @generated | ||
898 | * @ordered | ||
899 | */ | ||
900 | int LANE_VERTICAL__WIDTH = LANE__WIDTH; | ||
901 | |||
902 | /** | ||
903 | * The feature id for the '<em><b>Reference Coord</b></em>' attribute. | 948 | * The feature id for the '<em><b>Reference Coord</b></em>' attribute. |
904 | * <!-- begin-user-doc --> | 949 | * <!-- begin-user-doc --> |
905 | * <!-- end-user-doc --> | 950 | * <!-- end-user-doc --> |
@@ -909,15 +954,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
909 | int LANE_VERTICAL__REFERENCE_COORD = LANE__REFERENCE_COORD; | 954 | int LANE_VERTICAL__REFERENCE_COORD = LANE__REFERENCE_COORD; |
910 | 955 | ||
911 | /** | 956 | /** |
912 | * The feature id for the '<em><b>Prev Lane</b></em>' reference. | ||
913 | * <!-- begin-user-doc --> | ||
914 | * <!-- end-user-doc --> | ||
915 | * @generated | ||
916 | * @ordered | ||
917 | */ | ||
918 | int LANE_VERTICAL__PREV_LANE = LANE__PREV_LANE; | ||
919 | |||
920 | /** | ||
921 | * The feature id for the '<em><b>Actors</b></em>' reference list. | 957 | * The feature id for the '<em><b>Actors</b></em>' reference list. |
922 | * <!-- begin-user-doc --> | 958 | * <!-- begin-user-doc --> |
923 | * <!-- end-user-doc --> | 959 | * <!-- end-user-doc --> |
@@ -927,15 +963,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
927 | int LANE_VERTICAL__ACTORS = LANE__ACTORS; | 963 | int LANE_VERTICAL__ACTORS = LANE__ACTORS; |
928 | 964 | ||
929 | /** | 965 | /** |
930 | * The feature id for the '<em><b>Num Width</b></em>' attribute. | ||
931 | * <!-- begin-user-doc --> | ||
932 | * <!-- end-user-doc --> | ||
933 | * @generated | ||
934 | * @ordered | ||
935 | */ | ||
936 | int LANE_VERTICAL__NUM_WIDTH = LANE__NUM_WIDTH; | ||
937 | |||
938 | /** | ||
939 | * The number of structural features of the '<em>Lane Vertical</em>' class. | 966 | * The number of structural features of the '<em>Lane Vertical</em>' class. |
940 | * <!-- begin-user-doc --> | 967 | * <!-- begin-user-doc --> |
941 | * <!-- end-user-doc --> | 968 | * <!-- end-user-doc --> |
@@ -954,16 +981,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
954 | int LANE_VERTICAL_OPERATION_COUNT = LANE_OPERATION_COUNT + 0; | 981 | int LANE_VERTICAL_OPERATION_COUNT = LANE_OPERATION_COUNT + 0; |
955 | 982 | ||
956 | /** | 983 | /** |
957 | * The meta object id for the '{@link crossingScenario.Size <em>Size</em>}' enum. | ||
958 | * <!-- begin-user-doc --> | ||
959 | * <!-- end-user-doc --> | ||
960 | * @see crossingScenario.Size | ||
961 | * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSize() | ||
962 | * @generated | ||
963 | */ | ||
964 | int SIZE = 14; | ||
965 | |||
966 | /** | ||
967 | * The meta object id for the '{@link crossingScenario.Distance <em>Distance</em>}' enum. | 984 | * The meta object id for the '{@link crossingScenario.Distance <em>Distance</em>}' enum. |
968 | * <!-- begin-user-doc --> | 985 | * <!-- begin-user-doc --> |
969 | * <!-- end-user-doc --> | 986 | * <!-- end-user-doc --> |
@@ -971,7 +988,7 @@ public interface CrossingScenarioPackage extends EPackage { | |||
971 | * @see crossingScenario.impl.CrossingScenarioPackageImpl#getDistance() | 988 | * @see crossingScenario.impl.CrossingScenarioPackageImpl#getDistance() |
972 | * @generated | 989 | * @generated |
973 | */ | 990 | */ |
974 | int DISTANCE = 15; | 991 | int DISTANCE = 14; |
975 | 992 | ||
976 | 993 | ||
977 | /** | 994 | /** |
@@ -1040,26 +1057,15 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1040 | EAttribute getCrossingScenario_MaxTime(); | 1057 | EAttribute getCrossingScenario_MaxTime(); |
1041 | 1058 | ||
1042 | /** | 1059 | /** |
1043 | * Returns the meta object for the reference '{@link crossingScenario.CrossingScenario#getHorizontal_head <em>Horizontal head</em>}'. | 1060 | * Returns the meta object for the containment reference list '{@link crossingScenario.CrossingScenario#getRelations <em>Relations</em>}'. |
1044 | * <!-- begin-user-doc --> | ||
1045 | * <!-- end-user-doc --> | ||
1046 | * @return the meta object for the reference '<em>Horizontal head</em>'. | ||
1047 | * @see crossingScenario.CrossingScenario#getHorizontal_head() | ||
1048 | * @see #getCrossingScenario() | ||
1049 | * @generated | ||
1050 | */ | ||
1051 | EReference getCrossingScenario_Horizontal_head(); | ||
1052 | |||
1053 | /** | ||
1054 | * Returns the meta object for the reference '{@link crossingScenario.CrossingScenario#getVertical_head <em>Vertical head</em>}'. | ||
1055 | * <!-- begin-user-doc --> | 1061 | * <!-- begin-user-doc --> |
1056 | * <!-- end-user-doc --> | 1062 | * <!-- end-user-doc --> |
1057 | * @return the meta object for the reference '<em>Vertical head</em>'. | 1063 | * @return the meta object for the containment reference list '<em>Relations</em>'. |
1058 | * @see crossingScenario.CrossingScenario#getVertical_head() | 1064 | * @see crossingScenario.CrossingScenario#getRelations() |
1059 | * @see #getCrossingScenario() | 1065 | * @see #getCrossingScenario() |
1060 | * @generated | 1066 | * @generated |
1061 | */ | 1067 | */ |
1062 | EReference getCrossingScenario_Vertical_head(); | 1068 | EReference getCrossingScenario_Relations(); |
1063 | 1069 | ||
1064 | /** | 1070 | /** |
1065 | * Returns the meta object for class '{@link crossingScenario.Lane <em>Lane</em>}'. | 1071 | * Returns the meta object for class '{@link crossingScenario.Lane <em>Lane</em>}'. |
@@ -1072,17 +1078,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1072 | EClass getLane(); | 1078 | EClass getLane(); |
1073 | 1079 | ||
1074 | /** | 1080 | /** |
1075 | * Returns the meta object for the attribute '{@link crossingScenario.Lane#getWidth <em>Width</em>}'. | ||
1076 | * <!-- begin-user-doc --> | ||
1077 | * <!-- end-user-doc --> | ||
1078 | * @return the meta object for the attribute '<em>Width</em>'. | ||
1079 | * @see crossingScenario.Lane#getWidth() | ||
1080 | * @see #getLane() | ||
1081 | * @generated | ||
1082 | */ | ||
1083 | EAttribute getLane_Width(); | ||
1084 | |||
1085 | /** | ||
1086 | * Returns the meta object for the attribute '{@link crossingScenario.Lane#getReferenceCoord <em>Reference Coord</em>}'. | 1081 | * Returns the meta object for the attribute '{@link crossingScenario.Lane#getReferenceCoord <em>Reference Coord</em>}'. |
1087 | * <!-- begin-user-doc --> | 1082 | * <!-- begin-user-doc --> |
1088 | * <!-- end-user-doc --> | 1083 | * <!-- end-user-doc --> |
@@ -1094,17 +1089,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1094 | EAttribute getLane_ReferenceCoord(); | 1089 | EAttribute getLane_ReferenceCoord(); |
1095 | 1090 | ||
1096 | /** | 1091 | /** |
1097 | * Returns the meta object for the reference '{@link crossingScenario.Lane#getPrevLane <em>Prev Lane</em>}'. | ||
1098 | * <!-- begin-user-doc --> | ||
1099 | * <!-- end-user-doc --> | ||
1100 | * @return the meta object for the reference '<em>Prev Lane</em>'. | ||
1101 | * @see crossingScenario.Lane#getPrevLane() | ||
1102 | * @see #getLane() | ||
1103 | * @generated | ||
1104 | */ | ||
1105 | EReference getLane_PrevLane(); | ||
1106 | |||
1107 | /** | ||
1108 | * Returns the meta object for the reference list '{@link crossingScenario.Lane#getActors <em>Actors</em>}'. | 1092 | * Returns the meta object for the reference list '{@link crossingScenario.Lane#getActors <em>Actors</em>}'. |
1109 | * <!-- begin-user-doc --> | 1093 | * <!-- begin-user-doc --> |
1110 | * <!-- end-user-doc --> | 1094 | * <!-- end-user-doc --> |
@@ -1116,17 +1100,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1116 | EReference getLane_Actors(); | 1100 | EReference getLane_Actors(); |
1117 | 1101 | ||
1118 | /** | 1102 | /** |
1119 | * Returns the meta object for the attribute '{@link crossingScenario.Lane#getNumWidth <em>Num Width</em>}'. | ||
1120 | * <!-- begin-user-doc --> | ||
1121 | * <!-- end-user-doc --> | ||
1122 | * @return the meta object for the attribute '<em>Num Width</em>'. | ||
1123 | * @see crossingScenario.Lane#getNumWidth() | ||
1124 | * @see #getLane() | ||
1125 | * @generated | ||
1126 | */ | ||
1127 | EAttribute getLane_NumWidth(); | ||
1128 | |||
1129 | /** | ||
1130 | * Returns the meta object for class '{@link crossingScenario.Actor <em>Actor</em>}'. | 1103 | * Returns the meta object for class '{@link crossingScenario.Actor <em>Actor</em>}'. |
1131 | * <!-- begin-user-doc --> | 1104 | * <!-- begin-user-doc --> |
1132 | * <!-- end-user-doc --> | 1105 | * <!-- end-user-doc --> |
@@ -1192,17 +1165,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1192 | EAttribute getActor_XSpeed(); | 1165 | EAttribute getActor_XSpeed(); |
1193 | 1166 | ||
1194 | /** | 1167 | /** |
1195 | * Returns the meta object for the containment reference list '{@link crossingScenario.Actor#getRelations <em>Relations</em>}'. | ||
1196 | * <!-- begin-user-doc --> | ||
1197 | * <!-- end-user-doc --> | ||
1198 | * @return the meta object for the containment reference list '<em>Relations</em>'. | ||
1199 | * @see crossingScenario.Actor#getRelations() | ||
1200 | * @see #getActor() | ||
1201 | * @generated | ||
1202 | */ | ||
1203 | EReference getActor_Relations(); | ||
1204 | |||
1205 | /** | ||
1206 | * Returns the meta object for the reference '{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}'. | 1168 | * Returns the meta object for the reference '{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}'. |
1207 | * <!-- begin-user-doc --> | 1169 | * <!-- begin-user-doc --> |
1208 | * <!-- end-user-doc --> | 1170 | * <!-- end-user-doc --> |
@@ -1225,6 +1187,39 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1225 | EAttribute getActor_YSpeed(); | 1187 | EAttribute getActor_YSpeed(); |
1226 | 1188 | ||
1227 | /** | 1189 | /** |
1190 | * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_near <em>Dist near</em>}'. | ||
1191 | * <!-- begin-user-doc --> | ||
1192 | * <!-- end-user-doc --> | ||
1193 | * @return the meta object for the reference list '<em>Dist near</em>'. | ||
1194 | * @see crossingScenario.Actor#getDist_near() | ||
1195 | * @see #getActor() | ||
1196 | * @generated | ||
1197 | */ | ||
1198 | EReference getActor_Dist_near(); | ||
1199 | |||
1200 | /** | ||
1201 | * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_med <em>Dist med</em>}'. | ||
1202 | * <!-- begin-user-doc --> | ||
1203 | * <!-- end-user-doc --> | ||
1204 | * @return the meta object for the reference list '<em>Dist med</em>'. | ||
1205 | * @see crossingScenario.Actor#getDist_med() | ||
1206 | * @see #getActor() | ||
1207 | * @generated | ||
1208 | */ | ||
1209 | EReference getActor_Dist_med(); | ||
1210 | |||
1211 | /** | ||
1212 | * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_far <em>Dist far</em>}'. | ||
1213 | * <!-- begin-user-doc --> | ||
1214 | * <!-- end-user-doc --> | ||
1215 | * @return the meta object for the reference list '<em>Dist far</em>'. | ||
1216 | * @see crossingScenario.Actor#getDist_far() | ||
1217 | * @see #getActor() | ||
1218 | * @generated | ||
1219 | */ | ||
1220 | EReference getActor_Dist_far(); | ||
1221 | |||
1222 | /** | ||
1228 | * Returns the meta object for class '{@link crossingScenario.Relation <em>Relation</em>}'. | 1223 | * Returns the meta object for class '{@link crossingScenario.Relation <em>Relation</em>}'. |
1229 | * <!-- begin-user-doc --> | 1224 | * <!-- begin-user-doc --> |
1230 | * <!-- end-user-doc --> | 1225 | * <!-- end-user-doc --> |
@@ -1246,6 +1241,17 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1246 | EReference getRelation_Target(); | 1241 | EReference getRelation_Target(); |
1247 | 1242 | ||
1248 | /** | 1243 | /** |
1244 | * Returns the meta object for the reference '{@link crossingScenario.Relation#getSource <em>Source</em>}'. | ||
1245 | * <!-- begin-user-doc --> | ||
1246 | * <!-- end-user-doc --> | ||
1247 | * @return the meta object for the reference '<em>Source</em>'. | ||
1248 | * @see crossingScenario.Relation#getSource() | ||
1249 | * @see #getRelation() | ||
1250 | * @generated | ||
1251 | */ | ||
1252 | EReference getRelation_Source(); | ||
1253 | |||
1254 | /** | ||
1249 | * Returns the meta object for class '{@link crossingScenario.SpatialRelation <em>Spatial Relation</em>}'. | 1255 | * Returns the meta object for class '{@link crossingScenario.SpatialRelation <em>Spatial Relation</em>}'. |
1250 | * <!-- begin-user-doc --> | 1256 | * <!-- begin-user-doc --> |
1251 | * <!-- end-user-doc --> | 1257 | * <!-- end-user-doc --> |
@@ -1379,16 +1385,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1379 | EClass getLane_Vertical(); | 1385 | EClass getLane_Vertical(); |
1380 | 1386 | ||
1381 | /** | 1387 | /** |
1382 | * Returns the meta object for enum '{@link crossingScenario.Size <em>Size</em>}'. | ||
1383 | * <!-- begin-user-doc --> | ||
1384 | * <!-- end-user-doc --> | ||
1385 | * @return the meta object for enum '<em>Size</em>'. | ||
1386 | * @see crossingScenario.Size | ||
1387 | * @generated | ||
1388 | */ | ||
1389 | EEnum getSize(); | ||
1390 | |||
1391 | /** | ||
1392 | * Returns the meta object for enum '{@link crossingScenario.Distance <em>Distance</em>}'. | 1388 | * Returns the meta object for enum '{@link crossingScenario.Distance <em>Distance</em>}'. |
1393 | * <!-- begin-user-doc --> | 1389 | * <!-- begin-user-doc --> |
1394 | * <!-- end-user-doc --> | 1390 | * <!-- end-user-doc --> |
@@ -1472,20 +1468,12 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1472 | EAttribute CROSSING_SCENARIO__MAX_TIME = eINSTANCE.getCrossingScenario_MaxTime(); | 1468 | EAttribute CROSSING_SCENARIO__MAX_TIME = eINSTANCE.getCrossingScenario_MaxTime(); |
1473 | 1469 | ||
1474 | /** | 1470 | /** |
1475 | * The meta object literal for the '<em><b>Horizontal head</b></em>' reference feature. | 1471 | * The meta object literal for the '<em><b>Relations</b></em>' containment reference list feature. |
1476 | * <!-- begin-user-doc --> | ||
1477 | * <!-- end-user-doc --> | ||
1478 | * @generated | ||
1479 | */ | ||
1480 | EReference CROSSING_SCENARIO__HORIZONTAL_HEAD = eINSTANCE.getCrossingScenario_Horizontal_head(); | ||
1481 | |||
1482 | /** | ||
1483 | * The meta object literal for the '<em><b>Vertical head</b></em>' reference feature. | ||
1484 | * <!-- begin-user-doc --> | 1472 | * <!-- begin-user-doc --> |
1485 | * <!-- end-user-doc --> | 1473 | * <!-- end-user-doc --> |
1486 | * @generated | 1474 | * @generated |
1487 | */ | 1475 | */ |
1488 | EReference CROSSING_SCENARIO__VERTICAL_HEAD = eINSTANCE.getCrossingScenario_Vertical_head(); | 1476 | EReference CROSSING_SCENARIO__RELATIONS = eINSTANCE.getCrossingScenario_Relations(); |
1489 | 1477 | ||
1490 | /** | 1478 | /** |
1491 | * The meta object literal for the '{@link crossingScenario.impl.LaneImpl <em>Lane</em>}' class. | 1479 | * The meta object literal for the '{@link crossingScenario.impl.LaneImpl <em>Lane</em>}' class. |
@@ -1498,14 +1486,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1498 | EClass LANE = eINSTANCE.getLane(); | 1486 | EClass LANE = eINSTANCE.getLane(); |
1499 | 1487 | ||
1500 | /** | 1488 | /** |
1501 | * The meta object literal for the '<em><b>Width</b></em>' attribute feature. | ||
1502 | * <!-- begin-user-doc --> | ||
1503 | * <!-- end-user-doc --> | ||
1504 | * @generated | ||
1505 | */ | ||
1506 | EAttribute LANE__WIDTH = eINSTANCE.getLane_Width(); | ||
1507 | |||
1508 | /** | ||
1509 | * The meta object literal for the '<em><b>Reference Coord</b></em>' attribute feature. | 1489 | * The meta object literal for the '<em><b>Reference Coord</b></em>' attribute feature. |
1510 | * <!-- begin-user-doc --> | 1490 | * <!-- begin-user-doc --> |
1511 | * <!-- end-user-doc --> | 1491 | * <!-- end-user-doc --> |
@@ -1514,14 +1494,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1514 | EAttribute LANE__REFERENCE_COORD = eINSTANCE.getLane_ReferenceCoord(); | 1494 | EAttribute LANE__REFERENCE_COORD = eINSTANCE.getLane_ReferenceCoord(); |
1515 | 1495 | ||
1516 | /** | 1496 | /** |
1517 | * The meta object literal for the '<em><b>Prev Lane</b></em>' reference feature. | ||
1518 | * <!-- begin-user-doc --> | ||
1519 | * <!-- end-user-doc --> | ||
1520 | * @generated | ||
1521 | */ | ||
1522 | EReference LANE__PREV_LANE = eINSTANCE.getLane_PrevLane(); | ||
1523 | |||
1524 | /** | ||
1525 | * The meta object literal for the '<em><b>Actors</b></em>' reference list feature. | 1497 | * The meta object literal for the '<em><b>Actors</b></em>' reference list feature. |
1526 | * <!-- begin-user-doc --> | 1498 | * <!-- begin-user-doc --> |
1527 | * <!-- end-user-doc --> | 1499 | * <!-- end-user-doc --> |
@@ -1530,14 +1502,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1530 | EReference LANE__ACTORS = eINSTANCE.getLane_Actors(); | 1502 | EReference LANE__ACTORS = eINSTANCE.getLane_Actors(); |
1531 | 1503 | ||
1532 | /** | 1504 | /** |
1533 | * The meta object literal for the '<em><b>Num Width</b></em>' attribute feature. | ||
1534 | * <!-- begin-user-doc --> | ||
1535 | * <!-- end-user-doc --> | ||
1536 | * @generated | ||
1537 | */ | ||
1538 | EAttribute LANE__NUM_WIDTH = eINSTANCE.getLane_NumWidth(); | ||
1539 | |||
1540 | /** | ||
1541 | * The meta object literal for the '{@link crossingScenario.impl.ActorImpl <em>Actor</em>}' class. | 1505 | * The meta object literal for the '{@link crossingScenario.impl.ActorImpl <em>Actor</em>}' class. |
1542 | * <!-- begin-user-doc --> | 1506 | * <!-- begin-user-doc --> |
1543 | * <!-- end-user-doc --> | 1507 | * <!-- end-user-doc --> |
@@ -1588,28 +1552,44 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1588 | EAttribute ACTOR__XSPEED = eINSTANCE.getActor_XSpeed(); | 1552 | EAttribute ACTOR__XSPEED = eINSTANCE.getActor_XSpeed(); |
1589 | 1553 | ||
1590 | /** | 1554 | /** |
1591 | * The meta object literal for the '<em><b>Relations</b></em>' containment reference list feature. | 1555 | * The meta object literal for the '<em><b>Placed On</b></em>' reference feature. |
1592 | * <!-- begin-user-doc --> | 1556 | * <!-- begin-user-doc --> |
1593 | * <!-- end-user-doc --> | 1557 | * <!-- end-user-doc --> |
1594 | * @generated | 1558 | * @generated |
1595 | */ | 1559 | */ |
1596 | EReference ACTOR__RELATIONS = eINSTANCE.getActor_Relations(); | 1560 | EReference ACTOR__PLACED_ON = eINSTANCE.getActor_PlacedOn(); |
1597 | 1561 | ||
1598 | /** | 1562 | /** |
1599 | * The meta object literal for the '<em><b>Placed On</b></em>' reference feature. | 1563 | * The meta object literal for the '<em><b>YSpeed</b></em>' attribute feature. |
1600 | * <!-- begin-user-doc --> | 1564 | * <!-- begin-user-doc --> |
1601 | * <!-- end-user-doc --> | 1565 | * <!-- end-user-doc --> |
1602 | * @generated | 1566 | * @generated |
1603 | */ | 1567 | */ |
1604 | EReference ACTOR__PLACED_ON = eINSTANCE.getActor_PlacedOn(); | 1568 | EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed(); |
1605 | 1569 | ||
1606 | /** | 1570 | /** |
1607 | * The meta object literal for the '<em><b>YSpeed</b></em>' attribute feature. | 1571 | * The meta object literal for the '<em><b>Dist near</b></em>' reference list feature. |
1608 | * <!-- begin-user-doc --> | 1572 | * <!-- begin-user-doc --> |
1609 | * <!-- end-user-doc --> | 1573 | * <!-- end-user-doc --> |
1610 | * @generated | 1574 | * @generated |
1611 | */ | 1575 | */ |
1612 | EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed(); | 1576 | EReference ACTOR__DIST_NEAR = eINSTANCE.getActor_Dist_near(); |
1577 | |||
1578 | /** | ||
1579 | * The meta object literal for the '<em><b>Dist med</b></em>' reference list feature. | ||
1580 | * <!-- begin-user-doc --> | ||
1581 | * <!-- end-user-doc --> | ||
1582 | * @generated | ||
1583 | */ | ||
1584 | EReference ACTOR__DIST_MED = eINSTANCE.getActor_Dist_med(); | ||
1585 | |||
1586 | /** | ||
1587 | * The meta object literal for the '<em><b>Dist far</b></em>' reference list feature. | ||
1588 | * <!-- begin-user-doc --> | ||
1589 | * <!-- end-user-doc --> | ||
1590 | * @generated | ||
1591 | */ | ||
1592 | EReference ACTOR__DIST_FAR = eINSTANCE.getActor_Dist_far(); | ||
1613 | 1593 | ||
1614 | /** | 1594 | /** |
1615 | * The meta object literal for the '{@link crossingScenario.impl.RelationImpl <em>Relation</em>}' class. | 1595 | * The meta object literal for the '{@link crossingScenario.impl.RelationImpl <em>Relation</em>}' class. |
@@ -1630,6 +1610,14 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1630 | EReference RELATION__TARGET = eINSTANCE.getRelation_Target(); | 1610 | EReference RELATION__TARGET = eINSTANCE.getRelation_Target(); |
1631 | 1611 | ||
1632 | /** | 1612 | /** |
1613 | * The meta object literal for the '<em><b>Source</b></em>' reference feature. | ||
1614 | * <!-- begin-user-doc --> | ||
1615 | * <!-- end-user-doc --> | ||
1616 | * @generated | ||
1617 | */ | ||
1618 | EReference RELATION__SOURCE = eINSTANCE.getRelation_Source(); | ||
1619 | |||
1620 | /** | ||
1633 | * The meta object literal for the '{@link crossingScenario.impl.SpatialRelationImpl <em>Spatial Relation</em>}' class. | 1621 | * The meta object literal for the '{@link crossingScenario.impl.SpatialRelationImpl <em>Spatial Relation</em>}' class. |
1634 | * <!-- begin-user-doc --> | 1622 | * <!-- begin-user-doc --> |
1635 | * <!-- end-user-doc --> | 1623 | * <!-- end-user-doc --> |
@@ -1754,16 +1742,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1754 | EClass LANE_VERTICAL = eINSTANCE.getLane_Vertical(); | 1742 | EClass LANE_VERTICAL = eINSTANCE.getLane_Vertical(); |
1755 | 1743 | ||
1756 | /** | 1744 | /** |
1757 | * The meta object literal for the '{@link crossingScenario.Size <em>Size</em>}' enum. | ||
1758 | * <!-- begin-user-doc --> | ||
1759 | * <!-- end-user-doc --> | ||
1760 | * @see crossingScenario.Size | ||
1761 | * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSize() | ||
1762 | * @generated | ||
1763 | */ | ||
1764 | EEnum SIZE = eINSTANCE.getSize(); | ||
1765 | |||
1766 | /** | ||
1767 | * The meta object literal for the '{@link crossingScenario.Distance <em>Distance</em>}' enum. | 1745 | * The meta object literal for the '{@link crossingScenario.Distance <em>Distance</em>}' enum. |
1768 | * <!-- begin-user-doc --> | 1746 | * <!-- begin-user-doc --> |
1769 | * <!-- end-user-doc --> | 1747 | * <!-- end-user-doc --> |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java index d27cf644..ef45e1b9 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java | |||
@@ -15,11 +15,8 @@ import org.eclipse.emf.ecore.EObject; | |||
15 | * The following features are supported: | 15 | * The following features are supported: |
16 | * </p> | 16 | * </p> |
17 | * <ul> | 17 | * <ul> |
18 | * <li>{@link crossingScenario.Lane#getWidth <em>Width</em>}</li> | ||
19 | * <li>{@link crossingScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li> | 18 | * <li>{@link crossingScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li> |
20 | * <li>{@link crossingScenario.Lane#getPrevLane <em>Prev Lane</em>}</li> | ||
21 | * <li>{@link crossingScenario.Lane#getActors <em>Actors</em>}</li> | 19 | * <li>{@link crossingScenario.Lane#getActors <em>Actors</em>}</li> |
22 | * <li>{@link crossingScenario.Lane#getNumWidth <em>Num Width</em>}</li> | ||
23 | * </ul> | 20 | * </ul> |
24 | * | 21 | * |
25 | * @see crossingScenario.CrossingScenarioPackage#getLane() | 22 | * @see crossingScenario.CrossingScenarioPackage#getLane() |
@@ -28,31 +25,6 @@ import org.eclipse.emf.ecore.EObject; | |||
28 | */ | 25 | */ |
29 | public interface Lane extends EObject { | 26 | public interface Lane extends EObject { |
30 | /** | 27 | /** |
31 | * Returns the value of the '<em><b>Width</b></em>' attribute. | ||
32 | * The literals are from the enumeration {@link crossingScenario.Size}. | ||
33 | * <!-- begin-user-doc --> | ||
34 | * <!-- end-user-doc --> | ||
35 | * @return the value of the '<em>Width</em>' attribute. | ||
36 | * @see crossingScenario.Size | ||
37 | * @see #setWidth(Size) | ||
38 | * @see crossingScenario.CrossingScenarioPackage#getLane_Width() | ||
39 | * @model required="true" | ||
40 | * @generated | ||
41 | */ | ||
42 | Size getWidth(); | ||
43 | |||
44 | /** | ||
45 | * Sets the value of the '{@link crossingScenario.Lane#getWidth <em>Width</em>}' attribute. | ||
46 | * <!-- begin-user-doc --> | ||
47 | * <!-- end-user-doc --> | ||
48 | * @param value the new value of the '<em>Width</em>' attribute. | ||
49 | * @see crossingScenario.Size | ||
50 | * @see #getWidth() | ||
51 | * @generated | ||
52 | */ | ||
53 | void setWidth(Size value); | ||
54 | |||
55 | /** | ||
56 | * Returns the value of the '<em><b>Reference Coord</b></em>' attribute. | 28 | * Returns the value of the '<em><b>Reference Coord</b></em>' attribute. |
57 | * <!-- begin-user-doc --> | 29 | * <!-- begin-user-doc --> |
58 | * <!-- end-user-doc --> | 30 | * <!-- end-user-doc --> |
@@ -75,28 +47,6 @@ public interface Lane extends EObject { | |||
75 | void setReferenceCoord(double value); | 47 | void setReferenceCoord(double value); |
76 | 48 | ||
77 | /** | 49 | /** |
78 | * Returns the value of the '<em><b>Prev Lane</b></em>' reference. | ||
79 | * <!-- begin-user-doc --> | ||
80 | * <!-- end-user-doc --> | ||
81 | * @return the value of the '<em>Prev Lane</em>' reference. | ||
82 | * @see #setPrevLane(Lane) | ||
83 | * @see crossingScenario.CrossingScenarioPackage#getLane_PrevLane() | ||
84 | * @model | ||
85 | * @generated | ||
86 | */ | ||
87 | Lane getPrevLane(); | ||
88 | |||
89 | /** | ||
90 | * Sets the value of the '{@link crossingScenario.Lane#getPrevLane <em>Prev Lane</em>}' reference. | ||
91 | * <!-- begin-user-doc --> | ||
92 | * <!-- end-user-doc --> | ||
93 | * @param value the new value of the '<em>Prev Lane</em>' reference. | ||
94 | * @see #getPrevLane() | ||
95 | * @generated | ||
96 | */ | ||
97 | void setPrevLane(Lane value); | ||
98 | |||
99 | /** | ||
100 | * Returns the value of the '<em><b>Actors</b></em>' reference list. | 50 | * Returns the value of the '<em><b>Actors</b></em>' reference list. |
101 | * The list contents are of type {@link crossingScenario.Actor}. | 51 | * The list contents are of type {@link crossingScenario.Actor}. |
102 | * It is bidirectional and its opposite is '{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}'. | 52 | * It is bidirectional and its opposite is '{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}'. |
@@ -110,27 +60,4 @@ public interface Lane extends EObject { | |||
110 | */ | 60 | */ |
111 | EList<Actor> getActors(); | 61 | EList<Actor> getActors(); |
112 | 62 | ||
113 | /** | ||
114 | * Returns the value of the '<em><b>Num Width</b></em>' attribute. | ||
115 | * The default value is <code>"0.0"</code>. | ||
116 | * <!-- begin-user-doc --> | ||
117 | * <!-- end-user-doc --> | ||
118 | * @return the value of the '<em>Num Width</em>' attribute. | ||
119 | * @see #setNumWidth(double) | ||
120 | * @see crossingScenario.CrossingScenarioPackage#getLane_NumWidth() | ||
121 | * @model default="0.0" required="true" | ||
122 | * @generated | ||
123 | */ | ||
124 | double getNumWidth(); | ||
125 | |||
126 | /** | ||
127 | * Sets the value of the '{@link crossingScenario.Lane#getNumWidth <em>Num Width</em>}' attribute. | ||
128 | * <!-- begin-user-doc --> | ||
129 | * <!-- end-user-doc --> | ||
130 | * @param value the new value of the '<em>Num Width</em>' attribute. | ||
131 | * @see #getNumWidth() | ||
132 | * @generated | ||
133 | */ | ||
134 | void setNumWidth(double value); | ||
135 | |||
136 | } // Lane | 63 | } // Lane |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Relation.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Relation.java index 213f4df2..75a3f58f 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/Relation.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Relation.java | |||
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.EObject; | |||
14 | * </p> | 14 | * </p> |
15 | * <ul> | 15 | * <ul> |
16 | * <li>{@link crossingScenario.Relation#getTarget <em>Target</em>}</li> | 16 | * <li>{@link crossingScenario.Relation#getTarget <em>Target</em>}</li> |
17 | * <li>{@link crossingScenario.Relation#getSource <em>Source</em>}</li> | ||
17 | * </ul> | 18 | * </ul> |
18 | * | 19 | * |
19 | * @see crossingScenario.CrossingScenarioPackage#getRelation() | 20 | * @see crossingScenario.CrossingScenarioPackage#getRelation() |
@@ -43,4 +44,26 @@ public interface Relation extends EObject { | |||
43 | */ | 44 | */ |
44 | void setTarget(Actor value); | 45 | void setTarget(Actor value); |
45 | 46 | ||
47 | /** | ||
48 | * Returns the value of the '<em><b>Source</b></em>' reference. | ||
49 | * <!-- begin-user-doc --> | ||
50 | * <!-- end-user-doc --> | ||
51 | * @return the value of the '<em>Source</em>' reference. | ||
52 | * @see #setSource(Actor) | ||
53 | * @see crossingScenario.CrossingScenarioPackage#getRelation_Source() | ||
54 | * @model required="true" | ||
55 | * @generated | ||
56 | */ | ||
57 | Actor getSource(); | ||
58 | |||
59 | /** | ||
60 | * Sets the value of the '{@link crossingScenario.Relation#getSource <em>Source</em>}' reference. | ||
61 | * <!-- begin-user-doc --> | ||
62 | * <!-- end-user-doc --> | ||
63 | * @param value the new value of the '<em>Source</em>' reference. | ||
64 | * @see #getSource() | ||
65 | * @generated | ||
66 | */ | ||
67 | void setSource(Actor value); | ||
68 | |||
46 | } // Relation | 69 | } // Relation |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java index 46e60ec2..a308360b 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java | |||
@@ -5,8 +5,6 @@ package crossingScenario.impl; | |||
5 | import crossingScenario.Actor; | 5 | import crossingScenario.Actor; |
6 | import crossingScenario.CrossingScenarioPackage; | 6 | import crossingScenario.CrossingScenarioPackage; |
7 | import crossingScenario.Lane; | 7 | import crossingScenario.Lane; |
8 | import crossingScenario.Relation; | ||
9 | |||
10 | import java.util.Collection; | 8 | import java.util.Collection; |
11 | 9 | ||
12 | import org.eclipse.emf.common.notify.Notification; | 10 | import org.eclipse.emf.common.notify.Notification; |
@@ -20,9 +18,6 @@ import org.eclipse.emf.ecore.InternalEObject; | |||
20 | import org.eclipse.emf.ecore.impl.ENotificationImpl; | 18 | import org.eclipse.emf.ecore.impl.ENotificationImpl; |
21 | import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; | 19 | import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; |
22 | 20 | ||
23 | import org.eclipse.emf.ecore.util.EObjectContainmentEList; | ||
24 | import org.eclipse.emf.ecore.util.InternalEList; | ||
25 | |||
26 | /** | 21 | /** |
27 | * <!-- begin-user-doc --> | 22 | * <!-- begin-user-doc --> |
28 | * An implementation of the model object '<em><b>Actor</b></em>'. | 23 | * An implementation of the model object '<em><b>Actor</b></em>'. |
@@ -36,9 +31,11 @@ import org.eclipse.emf.ecore.util.InternalEList; | |||
36 | * <li>{@link crossingScenario.impl.ActorImpl#getLength <em>Length</em>}</li> | 31 | * <li>{@link crossingScenario.impl.ActorImpl#getLength <em>Length</em>}</li> |
37 | * <li>{@link crossingScenario.impl.ActorImpl#getWidth <em>Width</em>}</li> | 32 | * <li>{@link crossingScenario.impl.ActorImpl#getWidth <em>Width</em>}</li> |
38 | * <li>{@link crossingScenario.impl.ActorImpl#getXSpeed <em>XSpeed</em>}</li> | 33 | * <li>{@link crossingScenario.impl.ActorImpl#getXSpeed <em>XSpeed</em>}</li> |
39 | * <li>{@link crossingScenario.impl.ActorImpl#getRelations <em>Relations</em>}</li> | ||
40 | * <li>{@link crossingScenario.impl.ActorImpl#getPlacedOn <em>Placed On</em>}</li> | 34 | * <li>{@link crossingScenario.impl.ActorImpl#getPlacedOn <em>Placed On</em>}</li> |
41 | * <li>{@link crossingScenario.impl.ActorImpl#getYSpeed <em>YSpeed</em>}</li> | 35 | * <li>{@link crossingScenario.impl.ActorImpl#getYSpeed <em>YSpeed</em>}</li> |
36 | * <li>{@link crossingScenario.impl.ActorImpl#getDist_near <em>Dist near</em>}</li> | ||
37 | * <li>{@link crossingScenario.impl.ActorImpl#getDist_med <em>Dist med</em>}</li> | ||
38 | * <li>{@link crossingScenario.impl.ActorImpl#getDist_far <em>Dist far</em>}</li> | ||
42 | * </ul> | 39 | * </ul> |
43 | * | 40 | * |
44 | * @generated | 41 | * @generated |
@@ -145,16 +142,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
145 | protected double xSpeed = XSPEED_EDEFAULT; | 142 | protected double xSpeed = XSPEED_EDEFAULT; |
146 | 143 | ||
147 | /** | 144 | /** |
148 | * The cached value of the '{@link #getRelations() <em>Relations</em>}' containment reference list. | ||
149 | * <!-- begin-user-doc --> | ||
150 | * <!-- end-user-doc --> | ||
151 | * @see #getRelations() | ||
152 | * @generated | ||
153 | * @ordered | ||
154 | */ | ||
155 | protected EList<Relation> relations; | ||
156 | |||
157 | /** | ||
158 | * The cached value of the '{@link #getPlacedOn() <em>Placed On</em>}' reference. | 145 | * The cached value of the '{@link #getPlacedOn() <em>Placed On</em>}' reference. |
159 | * <!-- begin-user-doc --> | 146 | * <!-- begin-user-doc --> |
160 | * <!-- end-user-doc --> | 147 | * <!-- end-user-doc --> |
@@ -324,19 +311,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
324 | * @generated | 311 | * @generated |
325 | */ | 312 | */ |
326 | @Override | 313 | @Override |
327 | public EList<Relation> getRelations() { | ||
328 | if (relations == null) { | ||
329 | relations = new EObjectContainmentEList<Relation>(Relation.class, this, CrossingScenarioPackage.ACTOR__RELATIONS); | ||
330 | } | ||
331 | return relations; | ||
332 | } | ||
333 | |||
334 | /** | ||
335 | * <!-- begin-user-doc --> | ||
336 | * <!-- end-user-doc --> | ||
337 | * @generated | ||
338 | */ | ||
339 | @Override | ||
340 | public Lane getPlacedOn() { | 314 | public Lane getPlacedOn() { |
341 | if (placedOn != null && placedOn.eIsProxy()) { | 315 | if (placedOn != null && placedOn.eIsProxy()) { |
342 | InternalEObject oldPlacedOn = (InternalEObject)placedOn; | 316 | InternalEObject oldPlacedOn = (InternalEObject)placedOn; |
@@ -422,6 +396,48 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
422 | * @generated | 396 | * @generated |
423 | */ | 397 | */ |
424 | @Override | 398 | @Override |
399 | public EList<Actor> getDist_near() { | ||
400 | // TODO: implement this method to return the 'Dist near' reference list | ||
401 | // Ensure that you remove @generated or mark it @generated NOT | ||
402 | // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting | ||
403 | // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. | ||
404 | throw new UnsupportedOperationException(); | ||
405 | } | ||
406 | |||
407 | /** | ||
408 | * <!-- begin-user-doc --> | ||
409 | * <!-- end-user-doc --> | ||
410 | * @generated | ||
411 | */ | ||
412 | @Override | ||
413 | public EList<Actor> getDist_med() { | ||
414 | // TODO: implement this method to return the 'Dist med' reference list | ||
415 | // Ensure that you remove @generated or mark it @generated NOT | ||
416 | // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting | ||
417 | // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. | ||
418 | throw new UnsupportedOperationException(); | ||
419 | } | ||
420 | |||
421 | /** | ||
422 | * <!-- begin-user-doc --> | ||
423 | * <!-- end-user-doc --> | ||
424 | * @generated | ||
425 | */ | ||
426 | @Override | ||
427 | public EList<Actor> getDist_far() { | ||
428 | // TODO: implement this method to return the 'Dist far' reference list | ||
429 | // Ensure that you remove @generated or mark it @generated NOT | ||
430 | // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting | ||
431 | // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. | ||
432 | throw new UnsupportedOperationException(); | ||
433 | } | ||
434 | |||
435 | /** | ||
436 | * <!-- begin-user-doc --> | ||
437 | * <!-- end-user-doc --> | ||
438 | * @generated | ||
439 | */ | ||
440 | @Override | ||
425 | public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { | 441 | public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { |
426 | switch (featureID) { | 442 | switch (featureID) { |
427 | case CrossingScenarioPackage.ACTOR__PLACED_ON: | 443 | case CrossingScenarioPackage.ACTOR__PLACED_ON: |
@@ -440,8 +456,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
440 | @Override | 456 | @Override |
441 | public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { | 457 | public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { |
442 | switch (featureID) { | 458 | switch (featureID) { |
443 | case CrossingScenarioPackage.ACTOR__RELATIONS: | ||
444 | return ((InternalEList<?>)getRelations()).basicRemove(otherEnd, msgs); | ||
445 | case CrossingScenarioPackage.ACTOR__PLACED_ON: | 459 | case CrossingScenarioPackage.ACTOR__PLACED_ON: |
446 | return basicSetPlacedOn(null, msgs); | 460 | return basicSetPlacedOn(null, msgs); |
447 | } | 461 | } |
@@ -466,13 +480,17 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
466 | return getWidth(); | 480 | return getWidth(); |
467 | case CrossingScenarioPackage.ACTOR__XSPEED: | 481 | case CrossingScenarioPackage.ACTOR__XSPEED: |
468 | return getXSpeed(); | 482 | return getXSpeed(); |
469 | case CrossingScenarioPackage.ACTOR__RELATIONS: | ||
470 | return getRelations(); | ||
471 | case CrossingScenarioPackage.ACTOR__PLACED_ON: | 483 | case CrossingScenarioPackage.ACTOR__PLACED_ON: |
472 | if (resolve) return getPlacedOn(); | 484 | if (resolve) return getPlacedOn(); |
473 | return basicGetPlacedOn(); | 485 | return basicGetPlacedOn(); |
474 | case CrossingScenarioPackage.ACTOR__YSPEED: | 486 | case CrossingScenarioPackage.ACTOR__YSPEED: |
475 | return getYSpeed(); | 487 | return getYSpeed(); |
488 | case CrossingScenarioPackage.ACTOR__DIST_NEAR: | ||
489 | return getDist_near(); | ||
490 | case CrossingScenarioPackage.ACTOR__DIST_MED: | ||
491 | return getDist_med(); | ||
492 | case CrossingScenarioPackage.ACTOR__DIST_FAR: | ||
493 | return getDist_far(); | ||
476 | } | 494 | } |
477 | return super.eGet(featureID, resolve, coreType); | 495 | return super.eGet(featureID, resolve, coreType); |
478 | } | 496 | } |
@@ -501,16 +519,24 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
501 | case CrossingScenarioPackage.ACTOR__XSPEED: | 519 | case CrossingScenarioPackage.ACTOR__XSPEED: |
502 | setXSpeed((Double)newValue); | 520 | setXSpeed((Double)newValue); |
503 | return; | 521 | return; |
504 | case CrossingScenarioPackage.ACTOR__RELATIONS: | ||
505 | getRelations().clear(); | ||
506 | getRelations().addAll((Collection<? extends Relation>)newValue); | ||
507 | return; | ||
508 | case CrossingScenarioPackage.ACTOR__PLACED_ON: | 522 | case CrossingScenarioPackage.ACTOR__PLACED_ON: |
509 | setPlacedOn((Lane)newValue); | 523 | setPlacedOn((Lane)newValue); |
510 | return; | 524 | return; |
511 | case CrossingScenarioPackage.ACTOR__YSPEED: | 525 | case CrossingScenarioPackage.ACTOR__YSPEED: |
512 | setYSpeed((Double)newValue); | 526 | setYSpeed((Double)newValue); |
513 | return; | 527 | return; |
528 | case CrossingScenarioPackage.ACTOR__DIST_NEAR: | ||
529 | getDist_near().clear(); | ||
530 | getDist_near().addAll((Collection<? extends Actor>)newValue); | ||
531 | return; | ||
532 | case CrossingScenarioPackage.ACTOR__DIST_MED: | ||
533 | getDist_med().clear(); | ||
534 | getDist_med().addAll((Collection<? extends Actor>)newValue); | ||
535 | return; | ||
536 | case CrossingScenarioPackage.ACTOR__DIST_FAR: | ||
537 | getDist_far().clear(); | ||
538 | getDist_far().addAll((Collection<? extends Actor>)newValue); | ||
539 | return; | ||
514 | } | 540 | } |
515 | super.eSet(featureID, newValue); | 541 | super.eSet(featureID, newValue); |
516 | } | 542 | } |
@@ -538,15 +564,21 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
538 | case CrossingScenarioPackage.ACTOR__XSPEED: | 564 | case CrossingScenarioPackage.ACTOR__XSPEED: |
539 | setXSpeed(XSPEED_EDEFAULT); | 565 | setXSpeed(XSPEED_EDEFAULT); |
540 | return; | 566 | return; |
541 | case CrossingScenarioPackage.ACTOR__RELATIONS: | ||
542 | getRelations().clear(); | ||
543 | return; | ||
544 | case CrossingScenarioPackage.ACTOR__PLACED_ON: | 567 | case CrossingScenarioPackage.ACTOR__PLACED_ON: |
545 | setPlacedOn((Lane)null); | 568 | setPlacedOn((Lane)null); |
546 | return; | 569 | return; |
547 | case CrossingScenarioPackage.ACTOR__YSPEED: | 570 | case CrossingScenarioPackage.ACTOR__YSPEED: |
548 | setYSpeed(YSPEED_EDEFAULT); | 571 | setYSpeed(YSPEED_EDEFAULT); |
549 | return; | 572 | return; |
573 | case CrossingScenarioPackage.ACTOR__DIST_NEAR: | ||
574 | getDist_near().clear(); | ||
575 | return; | ||
576 | case CrossingScenarioPackage.ACTOR__DIST_MED: | ||
577 | getDist_med().clear(); | ||
578 | return; | ||
579 | case CrossingScenarioPackage.ACTOR__DIST_FAR: | ||
580 | getDist_far().clear(); | ||
581 | return; | ||
550 | } | 582 | } |
551 | super.eUnset(featureID); | 583 | super.eUnset(featureID); |
552 | } | 584 | } |
@@ -569,12 +601,16 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
569 | return width != WIDTH_EDEFAULT; | 601 | return width != WIDTH_EDEFAULT; |
570 | case CrossingScenarioPackage.ACTOR__XSPEED: | 602 | case CrossingScenarioPackage.ACTOR__XSPEED: |
571 | return xSpeed != XSPEED_EDEFAULT; | 603 | return xSpeed != XSPEED_EDEFAULT; |
572 | case CrossingScenarioPackage.ACTOR__RELATIONS: | ||
573 | return relations != null && !relations.isEmpty(); | ||
574 | case CrossingScenarioPackage.ACTOR__PLACED_ON: | 604 | case CrossingScenarioPackage.ACTOR__PLACED_ON: |
575 | return placedOn != null; | 605 | return placedOn != null; |
576 | case CrossingScenarioPackage.ACTOR__YSPEED: | 606 | case CrossingScenarioPackage.ACTOR__YSPEED: |
577 | return ySpeed != YSPEED_EDEFAULT; | 607 | return ySpeed != YSPEED_EDEFAULT; |
608 | case CrossingScenarioPackage.ACTOR__DIST_NEAR: | ||
609 | return !getDist_near().isEmpty(); | ||
610 | case CrossingScenarioPackage.ACTOR__DIST_MED: | ||
611 | return !getDist_med().isEmpty(); | ||
612 | case CrossingScenarioPackage.ACTOR__DIST_FAR: | ||
613 | return !getDist_far().isEmpty(); | ||
578 | } | 614 | } |
579 | return super.eIsSet(featureID); | 615 | return super.eIsSet(featureID); |
580 | } | 616 | } |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java index ee407bc5..b6362cc2 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java | |||
@@ -79,8 +79,6 @@ public class CrossingScenarioFactoryImpl extends EFactoryImpl implements Crossin | |||
79 | @Override | 79 | @Override |
80 | public Object createFromString(EDataType eDataType, String initialValue) { | 80 | public Object createFromString(EDataType eDataType, String initialValue) { |
81 | switch (eDataType.getClassifierID()) { | 81 | switch (eDataType.getClassifierID()) { |
82 | case CrossingScenarioPackage.SIZE: | ||
83 | return createSizeFromString(eDataType, initialValue); | ||
84 | case CrossingScenarioPackage.DISTANCE: | 82 | case CrossingScenarioPackage.DISTANCE: |
85 | return createDistanceFromString(eDataType, initialValue); | 83 | return createDistanceFromString(eDataType, initialValue); |
86 | default: | 84 | default: |
@@ -96,8 +94,6 @@ public class CrossingScenarioFactoryImpl extends EFactoryImpl implements Crossin | |||
96 | @Override | 94 | @Override |
97 | public String convertToString(EDataType eDataType, Object instanceValue) { | 95 | public String convertToString(EDataType eDataType, Object instanceValue) { |
98 | switch (eDataType.getClassifierID()) { | 96 | switch (eDataType.getClassifierID()) { |
99 | case CrossingScenarioPackage.SIZE: | ||
100 | return convertSizeToString(eDataType, instanceValue); | ||
101 | case CrossingScenarioPackage.DISTANCE: | 97 | case CrossingScenarioPackage.DISTANCE: |
102 | return convertDistanceToString(eDataType, instanceValue); | 98 | return convertDistanceToString(eDataType, instanceValue); |
103 | default: | 99 | default: |
@@ -209,26 +205,6 @@ public class CrossingScenarioFactoryImpl extends EFactoryImpl implements Crossin | |||
209 | * <!-- end-user-doc --> | 205 | * <!-- end-user-doc --> |
210 | * @generated | 206 | * @generated |
211 | */ | 207 | */ |
212 | public Size createSizeFromString(EDataType eDataType, String initialValue) { | ||
213 | Size result = Size.get(initialValue); | ||
214 | if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); | ||
215 | return result; | ||
216 | } | ||
217 | |||
218 | /** | ||
219 | * <!-- begin-user-doc --> | ||
220 | * <!-- end-user-doc --> | ||
221 | * @generated | ||
222 | */ | ||
223 | public String convertSizeToString(EDataType eDataType, Object instanceValue) { | ||
224 | return instanceValue == null ? null : instanceValue.toString(); | ||
225 | } | ||
226 | |||
227 | /** | ||
228 | * <!-- begin-user-doc --> | ||
229 | * <!-- end-user-doc --> | ||
230 | * @generated | ||
231 | */ | ||
232 | public Distance createDistanceFromString(EDataType eDataType, String initialValue) { | 208 | public Distance createDistanceFromString(EDataType eDataType, String initialValue) { |
233 | Distance result = Distance.get(initialValue); | 209 | Distance result = Distance.get(initialValue); |
234 | if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); | 210 | if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java index 5dd65a39..b2b0d579 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java | |||
@@ -6,9 +6,7 @@ import crossingScenario.Actor; | |||
6 | import crossingScenario.CrossingScenario; | 6 | import crossingScenario.CrossingScenario; |
7 | import crossingScenario.CrossingScenarioPackage; | 7 | import crossingScenario.CrossingScenarioPackage; |
8 | import crossingScenario.Lane; | 8 | import crossingScenario.Lane; |
9 | 9 | import crossingScenario.Relation; | |
10 | import crossingScenario.Lane_Horizontal; | ||
11 | import crossingScenario.Lane_Vertical; | ||
12 | import java.util.Collection; | 10 | import java.util.Collection; |
13 | 11 | ||
14 | import org.eclipse.emf.common.notify.Notification; | 12 | import org.eclipse.emf.common.notify.Notification; |
@@ -38,8 +36,7 @@ import org.eclipse.emf.ecore.util.InternalEList; | |||
38 | * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getActors <em>Actors</em>}</li> | 36 | * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getActors <em>Actors</em>}</li> |
39 | * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getLanes <em>Lanes</em>}</li> | 37 | * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getLanes <em>Lanes</em>}</li> |
40 | * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getMaxTime <em>Max Time</em>}</li> | 38 | * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getMaxTime <em>Max Time</em>}</li> |
41 | * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getHorizontal_head <em>Horizontal head</em>}</li> | 39 | * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getRelations <em>Relations</em>}</li> |
42 | * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getVertical_head <em>Vertical head</em>}</li> | ||
43 | * </ul> | 40 | * </ul> |
44 | * | 41 | * |
45 | * @generated | 42 | * @generated |
@@ -126,24 +123,14 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement | |||
126 | protected double maxTime = MAX_TIME_EDEFAULT; | 123 | protected double maxTime = MAX_TIME_EDEFAULT; |
127 | 124 | ||
128 | /** | 125 | /** |
129 | * The cached value of the '{@link #getHorizontal_head() <em>Horizontal head</em>}' reference. | 126 | * The cached value of the '{@link #getRelations() <em>Relations</em>}' containment reference list. |
130 | * <!-- begin-user-doc --> | 127 | * <!-- begin-user-doc --> |
131 | * <!-- end-user-doc --> | 128 | * <!-- end-user-doc --> |
132 | * @see #getHorizontal_head() | 129 | * @see #getRelations() |
133 | * @generated | 130 | * @generated |
134 | * @ordered | 131 | * @ordered |
135 | */ | 132 | */ |
136 | protected Lane_Horizontal horizontal_head; | 133 | protected EList<Relation> relations; |
137 | |||
138 | /** | ||
139 | * The cached value of the '{@link #getVertical_head() <em>Vertical head</em>}' reference. | ||
140 | * <!-- begin-user-doc --> | ||
141 | * <!-- end-user-doc --> | ||
142 | * @see #getVertical_head() | ||
143 | * @generated | ||
144 | * @ordered | ||
145 | */ | ||
146 | protected Lane_Vertical vertical_head; | ||
147 | 134 | ||
148 | /** | 135 | /** |
149 | * <!-- begin-user-doc --> | 136 | * <!-- begin-user-doc --> |
@@ -265,78 +252,11 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement | |||
265 | * @generated | 252 | * @generated |
266 | */ | 253 | */ |
267 | @Override | 254 | @Override |
268 | public Lane_Horizontal getHorizontal_head() { | 255 | public EList<Relation> getRelations() { |
269 | if (horizontal_head != null && horizontal_head.eIsProxy()) { | 256 | if (relations == null) { |
270 | InternalEObject oldHorizontal_head = (InternalEObject)horizontal_head; | 257 | relations = new EObjectContainmentEList<Relation>(Relation.class, this, CrossingScenarioPackage.CROSSING_SCENARIO__RELATIONS); |
271 | horizontal_head = (Lane_Horizontal)eResolveProxy(oldHorizontal_head); | ||
272 | if (horizontal_head != oldHorizontal_head) { | ||
273 | if (eNotificationRequired()) | ||
274 | eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD, oldHorizontal_head, horizontal_head)); | ||
275 | } | ||
276 | } | 258 | } |
277 | return horizontal_head; | 259 | return relations; |
278 | } | ||
279 | |||
280 | /** | ||
281 | * <!-- begin-user-doc --> | ||
282 | * <!-- end-user-doc --> | ||
283 | * @generated | ||
284 | */ | ||
285 | public Lane_Horizontal basicGetHorizontal_head() { | ||
286 | return horizontal_head; | ||
287 | } | ||
288 | |||
289 | /** | ||
290 | * <!-- begin-user-doc --> | ||
291 | * <!-- end-user-doc --> | ||
292 | * @generated | ||
293 | */ | ||
294 | @Override | ||
295 | public void setHorizontal_head(Lane_Horizontal newHorizontal_head) { | ||
296 | Lane_Horizontal oldHorizontal_head = horizontal_head; | ||
297 | horizontal_head = newHorizontal_head; | ||
298 | if (eNotificationRequired()) | ||
299 | eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD, oldHorizontal_head, horizontal_head)); | ||
300 | } | ||
301 | |||
302 | /** | ||
303 | * <!-- begin-user-doc --> | ||
304 | * <!-- end-user-doc --> | ||
305 | * @generated | ||
306 | */ | ||
307 | @Override | ||
308 | public Lane_Vertical getVertical_head() { | ||
309 | if (vertical_head != null && vertical_head.eIsProxy()) { | ||
310 | InternalEObject oldVertical_head = (InternalEObject)vertical_head; | ||
311 | vertical_head = (Lane_Vertical)eResolveProxy(oldVertical_head); | ||
312 | if (vertical_head != oldVertical_head) { | ||
313 | if (eNotificationRequired()) | ||
314 | eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD, oldVertical_head, vertical_head)); | ||
315 | } | ||
316 | } | ||
317 | return vertical_head; | ||
318 | } | ||
319 | |||
320 | /** | ||
321 | * <!-- begin-user-doc --> | ||
322 | * <!-- end-user-doc --> | ||
323 | * @generated | ||
324 | */ | ||
325 | public Lane_Vertical basicGetVertical_head() { | ||
326 | return vertical_head; | ||
327 | } | ||
328 | |||
329 | /** | ||
330 | * <!-- begin-user-doc --> | ||
331 | * <!-- end-user-doc --> | ||
332 | * @generated | ||
333 | */ | ||
334 | @Override | ||
335 | public void setVertical_head(Lane_Vertical newVertical_head) { | ||
336 | Lane_Vertical oldVertical_head = vertical_head; | ||
337 | vertical_head = newVertical_head; | ||
338 | if (eNotificationRequired()) | ||
339 | eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD, oldVertical_head, vertical_head)); | ||
340 | } | 260 | } |
341 | 261 | ||
342 | /** | 262 | /** |
@@ -351,6 +271,8 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement | |||
351 | return ((InternalEList<?>)getActors()).basicRemove(otherEnd, msgs); | 271 | return ((InternalEList<?>)getActors()).basicRemove(otherEnd, msgs); |
352 | case CrossingScenarioPackage.CROSSING_SCENARIO__LANES: | 272 | case CrossingScenarioPackage.CROSSING_SCENARIO__LANES: |
353 | return ((InternalEList<?>)getLanes()).basicRemove(otherEnd, msgs); | 273 | return ((InternalEList<?>)getLanes()).basicRemove(otherEnd, msgs); |
274 | case CrossingScenarioPackage.CROSSING_SCENARIO__RELATIONS: | ||
275 | return ((InternalEList<?>)getRelations()).basicRemove(otherEnd, msgs); | ||
354 | } | 276 | } |
355 | return super.eInverseRemove(otherEnd, featureID, msgs); | 277 | return super.eInverseRemove(otherEnd, featureID, msgs); |
356 | } | 278 | } |
@@ -373,12 +295,8 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement | |||
373 | return getLanes(); | 295 | return getLanes(); |
374 | case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: | 296 | case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: |
375 | return getMaxTime(); | 297 | return getMaxTime(); |
376 | case CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD: | 298 | case CrossingScenarioPackage.CROSSING_SCENARIO__RELATIONS: |
377 | if (resolve) return getHorizontal_head(); | 299 | return getRelations(); |
378 | return basicGetHorizontal_head(); | ||
379 | case CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD: | ||
380 | if (resolve) return getVertical_head(); | ||
381 | return basicGetVertical_head(); | ||
382 | } | 300 | } |
383 | return super.eGet(featureID, resolve, coreType); | 301 | return super.eGet(featureID, resolve, coreType); |
384 | } | 302 | } |
@@ -409,11 +327,9 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement | |||
409 | case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: | 327 | case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: |
410 | setMaxTime((Double)newValue); | 328 | setMaxTime((Double)newValue); |
411 | return; | 329 | return; |
412 | case CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD: | 330 | case CrossingScenarioPackage.CROSSING_SCENARIO__RELATIONS: |
413 | setHorizontal_head((Lane_Horizontal)newValue); | 331 | getRelations().clear(); |
414 | return; | 332 | getRelations().addAll((Collection<? extends Relation>)newValue); |
415 | case CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD: | ||
416 | setVertical_head((Lane_Vertical)newValue); | ||
417 | return; | 333 | return; |
418 | } | 334 | } |
419 | super.eSet(featureID, newValue); | 335 | super.eSet(featureID, newValue); |
@@ -442,11 +358,8 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement | |||
442 | case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: | 358 | case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: |
443 | setMaxTime(MAX_TIME_EDEFAULT); | 359 | setMaxTime(MAX_TIME_EDEFAULT); |
444 | return; | 360 | return; |
445 | case CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD: | 361 | case CrossingScenarioPackage.CROSSING_SCENARIO__RELATIONS: |
446 | setHorizontal_head((Lane_Horizontal)null); | 362 | getRelations().clear(); |
447 | return; | ||
448 | case CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD: | ||
449 | setVertical_head((Lane_Vertical)null); | ||
450 | return; | 363 | return; |
451 | } | 364 | } |
452 | super.eUnset(featureID); | 365 | super.eUnset(featureID); |
@@ -470,10 +383,8 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement | |||
470 | return lanes != null && !lanes.isEmpty(); | 383 | return lanes != null && !lanes.isEmpty(); |
471 | case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: | 384 | case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: |
472 | return maxTime != MAX_TIME_EDEFAULT; | 385 | return maxTime != MAX_TIME_EDEFAULT; |
473 | case CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD: | 386 | case CrossingScenarioPackage.CROSSING_SCENARIO__RELATIONS: |
474 | return horizontal_head != null; | 387 | return relations != null && !relations.isEmpty(); |
475 | case CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD: | ||
476 | return vertical_head != null; | ||
477 | } | 388 | } |
478 | return super.eIsSet(featureID); | 389 | return super.eIsSet(featureID); |
479 | } | 390 | } |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java index 41c1bdd0..b8261c86 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java | |||
@@ -15,7 +15,6 @@ import crossingScenario.Lane_Vertical; | |||
15 | import crossingScenario.Pedestrian; | 15 | import crossingScenario.Pedestrian; |
16 | import crossingScenario.Relation; | 16 | import crossingScenario.Relation; |
17 | import crossingScenario.SeparationDistance; | 17 | import crossingScenario.SeparationDistance; |
18 | import crossingScenario.Size; | ||
19 | import crossingScenario.SpatialRelation; | 18 | import crossingScenario.SpatialRelation; |
20 | import crossingScenario.TemporalRelation; | 19 | import crossingScenario.TemporalRelation; |
21 | import crossingScenario.Vehicle; | 20 | import crossingScenario.Vehicle; |
@@ -139,13 +138,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
139 | * <!-- end-user-doc --> | 138 | * <!-- end-user-doc --> |
140 | * @generated | 139 | * @generated |
141 | */ | 140 | */ |
142 | private EEnum sizeEEnum = null; | ||
143 | |||
144 | /** | ||
145 | * <!-- begin-user-doc --> | ||
146 | * <!-- end-user-doc --> | ||
147 | * @generated | ||
148 | */ | ||
149 | private EEnum distanceEEnum = null; | 141 | private EEnum distanceEEnum = null; |
150 | 142 | ||
151 | /** | 143 | /** |
@@ -275,7 +267,7 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
275 | * @generated | 267 | * @generated |
276 | */ | 268 | */ |
277 | @Override | 269 | @Override |
278 | public EReference getCrossingScenario_Horizontal_head() { | 270 | public EReference getCrossingScenario_Relations() { |
279 | return (EReference)crossingScenarioEClass.getEStructuralFeatures().get(5); | 271 | return (EReference)crossingScenarioEClass.getEStructuralFeatures().get(5); |
280 | } | 272 | } |
281 | 273 | ||
@@ -285,16 +277,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
285 | * @generated | 277 | * @generated |
286 | */ | 278 | */ |
287 | @Override | 279 | @Override |
288 | public EReference getCrossingScenario_Vertical_head() { | ||
289 | return (EReference)crossingScenarioEClass.getEStructuralFeatures().get(6); | ||
290 | } | ||
291 | |||
292 | /** | ||
293 | * <!-- begin-user-doc --> | ||
294 | * <!-- end-user-doc --> | ||
295 | * @generated | ||
296 | */ | ||
297 | @Override | ||
298 | public EClass getLane() { | 280 | public EClass getLane() { |
299 | return laneEClass; | 281 | return laneEClass; |
300 | } | 282 | } |
@@ -305,7 +287,7 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
305 | * @generated | 287 | * @generated |
306 | */ | 288 | */ |
307 | @Override | 289 | @Override |
308 | public EAttribute getLane_Width() { | 290 | public EAttribute getLane_ReferenceCoord() { |
309 | return (EAttribute)laneEClass.getEStructuralFeatures().get(0); | 291 | return (EAttribute)laneEClass.getEStructuralFeatures().get(0); |
310 | } | 292 | } |
311 | 293 | ||
@@ -315,8 +297,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
315 | * @generated | 297 | * @generated |
316 | */ | 298 | */ |
317 | @Override | 299 | @Override |
318 | public EAttribute getLane_ReferenceCoord() { | 300 | public EReference getLane_Actors() { |
319 | return (EAttribute)laneEClass.getEStructuralFeatures().get(1); | 301 | return (EReference)laneEClass.getEStructuralFeatures().get(1); |
320 | } | 302 | } |
321 | 303 | ||
322 | /** | 304 | /** |
@@ -325,8 +307,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
325 | * @generated | 307 | * @generated |
326 | */ | 308 | */ |
327 | @Override | 309 | @Override |
328 | public EReference getLane_PrevLane() { | 310 | public EClass getActor() { |
329 | return (EReference)laneEClass.getEStructuralFeatures().get(2); | 311 | return actorEClass; |
330 | } | 312 | } |
331 | 313 | ||
332 | /** | 314 | /** |
@@ -335,8 +317,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
335 | * @generated | 317 | * @generated |
336 | */ | 318 | */ |
337 | @Override | 319 | @Override |
338 | public EReference getLane_Actors() { | 320 | public EAttribute getActor_XPos() { |
339 | return (EReference)laneEClass.getEStructuralFeatures().get(3); | 321 | return (EAttribute)actorEClass.getEStructuralFeatures().get(0); |
340 | } | 322 | } |
341 | 323 | ||
342 | /** | 324 | /** |
@@ -345,8 +327,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
345 | * @generated | 327 | * @generated |
346 | */ | 328 | */ |
347 | @Override | 329 | @Override |
348 | public EAttribute getLane_NumWidth() { | 330 | public EAttribute getActor_YPos() { |
349 | return (EAttribute)laneEClass.getEStructuralFeatures().get(4); | 331 | return (EAttribute)actorEClass.getEStructuralFeatures().get(1); |
350 | } | 332 | } |
351 | 333 | ||
352 | /** | 334 | /** |
@@ -355,8 +337,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
355 | * @generated | 337 | * @generated |
356 | */ | 338 | */ |
357 | @Override | 339 | @Override |
358 | public EClass getActor() { | 340 | public EAttribute getActor_Length() { |
359 | return actorEClass; | 341 | return (EAttribute)actorEClass.getEStructuralFeatures().get(2); |
360 | } | 342 | } |
361 | 343 | ||
362 | /** | 344 | /** |
@@ -365,8 +347,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
365 | * @generated | 347 | * @generated |
366 | */ | 348 | */ |
367 | @Override | 349 | @Override |
368 | public EAttribute getActor_XPos() { | 350 | public EAttribute getActor_Width() { |
369 | return (EAttribute)actorEClass.getEStructuralFeatures().get(0); | 351 | return (EAttribute)actorEClass.getEStructuralFeatures().get(3); |
370 | } | 352 | } |
371 | 353 | ||
372 | /** | 354 | /** |
@@ -375,8 +357,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
375 | * @generated | 357 | * @generated |
376 | */ | 358 | */ |
377 | @Override | 359 | @Override |
378 | public EAttribute getActor_YPos() { | 360 | public EAttribute getActor_XSpeed() { |
379 | return (EAttribute)actorEClass.getEStructuralFeatures().get(1); | 361 | return (EAttribute)actorEClass.getEStructuralFeatures().get(4); |
380 | } | 362 | } |
381 | 363 | ||
382 | /** | 364 | /** |
@@ -385,8 +367,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
385 | * @generated | 367 | * @generated |
386 | */ | 368 | */ |
387 | @Override | 369 | @Override |
388 | public EAttribute getActor_Length() { | 370 | public EReference getActor_PlacedOn() { |
389 | return (EAttribute)actorEClass.getEStructuralFeatures().get(2); | 371 | return (EReference)actorEClass.getEStructuralFeatures().get(5); |
390 | } | 372 | } |
391 | 373 | ||
392 | /** | 374 | /** |
@@ -395,8 +377,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
395 | * @generated | 377 | * @generated |
396 | */ | 378 | */ |
397 | @Override | 379 | @Override |
398 | public EAttribute getActor_Width() { | 380 | public EAttribute getActor_YSpeed() { |
399 | return (EAttribute)actorEClass.getEStructuralFeatures().get(3); | 381 | return (EAttribute)actorEClass.getEStructuralFeatures().get(6); |
400 | } | 382 | } |
401 | 383 | ||
402 | /** | 384 | /** |
@@ -405,8 +387,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
405 | * @generated | 387 | * @generated |
406 | */ | 388 | */ |
407 | @Override | 389 | @Override |
408 | public EAttribute getActor_XSpeed() { | 390 | public EReference getActor_Dist_near() { |
409 | return (EAttribute)actorEClass.getEStructuralFeatures().get(4); | 391 | return (EReference)actorEClass.getEStructuralFeatures().get(7); |
410 | } | 392 | } |
411 | 393 | ||
412 | /** | 394 | /** |
@@ -415,8 +397,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
415 | * @generated | 397 | * @generated |
416 | */ | 398 | */ |
417 | @Override | 399 | @Override |
418 | public EReference getActor_Relations() { | 400 | public EReference getActor_Dist_med() { |
419 | return (EReference)actorEClass.getEStructuralFeatures().get(5); | 401 | return (EReference)actorEClass.getEStructuralFeatures().get(8); |
420 | } | 402 | } |
421 | 403 | ||
422 | /** | 404 | /** |
@@ -425,8 +407,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
425 | * @generated | 407 | * @generated |
426 | */ | 408 | */ |
427 | @Override | 409 | @Override |
428 | public EReference getActor_PlacedOn() { | 410 | public EReference getActor_Dist_far() { |
429 | return (EReference)actorEClass.getEStructuralFeatures().get(6); | 411 | return (EReference)actorEClass.getEStructuralFeatures().get(9); |
430 | } | 412 | } |
431 | 413 | ||
432 | /** | 414 | /** |
@@ -435,8 +417,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
435 | * @generated | 417 | * @generated |
436 | */ | 418 | */ |
437 | @Override | 419 | @Override |
438 | public EAttribute getActor_YSpeed() { | 420 | public EClass getRelation() { |
439 | return (EAttribute)actorEClass.getEStructuralFeatures().get(7); | 421 | return relationEClass; |
440 | } | 422 | } |
441 | 423 | ||
442 | /** | 424 | /** |
@@ -445,8 +427,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
445 | * @generated | 427 | * @generated |
446 | */ | 428 | */ |
447 | @Override | 429 | @Override |
448 | public EClass getRelation() { | 430 | public EReference getRelation_Target() { |
449 | return relationEClass; | 431 | return (EReference)relationEClass.getEStructuralFeatures().get(0); |
450 | } | 432 | } |
451 | 433 | ||
452 | /** | 434 | /** |
@@ -455,8 +437,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
455 | * @generated | 437 | * @generated |
456 | */ | 438 | */ |
457 | @Override | 439 | @Override |
458 | public EReference getRelation_Target() { | 440 | public EReference getRelation_Source() { |
459 | return (EReference)relationEClass.getEStructuralFeatures().get(0); | 441 | return (EReference)relationEClass.getEStructuralFeatures().get(1); |
460 | } | 442 | } |
461 | 443 | ||
462 | /** | 444 | /** |
@@ -595,16 +577,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
595 | * @generated | 577 | * @generated |
596 | */ | 578 | */ |
597 | @Override | 579 | @Override |
598 | public EEnum getSize() { | ||
599 | return sizeEEnum; | ||
600 | } | ||
601 | |||
602 | /** | ||
603 | * <!-- begin-user-doc --> | ||
604 | * <!-- end-user-doc --> | ||
605 | * @generated | ||
606 | */ | ||
607 | @Override | ||
608 | public EEnum getDistance() { | 580 | public EEnum getDistance() { |
609 | return distanceEEnum; | 581 | return distanceEEnum; |
610 | } | 582 | } |
@@ -644,15 +616,11 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
644 | createEReference(crossingScenarioEClass, CROSSING_SCENARIO__ACTORS); | 616 | createEReference(crossingScenarioEClass, CROSSING_SCENARIO__ACTORS); |
645 | createEReference(crossingScenarioEClass, CROSSING_SCENARIO__LANES); | 617 | createEReference(crossingScenarioEClass, CROSSING_SCENARIO__LANES); |
646 | createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__MAX_TIME); | 618 | createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__MAX_TIME); |
647 | createEReference(crossingScenarioEClass, CROSSING_SCENARIO__HORIZONTAL_HEAD); | 619 | createEReference(crossingScenarioEClass, CROSSING_SCENARIO__RELATIONS); |
648 | createEReference(crossingScenarioEClass, CROSSING_SCENARIO__VERTICAL_HEAD); | ||
649 | 620 | ||
650 | laneEClass = createEClass(LANE); | 621 | laneEClass = createEClass(LANE); |
651 | createEAttribute(laneEClass, LANE__WIDTH); | ||
652 | createEAttribute(laneEClass, LANE__REFERENCE_COORD); | 622 | createEAttribute(laneEClass, LANE__REFERENCE_COORD); |
653 | createEReference(laneEClass, LANE__PREV_LANE); | ||
654 | createEReference(laneEClass, LANE__ACTORS); | 623 | createEReference(laneEClass, LANE__ACTORS); |
655 | createEAttribute(laneEClass, LANE__NUM_WIDTH); | ||
656 | 624 | ||
657 | actorEClass = createEClass(ACTOR); | 625 | actorEClass = createEClass(ACTOR); |
658 | createEAttribute(actorEClass, ACTOR__XPOS); | 626 | createEAttribute(actorEClass, ACTOR__XPOS); |
@@ -660,12 +628,15 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
660 | createEAttribute(actorEClass, ACTOR__LENGTH); | 628 | createEAttribute(actorEClass, ACTOR__LENGTH); |
661 | createEAttribute(actorEClass, ACTOR__WIDTH); | 629 | createEAttribute(actorEClass, ACTOR__WIDTH); |
662 | createEAttribute(actorEClass, ACTOR__XSPEED); | 630 | createEAttribute(actorEClass, ACTOR__XSPEED); |
663 | createEReference(actorEClass, ACTOR__RELATIONS); | ||
664 | createEReference(actorEClass, ACTOR__PLACED_ON); | 631 | createEReference(actorEClass, ACTOR__PLACED_ON); |
665 | createEAttribute(actorEClass, ACTOR__YSPEED); | 632 | createEAttribute(actorEClass, ACTOR__YSPEED); |
633 | createEReference(actorEClass, ACTOR__DIST_NEAR); | ||
634 | createEReference(actorEClass, ACTOR__DIST_MED); | ||
635 | createEReference(actorEClass, ACTOR__DIST_FAR); | ||
666 | 636 | ||
667 | relationEClass = createEClass(RELATION); | 637 | relationEClass = createEClass(RELATION); |
668 | createEReference(relationEClass, RELATION__TARGET); | 638 | createEReference(relationEClass, RELATION__TARGET); |
639 | createEReference(relationEClass, RELATION__SOURCE); | ||
669 | 640 | ||
670 | spatialRelationEClass = createEClass(SPATIAL_RELATION); | 641 | spatialRelationEClass = createEClass(SPATIAL_RELATION); |
671 | 642 | ||
@@ -691,7 +662,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
691 | lane_VerticalEClass = createEClass(LANE_VERTICAL); | 662 | lane_VerticalEClass = createEClass(LANE_VERTICAL); |
692 | 663 | ||
693 | // Create enums | 664 | // Create enums |
694 | sizeEEnum = createEEnum(SIZE); | ||
695 | distanceEEnum = createEEnum(DISTANCE); | 665 | distanceEEnum = createEEnum(DISTANCE); |
696 | } | 666 | } |
697 | 667 | ||
@@ -741,15 +711,11 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
741 | 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); | 711 | 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); |
742 | 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); | 712 | 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); |
743 | 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); | 713 | 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); |
744 | initEReference(getCrossingScenario_Horizontal_head(), this.getLane_Horizontal(), null, "horizontal_head", null, 1, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | 714 | initEReference(getCrossingScenario_Relations(), this.getRelation(), null, "relations", null, 0, -1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); |
745 | initEReference(getCrossingScenario_Vertical_head(), this.getLane_Vertical(), null, "vertical_head", null, 1, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | ||
746 | 715 | ||
747 | initEClass(laneEClass, Lane.class, "Lane", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 716 | initEClass(laneEClass, Lane.class, "Lane", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
748 | 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); | ||
749 | 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); | 717 | 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); |
750 | 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); | ||
751 | 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); | 718 | 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); |
752 | 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); | ||
753 | 719 | ||
754 | initEClass(actorEClass, Actor.class, "Actor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 720 | initEClass(actorEClass, Actor.class, "Actor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
755 | 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); | 721 | 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); |
@@ -757,12 +723,15 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
757 | 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); | 723 | 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); |
758 | 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); | 724 | 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); |
759 | 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); | 725 | 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); |
760 | 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); | ||
761 | 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); |
762 | 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); | 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); |
728 | initEReference(getActor_Dist_near(), this.getActor(), null, "dist_near", null, 0, -1, Actor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); | ||
729 | initEReference(getActor_Dist_med(), this.getActor(), null, "dist_med", null, 0, -1, Actor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); | ||
730 | initEReference(getActor_Dist_far(), this.getActor(), null, "dist_far", null, 0, -1, Actor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); | ||
763 | 731 | ||
764 | initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 732 | initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
765 | 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); | 733 | 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); |
734 | initEReference(getRelation_Source(), this.getActor(), null, "source", null, 1, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); | ||
766 | 735 | ||
767 | initEClass(spatialRelationEClass, SpatialRelation.class, "SpatialRelation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 736 | initEClass(spatialRelationEClass, SpatialRelation.class, "SpatialRelation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
768 | 737 | ||
@@ -788,11 +757,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
788 | initEClass(lane_VerticalEClass, Lane_Vertical.class, "Lane_Vertical", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 757 | initEClass(lane_VerticalEClass, Lane_Vertical.class, "Lane_Vertical", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
789 | 758 | ||
790 | // Initialize enums and add enum literals | 759 | // Initialize enums and add enum literals |
791 | initEEnum(sizeEEnum, Size.class, "Size"); | ||
792 | addEEnumLiteral(sizeEEnum, Size.SSMALL); | ||
793 | addEEnumLiteral(sizeEEnum, Size.SMED); | ||
794 | addEEnumLiteral(sizeEEnum, Size.SLARGE); | ||
795 | |||
796 | initEEnum(distanceEEnum, Distance.class, "Distance"); | 760 | initEEnum(distanceEEnum, Distance.class, "Distance"); |
797 | addEEnumLiteral(distanceEEnum, Distance.DNEAR); | 761 | addEEnumLiteral(distanceEEnum, Distance.DNEAR); |
798 | addEEnumLiteral(distanceEEnum, Distance.DMED); | 762 | addEEnumLiteral(distanceEEnum, Distance.DMED); |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java index c0a25d6e..be316759 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java | |||
@@ -5,8 +5,6 @@ package crossingScenario.impl; | |||
5 | import crossingScenario.Actor; | 5 | import crossingScenario.Actor; |
6 | import crossingScenario.CrossingScenarioPackage; | 6 | import crossingScenario.CrossingScenarioPackage; |
7 | import crossingScenario.Lane; | 7 | import crossingScenario.Lane; |
8 | import crossingScenario.Size; | ||
9 | |||
10 | import java.util.Collection; | 8 | import java.util.Collection; |
11 | 9 | ||
12 | import org.eclipse.emf.common.notify.Notification; | 10 | import org.eclipse.emf.common.notify.Notification; |
@@ -31,37 +29,14 @@ import org.eclipse.emf.ecore.util.InternalEList; | |||
31 | * The following features are implemented: | 29 | * The following features are implemented: |
32 | * </p> | 30 | * </p> |
33 | * <ul> | 31 | * <ul> |
34 | * <li>{@link crossingScenario.impl.LaneImpl#getWidth <em>Width</em>}</li> | ||
35 | * <li>{@link crossingScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li> | 32 | * <li>{@link crossingScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li> |
36 | * <li>{@link crossingScenario.impl.LaneImpl#getPrevLane <em>Prev Lane</em>}</li> | ||
37 | * <li>{@link crossingScenario.impl.LaneImpl#getActors <em>Actors</em>}</li> | 33 | * <li>{@link crossingScenario.impl.LaneImpl#getActors <em>Actors</em>}</li> |
38 | * <li>{@link crossingScenario.impl.LaneImpl#getNumWidth <em>Num Width</em>}</li> | ||
39 | * </ul> | 34 | * </ul> |
40 | * | 35 | * |
41 | * @generated | 36 | * @generated |
42 | */ | 37 | */ |
43 | public abstract class LaneImpl extends MinimalEObjectImpl.Container implements Lane { | 38 | public abstract class LaneImpl extends MinimalEObjectImpl.Container implements Lane { |
44 | /** | 39 | /** |
45 | * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. | ||
46 | * <!-- begin-user-doc --> | ||
47 | * <!-- end-user-doc --> | ||
48 | * @see #getWidth() | ||
49 | * @generated | ||
50 | * @ordered | ||
51 | */ | ||
52 | protected static final Size WIDTH_EDEFAULT = Size.SSMALL; | ||
53 | |||
54 | /** | ||
55 | * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute. | ||
56 | * <!-- begin-user-doc --> | ||
57 | * <!-- end-user-doc --> | ||
58 | * @see #getWidth() | ||
59 | * @generated | ||
60 | * @ordered | ||
61 | */ | ||
62 | protected Size width = WIDTH_EDEFAULT; | ||
63 | |||
64 | /** | ||
65 | * The default value of the '{@link #getReferenceCoord() <em>Reference Coord</em>}' attribute. | 40 | * The default value of the '{@link #getReferenceCoord() <em>Reference Coord</em>}' attribute. |
66 | * <!-- begin-user-doc --> | 41 | * <!-- begin-user-doc --> |
67 | * <!-- end-user-doc --> | 42 | * <!-- end-user-doc --> |
@@ -82,16 +57,6 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
82 | protected double referenceCoord = REFERENCE_COORD_EDEFAULT; | 57 | protected double referenceCoord = REFERENCE_COORD_EDEFAULT; |
83 | 58 | ||
84 | /** | 59 | /** |
85 | * The cached value of the '{@link #getPrevLane() <em>Prev Lane</em>}' reference. | ||
86 | * <!-- begin-user-doc --> | ||
87 | * <!-- end-user-doc --> | ||
88 | * @see #getPrevLane() | ||
89 | * @generated | ||
90 | * @ordered | ||
91 | */ | ||
92 | protected Lane prevLane; | ||
93 | |||
94 | /** | ||
95 | * The cached value of the '{@link #getActors() <em>Actors</em>}' reference list. | 60 | * The cached value of the '{@link #getActors() <em>Actors</em>}' reference list. |
96 | * <!-- begin-user-doc --> | 61 | * <!-- begin-user-doc --> |
97 | * <!-- end-user-doc --> | 62 | * <!-- end-user-doc --> |
@@ -102,26 +67,6 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
102 | protected EList<Actor> actors; | 67 | protected EList<Actor> actors; |
103 | 68 | ||
104 | /** | 69 | /** |
105 | * The default value of the '{@link #getNumWidth() <em>Num Width</em>}' attribute. | ||
106 | * <!-- begin-user-doc --> | ||
107 | * <!-- end-user-doc --> | ||
108 | * @see #getNumWidth() | ||
109 | * @generated | ||
110 | * @ordered | ||
111 | */ | ||
112 | protected static final double NUM_WIDTH_EDEFAULT = 0.0; | ||
113 | |||
114 | /** | ||
115 | * The cached value of the '{@link #getNumWidth() <em>Num Width</em>}' attribute. | ||
116 | * <!-- begin-user-doc --> | ||
117 | * <!-- end-user-doc --> | ||
118 | * @see #getNumWidth() | ||
119 | * @generated | ||
120 | * @ordered | ||
121 | */ | ||
122 | protected double numWidth = NUM_WIDTH_EDEFAULT; | ||
123 | |||
124 | /** | ||
125 | * <!-- begin-user-doc --> | 70 | * <!-- begin-user-doc --> |
126 | * <!-- end-user-doc --> | 71 | * <!-- end-user-doc --> |
127 | * @generated | 72 | * @generated |
@@ -146,29 +91,6 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
146 | * @generated | 91 | * @generated |
147 | */ | 92 | */ |
148 | @Override | 93 | @Override |
149 | public Size getWidth() { | ||
150 | return width; | ||
151 | } | ||
152 | |||
153 | /** | ||
154 | * <!-- begin-user-doc --> | ||
155 | * <!-- end-user-doc --> | ||
156 | * @generated | ||
157 | */ | ||
158 | @Override | ||
159 | public void setWidth(Size newWidth) { | ||
160 | Size oldWidth = width; | ||
161 | width = newWidth == null ? WIDTH_EDEFAULT : newWidth; | ||
162 | if (eNotificationRequired()) | ||
163 | eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.LANE__WIDTH, oldWidth, width)); | ||
164 | } | ||
165 | |||
166 | /** | ||
167 | * <!-- begin-user-doc --> | ||
168 | * <!-- end-user-doc --> | ||
169 | * @generated | ||
170 | */ | ||
171 | @Override | ||
172 | public double getReferenceCoord() { | 94 | public double getReferenceCoord() { |
173 | return referenceCoord; | 95 | return referenceCoord; |
174 | } | 96 | } |
@@ -192,46 +114,6 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
192 | * @generated | 114 | * @generated |
193 | */ | 115 | */ |
194 | @Override | 116 | @Override |
195 | public Lane getPrevLane() { | ||
196 | if (prevLane != null && prevLane.eIsProxy()) { | ||
197 | InternalEObject oldPrevLane = (InternalEObject)prevLane; | ||
198 | prevLane = (Lane)eResolveProxy(oldPrevLane); | ||
199 | if (prevLane != oldPrevLane) { | ||
200 | if (eNotificationRequired()) | ||
201 | eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.LANE__PREV_LANE, oldPrevLane, prevLane)); | ||
202 | } | ||
203 | } | ||
204 | return prevLane; | ||
205 | } | ||
206 | |||
207 | /** | ||
208 | * <!-- begin-user-doc --> | ||
209 | * <!-- end-user-doc --> | ||
210 | * @generated | ||
211 | */ | ||
212 | public Lane basicGetPrevLane() { | ||
213 | return prevLane; | ||
214 | } | ||
215 | |||
216 | /** | ||
217 | * <!-- begin-user-doc --> | ||
218 | * <!-- end-user-doc --> | ||
219 | * @generated | ||
220 | */ | ||
221 | @Override | ||
222 | public void setPrevLane(Lane newPrevLane) { | ||
223 | Lane oldPrevLane = prevLane; | ||
224 | prevLane = newPrevLane; | ||
225 | if (eNotificationRequired()) | ||
226 | eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.LANE__PREV_LANE, oldPrevLane, prevLane)); | ||
227 | } | ||
228 | |||
229 | /** | ||
230 | * <!-- begin-user-doc --> | ||
231 | * <!-- end-user-doc --> | ||
232 | * @generated | ||
233 | */ | ||
234 | @Override | ||
235 | public EList<Actor> getActors() { | 117 | public EList<Actor> getActors() { |
236 | if (actors == null) { | 118 | if (actors == null) { |
237 | actors = new EObjectWithInverseResolvingEList<Actor>(Actor.class, this, CrossingScenarioPackage.LANE__ACTORS, CrossingScenarioPackage.ACTOR__PLACED_ON); | 119 | actors = new EObjectWithInverseResolvingEList<Actor>(Actor.class, this, CrossingScenarioPackage.LANE__ACTORS, CrossingScenarioPackage.ACTOR__PLACED_ON); |
@@ -244,29 +126,6 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
244 | * <!-- end-user-doc --> | 126 | * <!-- end-user-doc --> |
245 | * @generated | 127 | * @generated |
246 | */ | 128 | */ |
247 | @Override | ||
248 | public double getNumWidth() { | ||
249 | return numWidth; | ||
250 | } | ||
251 | |||
252 | /** | ||
253 | * <!-- begin-user-doc --> | ||
254 | * <!-- end-user-doc --> | ||
255 | * @generated | ||
256 | */ | ||
257 | @Override | ||
258 | public void setNumWidth(double newNumWidth) { | ||
259 | double oldNumWidth = numWidth; | ||
260 | numWidth = newNumWidth; | ||
261 | if (eNotificationRequired()) | ||
262 | eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.LANE__NUM_WIDTH, oldNumWidth, numWidth)); | ||
263 | } | ||
264 | |||
265 | /** | ||
266 | * <!-- begin-user-doc --> | ||
267 | * <!-- end-user-doc --> | ||
268 | * @generated | ||
269 | */ | ||
270 | @SuppressWarnings("unchecked") | 129 | @SuppressWarnings("unchecked") |
271 | @Override | 130 | @Override |
272 | public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { | 131 | public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { |
@@ -299,17 +158,10 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
299 | @Override | 158 | @Override |
300 | public Object eGet(int featureID, boolean resolve, boolean coreType) { | 159 | public Object eGet(int featureID, boolean resolve, boolean coreType) { |
301 | switch (featureID) { | 160 | switch (featureID) { |
302 | case CrossingScenarioPackage.LANE__WIDTH: | ||
303 | return getWidth(); | ||
304 | case CrossingScenarioPackage.LANE__REFERENCE_COORD: | 161 | case CrossingScenarioPackage.LANE__REFERENCE_COORD: |
305 | return getReferenceCoord(); | 162 | return getReferenceCoord(); |
306 | case CrossingScenarioPackage.LANE__PREV_LANE: | ||
307 | if (resolve) return getPrevLane(); | ||
308 | return basicGetPrevLane(); | ||
309 | case CrossingScenarioPackage.LANE__ACTORS: | 163 | case CrossingScenarioPackage.LANE__ACTORS: |
310 | return getActors(); | 164 | return getActors(); |
311 | case CrossingScenarioPackage.LANE__NUM_WIDTH: | ||
312 | return getNumWidth(); | ||
313 | } | 165 | } |
314 | return super.eGet(featureID, resolve, coreType); | 166 | return super.eGet(featureID, resolve, coreType); |
315 | } | 167 | } |
@@ -323,22 +175,13 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
323 | @Override | 175 | @Override |
324 | public void eSet(int featureID, Object newValue) { | 176 | public void eSet(int featureID, Object newValue) { |
325 | switch (featureID) { | 177 | switch (featureID) { |
326 | case CrossingScenarioPackage.LANE__WIDTH: | ||
327 | setWidth((Size)newValue); | ||
328 | return; | ||
329 | case CrossingScenarioPackage.LANE__REFERENCE_COORD: | 178 | case CrossingScenarioPackage.LANE__REFERENCE_COORD: |
330 | setReferenceCoord((Double)newValue); | 179 | setReferenceCoord((Double)newValue); |
331 | return; | 180 | return; |
332 | case CrossingScenarioPackage.LANE__PREV_LANE: | ||
333 | setPrevLane((Lane)newValue); | ||
334 | return; | ||
335 | case CrossingScenarioPackage.LANE__ACTORS: | 181 | case CrossingScenarioPackage.LANE__ACTORS: |
336 | getActors().clear(); | 182 | getActors().clear(); |
337 | getActors().addAll((Collection<? extends Actor>)newValue); | 183 | getActors().addAll((Collection<? extends Actor>)newValue); |
338 | return; | 184 | return; |
339 | case CrossingScenarioPackage.LANE__NUM_WIDTH: | ||
340 | setNumWidth((Double)newValue); | ||
341 | return; | ||
342 | } | 185 | } |
343 | super.eSet(featureID, newValue); | 186 | super.eSet(featureID, newValue); |
344 | } | 187 | } |
@@ -351,21 +194,12 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
351 | @Override | 194 | @Override |
352 | public void eUnset(int featureID) { | 195 | public void eUnset(int featureID) { |
353 | switch (featureID) { | 196 | switch (featureID) { |
354 | case CrossingScenarioPackage.LANE__WIDTH: | ||
355 | setWidth(WIDTH_EDEFAULT); | ||
356 | return; | ||
357 | case CrossingScenarioPackage.LANE__REFERENCE_COORD: | 197 | case CrossingScenarioPackage.LANE__REFERENCE_COORD: |
358 | setReferenceCoord(REFERENCE_COORD_EDEFAULT); | 198 | setReferenceCoord(REFERENCE_COORD_EDEFAULT); |
359 | return; | 199 | return; |
360 | case CrossingScenarioPackage.LANE__PREV_LANE: | ||
361 | setPrevLane((Lane)null); | ||
362 | return; | ||
363 | case CrossingScenarioPackage.LANE__ACTORS: | 200 | case CrossingScenarioPackage.LANE__ACTORS: |
364 | getActors().clear(); | 201 | getActors().clear(); |
365 | return; | 202 | return; |
366 | case CrossingScenarioPackage.LANE__NUM_WIDTH: | ||
367 | setNumWidth(NUM_WIDTH_EDEFAULT); | ||
368 | return; | ||
369 | } | 203 | } |
370 | super.eUnset(featureID); | 204 | super.eUnset(featureID); |
371 | } | 205 | } |
@@ -378,16 +212,10 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
378 | @Override | 212 | @Override |
379 | public boolean eIsSet(int featureID) { | 213 | public boolean eIsSet(int featureID) { |
380 | switch (featureID) { | 214 | switch (featureID) { |
381 | case CrossingScenarioPackage.LANE__WIDTH: | ||
382 | return width != WIDTH_EDEFAULT; | ||
383 | case CrossingScenarioPackage.LANE__REFERENCE_COORD: | 215 | case CrossingScenarioPackage.LANE__REFERENCE_COORD: |
384 | return referenceCoord != REFERENCE_COORD_EDEFAULT; | 216 | return referenceCoord != REFERENCE_COORD_EDEFAULT; |
385 | case CrossingScenarioPackage.LANE__PREV_LANE: | ||
386 | return prevLane != null; | ||
387 | case CrossingScenarioPackage.LANE__ACTORS: | 217 | case CrossingScenarioPackage.LANE__ACTORS: |
388 | return actors != null && !actors.isEmpty(); | 218 | return actors != null && !actors.isEmpty(); |
389 | case CrossingScenarioPackage.LANE__NUM_WIDTH: | ||
390 | return numWidth != NUM_WIDTH_EDEFAULT; | ||
391 | } | 219 | } |
392 | return super.eIsSet(featureID); | 220 | return super.eIsSet(featureID); |
393 | } | 221 | } |
@@ -402,12 +230,8 @@ public abstract class LaneImpl extends MinimalEObjectImpl.Container implements L | |||
402 | if (eIsProxy()) return super.toString(); | 230 | if (eIsProxy()) return super.toString(); |
403 | 231 | ||
404 | StringBuilder result = new StringBuilder(super.toString()); | 232 | StringBuilder result = new StringBuilder(super.toString()); |
405 | result.append(" (width: "); | 233 | result.append(" (referenceCoord: "); |
406 | result.append(width); | ||
407 | result.append(", referenceCoord: "); | ||
408 | result.append(referenceCoord); | 234 | result.append(referenceCoord); |
409 | result.append(", numWidth: "); | ||
410 | result.append(numWidth); | ||
411 | result.append(')'); | 235 | result.append(')'); |
412 | return result.toString(); | 236 | return result.toString(); |
413 | } | 237 | } |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/RelationImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/RelationImpl.java index 5b8ec921..97131c99 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/RelationImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/RelationImpl.java | |||
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; | |||
23 | * </p> | 23 | * </p> |
24 | * <ul> | 24 | * <ul> |
25 | * <li>{@link crossingScenario.impl.RelationImpl#getTarget <em>Target</em>}</li> | 25 | * <li>{@link crossingScenario.impl.RelationImpl#getTarget <em>Target</em>}</li> |
26 | * <li>{@link crossingScenario.impl.RelationImpl#getSource <em>Source</em>}</li> | ||
26 | * </ul> | 27 | * </ul> |
27 | * | 28 | * |
28 | * @generated | 29 | * @generated |
@@ -39,6 +40,16 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen | |||
39 | protected Actor target; | 40 | protected Actor target; |
40 | 41 | ||
41 | /** | 42 | /** |
43 | * The cached value of the '{@link #getSource() <em>Source</em>}' reference. | ||
44 | * <!-- begin-user-doc --> | ||
45 | * <!-- end-user-doc --> | ||
46 | * @see #getSource() | ||
47 | * @generated | ||
48 | * @ordered | ||
49 | */ | ||
50 | protected Actor source; | ||
51 | |||
52 | /** | ||
42 | * <!-- begin-user-doc --> | 53 | * <!-- begin-user-doc --> |
43 | * <!-- end-user-doc --> | 54 | * <!-- end-user-doc --> |
44 | * @generated | 55 | * @generated |
@@ -103,11 +114,54 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen | |||
103 | * @generated | 114 | * @generated |
104 | */ | 115 | */ |
105 | @Override | 116 | @Override |
117 | public Actor getSource() { | ||
118 | if (source != null && source.eIsProxy()) { | ||
119 | InternalEObject oldSource = (InternalEObject)source; | ||
120 | source = (Actor)eResolveProxy(oldSource); | ||
121 | if (source != oldSource) { | ||
122 | if (eNotificationRequired()) | ||
123 | eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.RELATION__SOURCE, oldSource, source)); | ||
124 | } | ||
125 | } | ||
126 | return source; | ||
127 | } | ||
128 | |||
129 | /** | ||
130 | * <!-- begin-user-doc --> | ||
131 | * <!-- end-user-doc --> | ||
132 | * @generated | ||
133 | */ | ||
134 | public Actor basicGetSource() { | ||
135 | return source; | ||
136 | } | ||
137 | |||
138 | /** | ||
139 | * <!-- begin-user-doc --> | ||
140 | * <!-- end-user-doc --> | ||
141 | * @generated | ||
142 | */ | ||
143 | @Override | ||
144 | public void setSource(Actor newSource) { | ||
145 | Actor oldSource = source; | ||
146 | source = newSource; | ||
147 | if (eNotificationRequired()) | ||
148 | eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.RELATION__SOURCE, oldSource, source)); | ||
149 | } | ||
150 | |||
151 | /** | ||
152 | * <!-- begin-user-doc --> | ||
153 | * <!-- end-user-doc --> | ||
154 | * @generated | ||
155 | */ | ||
156 | @Override | ||
106 | public Object eGet(int featureID, boolean resolve, boolean coreType) { | 157 | public Object eGet(int featureID, boolean resolve, boolean coreType) { |
107 | switch (featureID) { | 158 | switch (featureID) { |
108 | case CrossingScenarioPackage.RELATION__TARGET: | 159 | case CrossingScenarioPackage.RELATION__TARGET: |
109 | if (resolve) return getTarget(); | 160 | if (resolve) return getTarget(); |
110 | return basicGetTarget(); | 161 | return basicGetTarget(); |
162 | case CrossingScenarioPackage.RELATION__SOURCE: | ||
163 | if (resolve) return getSource(); | ||
164 | return basicGetSource(); | ||
111 | } | 165 | } |
112 | return super.eGet(featureID, resolve, coreType); | 166 | return super.eGet(featureID, resolve, coreType); |
113 | } | 167 | } |
@@ -123,6 +177,9 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen | |||
123 | case CrossingScenarioPackage.RELATION__TARGET: | 177 | case CrossingScenarioPackage.RELATION__TARGET: |
124 | setTarget((Actor)newValue); | 178 | setTarget((Actor)newValue); |
125 | return; | 179 | return; |
180 | case CrossingScenarioPackage.RELATION__SOURCE: | ||
181 | setSource((Actor)newValue); | ||
182 | return; | ||
126 | } | 183 | } |
127 | super.eSet(featureID, newValue); | 184 | super.eSet(featureID, newValue); |
128 | } | 185 | } |
@@ -138,6 +195,9 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen | |||
138 | case CrossingScenarioPackage.RELATION__TARGET: | 195 | case CrossingScenarioPackage.RELATION__TARGET: |
139 | setTarget((Actor)null); | 196 | setTarget((Actor)null); |
140 | return; | 197 | return; |
198 | case CrossingScenarioPackage.RELATION__SOURCE: | ||
199 | setSource((Actor)null); | ||
200 | return; | ||
141 | } | 201 | } |
142 | super.eUnset(featureID); | 202 | super.eUnset(featureID); |
143 | } | 203 | } |
@@ -152,6 +212,8 @@ public abstract class RelationImpl extends MinimalEObjectImpl.Container implemen | |||
152 | switch (featureID) { | 212 | switch (featureID) { |
153 | case CrossingScenarioPackage.RELATION__TARGET: | 213 | case CrossingScenarioPackage.RELATION__TARGET: |
154 | return target != null; | 214 | return target != null; |
215 | case CrossingScenarioPackage.RELATION__SOURCE: | ||
216 | return source != null; | ||
155 | } | 217 | } |
156 | return super.eIsSet(featureID); | 218 | return super.eIsSet(featureID); |
157 | } | 219 | } |