diff options
author | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-02-03 02:35:39 +0100 |
---|---|---|
committer | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-02-03 02:35:39 +0100 |
commit | 14afb998045e508b07633ea63c72b582084f8c4c (patch) | |
tree | 9c03bcfce180a950adb26ed0ec0bcc5c45fdfaec /Domains/crossingScenario/ecore-gen | |
parent | fix derived feature handling + impove dreal calling (diff) | |
download | VIATRA-Generator-14afb998045e508b07633ea63c72b582084f8c4c.tar.gz VIATRA-Generator-14afb998045e508b07633ea63c72b582084f8c4c.tar.zst VIATRA-Generator-14afb998045e508b07633ea63c72b582084f8c4c.zip |
major changes to CS case study, working example, few issues, major assumptions
Diffstat (limited to 'Domains/crossingScenario/ecore-gen')
4 files changed, 1 insertions, 300 deletions
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java index 1b570b6f..cbfc21cf 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Actor.java | |||
@@ -2,8 +2,6 @@ | |||
2 | */ | 2 | */ |
3 | package crossingScenario; | 3 | package crossingScenario; |
4 | 4 | ||
5 | import org.eclipse.emf.common.util.EList; | ||
6 | |||
7 | import org.eclipse.emf.ecore.EObject; | 5 | import org.eclipse.emf.ecore.EObject; |
8 | 6 | ||
9 | /** | 7 | /** |
@@ -22,9 +20,6 @@ import org.eclipse.emf.ecore.EObject; | |||
22 | * <li>{@link crossingScenario.Actor#getXSpeed <em>XSpeed</em>}</li> | 20 | * <li>{@link crossingScenario.Actor#getXSpeed <em>XSpeed</em>}</li> |
23 | * <li>{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}</li> | 21 | * <li>{@link crossingScenario.Actor#getPlacedOn <em>Placed On</em>}</li> |
24 | * <li>{@link crossingScenario.Actor#getYSpeed <em>YSpeed</em>}</li> | 22 | * <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> | ||
28 | * </ul> | 23 | * </ul> |
29 | * | 24 | * |
30 | * @see crossingScenario.CrossingScenarioPackage#getActor() | 25 | * @see crossingScenario.CrossingScenarioPackage#getActor() |
@@ -190,40 +185,4 @@ public interface Actor extends EObject { | |||
190 | */ | 185 | */ |
191 | void setYSpeed(double value); | 186 | void setYSpeed(double value); |
192 | 187 | ||
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 | |||
229 | } // Actor | 188 | } // Actor |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java index 9985f18a..b39553f9 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java | |||
@@ -276,40 +276,13 @@ public interface CrossingScenarioPackage extends EPackage { | |||
276 | int ACTOR__YSPEED = 6; | 276 | int ACTOR__YSPEED = 6; |
277 | 277 | ||
278 | /** | 278 | /** |
279 | * The feature id for the '<em><b>Dist near</b></em>' reference list. | ||
280 | * <!-- begin-user-doc --> | ||
281 | * <!-- end-user-doc --> | ||
282 | * @generated | ||
283 | * @ordered | ||
284 | */ | ||
285 | int ACTOR__DIST_NEAR = 7; | ||
286 | |||
287 | /** | ||
288 | * The feature id for the '<em><b>Dist med</b></em>' reference list. | ||
289 | * <!-- begin-user-doc --> | ||
290 | * <!-- end-user-doc --> | ||
291 | * @generated | ||
292 | * @ordered | ||
293 | */ | ||
294 | int ACTOR__DIST_MED = 8; | ||
295 | |||
296 | /** | ||
297 | * The feature id for the '<em><b>Dist far</b></em>' reference list. | ||
298 | * <!-- begin-user-doc --> | ||
299 | * <!-- end-user-doc --> | ||
300 | * @generated | ||
301 | * @ordered | ||
302 | */ | ||
303 | int ACTOR__DIST_FAR = 9; | ||
304 | |||
305 | /** | ||
306 | * The number of structural features of the '<em>Actor</em>' class. | 279 | * The number of structural features of the '<em>Actor</em>' class. |
307 | * <!-- begin-user-doc --> | 280 | * <!-- begin-user-doc --> |
308 | * <!-- end-user-doc --> | 281 | * <!-- end-user-doc --> |
309 | * @generated | 282 | * @generated |
310 | * @ordered | 283 | * @ordered |
311 | */ | 284 | */ |
312 | int ACTOR_FEATURE_COUNT = 10; | 285 | int ACTOR_FEATURE_COUNT = 7; |
313 | 286 | ||
314 | /** | 287 | /** |
315 | * The number of operations of the '<em>Actor</em>' class. | 288 | * The number of operations of the '<em>Actor</em>' class. |
@@ -550,33 +523,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
550 | int PEDESTRIAN__YSPEED = ACTOR__YSPEED; | 523 | int PEDESTRIAN__YSPEED = ACTOR__YSPEED; |
551 | 524 | ||
552 | /** | 525 | /** |
553 | * The feature id for the '<em><b>Dist near</b></em>' reference list. | ||
554 | * <!-- begin-user-doc --> | ||
555 | * <!-- end-user-doc --> | ||
556 | * @generated | ||
557 | * @ordered | ||
558 | */ | ||
559 | int PEDESTRIAN__DIST_NEAR = ACTOR__DIST_NEAR; | ||
560 | |||
561 | /** | ||
562 | * The feature id for the '<em><b>Dist med</b></em>' reference list. | ||
563 | * <!-- begin-user-doc --> | ||
564 | * <!-- end-user-doc --> | ||
565 | * @generated | ||
566 | * @ordered | ||
567 | */ | ||
568 | int PEDESTRIAN__DIST_MED = ACTOR__DIST_MED; | ||
569 | |||
570 | /** | ||
571 | * The feature id for the '<em><b>Dist far</b></em>' reference list. | ||
572 | * <!-- begin-user-doc --> | ||
573 | * <!-- end-user-doc --> | ||
574 | * @generated | ||
575 | * @ordered | ||
576 | */ | ||
577 | int PEDESTRIAN__DIST_FAR = ACTOR__DIST_FAR; | ||
578 | |||
579 | /** | ||
580 | * The number of structural features of the '<em>Pedestrian</em>' class. | 526 | * The number of structural features of the '<em>Pedestrian</em>' class. |
581 | * <!-- begin-user-doc --> | 527 | * <!-- begin-user-doc --> |
582 | * <!-- end-user-doc --> | 528 | * <!-- end-user-doc --> |
@@ -668,33 +614,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
668 | int VEHICLE__YSPEED = ACTOR__YSPEED; | 614 | int VEHICLE__YSPEED = ACTOR__YSPEED; |
669 | 615 | ||
670 | /** | 616 | /** |
671 | * The feature id for the '<em><b>Dist near</b></em>' reference list. | ||
672 | * <!-- begin-user-doc --> | ||
673 | * <!-- end-user-doc --> | ||
674 | * @generated | ||
675 | * @ordered | ||
676 | */ | ||
677 | int VEHICLE__DIST_NEAR = ACTOR__DIST_NEAR; | ||
678 | |||
679 | /** | ||
680 | * The feature id for the '<em><b>Dist med</b></em>' reference list. | ||
681 | * <!-- begin-user-doc --> | ||
682 | * <!-- end-user-doc --> | ||
683 | * @generated | ||
684 | * @ordered | ||
685 | */ | ||
686 | int VEHICLE__DIST_MED = ACTOR__DIST_MED; | ||
687 | |||
688 | /** | ||
689 | * The feature id for the '<em><b>Dist far</b></em>' reference list. | ||
690 | * <!-- begin-user-doc --> | ||
691 | * <!-- end-user-doc --> | ||
692 | * @generated | ||
693 | * @ordered | ||
694 | */ | ||
695 | int VEHICLE__DIST_FAR = ACTOR__DIST_FAR; | ||
696 | |||
697 | /** | ||
698 | * The number of structural features of the '<em>Vehicle</em>' class. | 617 | * The number of structural features of the '<em>Vehicle</em>' class. |
699 | * <!-- begin-user-doc --> | 618 | * <!-- begin-user-doc --> |
700 | * <!-- end-user-doc --> | 619 | * <!-- end-user-doc --> |
@@ -1023,39 +942,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1023 | EAttribute getActor_YSpeed(); | 942 | EAttribute getActor_YSpeed(); |
1024 | 943 | ||
1025 | /** | 944 | /** |
1026 | * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_near <em>Dist near</em>}'. | ||
1027 | * <!-- begin-user-doc --> | ||
1028 | * <!-- end-user-doc --> | ||
1029 | * @return the meta object for the reference list '<em>Dist near</em>'. | ||
1030 | * @see crossingScenario.Actor#getDist_near() | ||
1031 | * @see #getActor() | ||
1032 | * @generated | ||
1033 | */ | ||
1034 | EReference getActor_Dist_near(); | ||
1035 | |||
1036 | /** | ||
1037 | * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_med <em>Dist med</em>}'. | ||
1038 | * <!-- begin-user-doc --> | ||
1039 | * <!-- end-user-doc --> | ||
1040 | * @return the meta object for the reference list '<em>Dist med</em>'. | ||
1041 | * @see crossingScenario.Actor#getDist_med() | ||
1042 | * @see #getActor() | ||
1043 | * @generated | ||
1044 | */ | ||
1045 | EReference getActor_Dist_med(); | ||
1046 | |||
1047 | /** | ||
1048 | * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_far <em>Dist far</em>}'. | ||
1049 | * <!-- begin-user-doc --> | ||
1050 | * <!-- end-user-doc --> | ||
1051 | * @return the meta object for the reference list '<em>Dist far</em>'. | ||
1052 | * @see crossingScenario.Actor#getDist_far() | ||
1053 | * @see #getActor() | ||
1054 | * @generated | ||
1055 | */ | ||
1056 | EReference getActor_Dist_far(); | ||
1057 | |||
1058 | /** | ||
1059 | * Returns the meta object for class '{@link crossingScenario.Relation <em>Relation</em>}'. | 945 | * Returns the meta object for class '{@link crossingScenario.Relation <em>Relation</em>}'. |
1060 | * <!-- begin-user-doc --> | 946 | * <!-- begin-user-doc --> |
1061 | * <!-- end-user-doc --> | 947 | * <!-- end-user-doc --> |
@@ -1359,30 +1245,6 @@ public interface CrossingScenarioPackage extends EPackage { | |||
1359 | EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed(); | 1245 | EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed(); |
1360 | 1246 | ||
1361 | /** | 1247 | /** |
1362 | * The meta object literal for the '<em><b>Dist near</b></em>' reference list feature. | ||
1363 | * <!-- begin-user-doc --> | ||
1364 | * <!-- end-user-doc --> | ||
1365 | * @generated | ||
1366 | */ | ||
1367 | EReference ACTOR__DIST_NEAR = eINSTANCE.getActor_Dist_near(); | ||
1368 | |||
1369 | /** | ||
1370 | * The meta object literal for the '<em><b>Dist med</b></em>' reference list feature. | ||
1371 | * <!-- begin-user-doc --> | ||
1372 | * <!-- end-user-doc --> | ||
1373 | * @generated | ||
1374 | */ | ||
1375 | EReference ACTOR__DIST_MED = eINSTANCE.getActor_Dist_med(); | ||
1376 | |||
1377 | /** | ||
1378 | * The meta object literal for the '<em><b>Dist far</b></em>' reference list feature. | ||
1379 | * <!-- begin-user-doc --> | ||
1380 | * <!-- end-user-doc --> | ||
1381 | * @generated | ||
1382 | */ | ||
1383 | EReference ACTOR__DIST_FAR = eINSTANCE.getActor_Dist_far(); | ||
1384 | |||
1385 | /** | ||
1386 | * The meta object literal for the '{@link crossingScenario.impl.RelationImpl <em>Relation</em>}' class. | 1248 | * The meta object literal for the '{@link crossingScenario.impl.RelationImpl <em>Relation</em>}' class. |
1387 | * <!-- begin-user-doc --> | 1249 | * <!-- begin-user-doc --> |
1388 | * <!-- end-user-doc --> | 1250 | * <!-- end-user-doc --> |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java index 52d251e0..9ef288f0 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java | |||
@@ -5,14 +5,8 @@ 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 | |||
9 | import java.util.Collection; | ||
10 | |||
11 | import org.eclipse.emf.common.notify.Notification; | 8 | import org.eclipse.emf.common.notify.Notification; |
12 | import org.eclipse.emf.common.notify.NotificationChain; | 9 | import org.eclipse.emf.common.notify.NotificationChain; |
13 | |||
14 | import org.eclipse.emf.common.util.EList; | ||
15 | |||
16 | import org.eclipse.emf.ecore.EClass; | 10 | import org.eclipse.emf.ecore.EClass; |
17 | import org.eclipse.emf.ecore.InternalEObject; | 11 | import org.eclipse.emf.ecore.InternalEObject; |
18 | 12 | ||
@@ -34,9 +28,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; | |||
34 | * <li>{@link crossingScenario.impl.ActorImpl#getXSpeed <em>XSpeed</em>}</li> | 28 | * <li>{@link crossingScenario.impl.ActorImpl#getXSpeed <em>XSpeed</em>}</li> |
35 | * <li>{@link crossingScenario.impl.ActorImpl#getPlacedOn <em>Placed On</em>}</li> | 29 | * <li>{@link crossingScenario.impl.ActorImpl#getPlacedOn <em>Placed On</em>}</li> |
36 | * <li>{@link crossingScenario.impl.ActorImpl#getYSpeed <em>YSpeed</em>}</li> | 30 | * <li>{@link crossingScenario.impl.ActorImpl#getYSpeed <em>YSpeed</em>}</li> |
37 | * <li>{@link crossingScenario.impl.ActorImpl#getDist_near <em>Dist near</em>}</li> | ||
38 | * <li>{@link crossingScenario.impl.ActorImpl#getDist_med <em>Dist med</em>}</li> | ||
39 | * <li>{@link crossingScenario.impl.ActorImpl#getDist_far <em>Dist far</em>}</li> | ||
40 | * </ul> | 31 | * </ul> |
41 | * | 32 | * |
42 | * @generated | 33 | * @generated |
@@ -397,48 +388,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
397 | * @generated | 388 | * @generated |
398 | */ | 389 | */ |
399 | @Override | 390 | @Override |
400 | public EList<Actor> getDist_near() { | ||
401 | // TODO: implement this method to return the 'Dist near' reference list | ||
402 | // Ensure that you remove @generated or mark it @generated NOT | ||
403 | // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting | ||
404 | // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. | ||
405 | throw new UnsupportedOperationException(); | ||
406 | } | ||
407 | |||
408 | /** | ||
409 | * <!-- begin-user-doc --> | ||
410 | * <!-- end-user-doc --> | ||
411 | * @generated | ||
412 | */ | ||
413 | @Override | ||
414 | public EList<Actor> getDist_med() { | ||
415 | // TODO: implement this method to return the 'Dist med' reference list | ||
416 | // Ensure that you remove @generated or mark it @generated NOT | ||
417 | // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting | ||
418 | // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. | ||
419 | throw new UnsupportedOperationException(); | ||
420 | } | ||
421 | |||
422 | /** | ||
423 | * <!-- begin-user-doc --> | ||
424 | * <!-- end-user-doc --> | ||
425 | * @generated | ||
426 | */ | ||
427 | @Override | ||
428 | public EList<Actor> getDist_far() { | ||
429 | // TODO: implement this method to return the 'Dist far' reference list | ||
430 | // Ensure that you remove @generated or mark it @generated NOT | ||
431 | // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting | ||
432 | // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. | ||
433 | throw new UnsupportedOperationException(); | ||
434 | } | ||
435 | |||
436 | /** | ||
437 | * <!-- begin-user-doc --> | ||
438 | * <!-- end-user-doc --> | ||
439 | * @generated | ||
440 | */ | ||
441 | @Override | ||
442 | public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { | 391 | public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) { |
443 | switch (featureID) { | 392 | switch (featureID) { |
444 | case CrossingScenarioPackage.ACTOR__PLACED_ON: | 393 | case CrossingScenarioPackage.ACTOR__PLACED_ON: |
@@ -486,12 +435,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
486 | return basicGetPlacedOn(); | 435 | return basicGetPlacedOn(); |
487 | case CrossingScenarioPackage.ACTOR__YSPEED: | 436 | case CrossingScenarioPackage.ACTOR__YSPEED: |
488 | return getYSpeed(); | 437 | return getYSpeed(); |
489 | case CrossingScenarioPackage.ACTOR__DIST_NEAR: | ||
490 | return getDist_near(); | ||
491 | case CrossingScenarioPackage.ACTOR__DIST_MED: | ||
492 | return getDist_med(); | ||
493 | case CrossingScenarioPackage.ACTOR__DIST_FAR: | ||
494 | return getDist_far(); | ||
495 | } | 438 | } |
496 | return super.eGet(featureID, resolve, coreType); | 439 | return super.eGet(featureID, resolve, coreType); |
497 | } | 440 | } |
@@ -526,18 +469,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
526 | case CrossingScenarioPackage.ACTOR__YSPEED: | 469 | case CrossingScenarioPackage.ACTOR__YSPEED: |
527 | setYSpeed((Double)newValue); | 470 | setYSpeed((Double)newValue); |
528 | return; | 471 | return; |
529 | case CrossingScenarioPackage.ACTOR__DIST_NEAR: | ||
530 | getDist_near().clear(); | ||
531 | getDist_near().addAll((Collection<? extends Actor>)newValue); | ||
532 | return; | ||
533 | case CrossingScenarioPackage.ACTOR__DIST_MED: | ||
534 | getDist_med().clear(); | ||
535 | getDist_med().addAll((Collection<? extends Actor>)newValue); | ||
536 | return; | ||
537 | case CrossingScenarioPackage.ACTOR__DIST_FAR: | ||
538 | getDist_far().clear(); | ||
539 | getDist_far().addAll((Collection<? extends Actor>)newValue); | ||
540 | return; | ||
541 | } | 472 | } |
542 | super.eSet(featureID, newValue); | 473 | super.eSet(featureID, newValue); |
543 | } | 474 | } |
@@ -571,15 +502,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
571 | case CrossingScenarioPackage.ACTOR__YSPEED: | 502 | case CrossingScenarioPackage.ACTOR__YSPEED: |
572 | setYSpeed(YSPEED_EDEFAULT); | 503 | setYSpeed(YSPEED_EDEFAULT); |
573 | return; | 504 | return; |
574 | case CrossingScenarioPackage.ACTOR__DIST_NEAR: | ||
575 | getDist_near().clear(); | ||
576 | return; | ||
577 | case CrossingScenarioPackage.ACTOR__DIST_MED: | ||
578 | getDist_med().clear(); | ||
579 | return; | ||
580 | case CrossingScenarioPackage.ACTOR__DIST_FAR: | ||
581 | getDist_far().clear(); | ||
582 | return; | ||
583 | } | 505 | } |
584 | super.eUnset(featureID); | 506 | super.eUnset(featureID); |
585 | } | 507 | } |
@@ -606,12 +528,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements | |||
606 | return placedOn != null; | 528 | return placedOn != null; |
607 | case CrossingScenarioPackage.ACTOR__YSPEED: | 529 | case CrossingScenarioPackage.ACTOR__YSPEED: |
608 | return ySpeed != YSPEED_EDEFAULT; | 530 | return ySpeed != YSPEED_EDEFAULT; |
609 | case CrossingScenarioPackage.ACTOR__DIST_NEAR: | ||
610 | return !getDist_near().isEmpty(); | ||
611 | case CrossingScenarioPackage.ACTOR__DIST_MED: | ||
612 | return !getDist_med().isEmpty(); | ||
613 | case CrossingScenarioPackage.ACTOR__DIST_FAR: | ||
614 | return !getDist_far().isEmpty(); | ||
615 | } | 531 | } |
616 | return super.eIsSet(featureID); | 532 | return super.eIsSet(featureID); |
617 | } | 533 | } |
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java index 7f8f7357..887e02fe 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java | |||
@@ -366,36 +366,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
366 | * @generated | 366 | * @generated |
367 | */ | 367 | */ |
368 | @Override | 368 | @Override |
369 | public EReference getActor_Dist_near() { | ||
370 | return (EReference)actorEClass.getEStructuralFeatures().get(7); | ||
371 | } | ||
372 | |||
373 | /** | ||
374 | * <!-- begin-user-doc --> | ||
375 | * <!-- end-user-doc --> | ||
376 | * @generated | ||
377 | */ | ||
378 | @Override | ||
379 | public EReference getActor_Dist_med() { | ||
380 | return (EReference)actorEClass.getEStructuralFeatures().get(8); | ||
381 | } | ||
382 | |||
383 | /** | ||
384 | * <!-- begin-user-doc --> | ||
385 | * <!-- end-user-doc --> | ||
386 | * @generated | ||
387 | */ | ||
388 | @Override | ||
389 | public EReference getActor_Dist_far() { | ||
390 | return (EReference)actorEClass.getEStructuralFeatures().get(9); | ||
391 | } | ||
392 | |||
393 | /** | ||
394 | * <!-- begin-user-doc --> | ||
395 | * <!-- end-user-doc --> | ||
396 | * @generated | ||
397 | */ | ||
398 | @Override | ||
399 | public EClass getRelation() { | 369 | public EClass getRelation() { |
400 | return relationEClass; | 370 | return relationEClass; |
401 | } | 371 | } |
@@ -551,9 +521,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
551 | createEAttribute(actorEClass, ACTOR__XSPEED); | 521 | createEAttribute(actorEClass, ACTOR__XSPEED); |
552 | createEReference(actorEClass, ACTOR__PLACED_ON); | 522 | createEReference(actorEClass, ACTOR__PLACED_ON); |
553 | createEAttribute(actorEClass, ACTOR__YSPEED); | 523 | createEAttribute(actorEClass, ACTOR__YSPEED); |
554 | createEReference(actorEClass, ACTOR__DIST_NEAR); | ||
555 | createEReference(actorEClass, ACTOR__DIST_MED); | ||
556 | createEReference(actorEClass, ACTOR__DIST_FAR); | ||
557 | 524 | ||
558 | relationEClass = createEClass(RELATION); | 525 | relationEClass = createEClass(RELATION); |
559 | createEReference(relationEClass, RELATION__TARGET); | 526 | createEReference(relationEClass, RELATION__TARGET); |
@@ -632,9 +599,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin | |||
632 | 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); | 599 | 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); |
633 | 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); | 600 | 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); |
634 | 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); | 601 | 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); |
635 | 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); | ||
636 | 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); | ||
637 | 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); | ||
638 | 602 | ||
639 | initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); | 603 | initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); |
640 | 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); | 604 | 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); |