From 14afb998045e508b07633ea63c72b582084f8c4c Mon Sep 17 00:00:00 2001 From: Aren Babikian Date: Wed, 3 Feb 2021 02:35:39 +0100 Subject: major changes to CS case study, working example, few issues, major assumptions --- .../ecore-gen/crossingScenario/Actor.java | 41 ------ .../crossingScenario/CrossingScenarioPackage.java | 140 +-------------------- .../ecore-gen/crossingScenario/impl/ActorImpl.java | 84 ------------- .../impl/CrossingScenarioPackageImpl.java | 36 ------ 4 files changed, 1 insertion(+), 300 deletions(-) (limited to 'Domains/crossingScenario/ecore-gen') 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 @@ */ package crossingScenario; -import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EObject; /** @@ -22,9 +20,6 @@ import org.eclipse.emf.ecore.EObject; *
  • {@link crossingScenario.Actor#getXSpeed XSpeed}
    • *
  • {@link crossingScenario.Actor#getPlacedOn Placed On}
    • *
  • {@link crossingScenario.Actor#getYSpeed YSpeed}
    • - *
  • {@link crossingScenario.Actor#getDist_near Dist near}
    • - *
  • {@link crossingScenario.Actor#getDist_med Dist med}
    • - *
  • {@link crossingScenario.Actor#getDist_far Dist far}
    • * * * @see crossingScenario.CrossingScenarioPackage#getActor() @@ -190,40 +185,4 @@ public interface Actor extends EObject { */ void setYSpeed(double value); - /** - * Returns the value of the 'Dist near' reference list. - * The list contents are of type {@link crossingScenario.Actor}. - * - * - * @return the value of the 'Dist near' reference list. - * @see crossingScenario.CrossingScenarioPackage#getActor_Dist_near() - * @model transient="true" volatile="true" derived="true" - * @generated - */ - EList getDist_near(); - - /** - * Returns the value of the 'Dist med' reference list. - * The list contents are of type {@link crossingScenario.Actor}. - * - * - * @return the value of the 'Dist med' reference list. - * @see crossingScenario.CrossingScenarioPackage#getActor_Dist_med() - * @model transient="true" volatile="true" derived="true" - * @generated - */ - EList getDist_med(); - - /** - * Returns the value of the 'Dist far' reference list. - * The list contents are of type {@link crossingScenario.Actor}. - * - * - * @return the value of the 'Dist far' reference list. - * @see crossingScenario.CrossingScenarioPackage#getActor_Dist_far() - * @model transient="true" volatile="true" derived="true" - * @generated - */ - EList getDist_far(); - } // 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 @@ -275,33 +275,6 @@ public interface CrossingScenarioPackage extends EPackage { */ int ACTOR__YSPEED = 6; - /** - * The feature id for the 'Dist near' reference list. - * - * - * @generated - * @ordered - */ - int ACTOR__DIST_NEAR = 7; - - /** - * The feature id for the 'Dist med' reference list. - * - * - * @generated - * @ordered - */ - int ACTOR__DIST_MED = 8; - - /** - * The feature id for the 'Dist far' reference list. - * - * - * @generated - * @ordered - */ - int ACTOR__DIST_FAR = 9; - /** * The number of structural features of the 'Actor' class. * @@ -309,7 +282,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int ACTOR_FEATURE_COUNT = 10; + int ACTOR_FEATURE_COUNT = 7; /** * The number of operations of the 'Actor' class. @@ -549,33 +522,6 @@ public interface CrossingScenarioPackage extends EPackage { */ int PEDESTRIAN__YSPEED = ACTOR__YSPEED; - /** - * The feature id for the 'Dist near' reference list. - * - * - * @generated - * @ordered - */ - int PEDESTRIAN__DIST_NEAR = ACTOR__DIST_NEAR; - - /** - * The feature id for the 'Dist med' reference list. - * - * - * @generated - * @ordered - */ - int PEDESTRIAN__DIST_MED = ACTOR__DIST_MED; - - /** - * The feature id for the 'Dist far' reference list. - * - * - * @generated - * @ordered - */ - int PEDESTRIAN__DIST_FAR = ACTOR__DIST_FAR; - /** * The number of structural features of the 'Pedestrian' class. * @@ -667,33 +613,6 @@ public interface CrossingScenarioPackage extends EPackage { */ int VEHICLE__YSPEED = ACTOR__YSPEED; - /** - * The feature id for the 'Dist near' reference list. - * - * - * @generated - * @ordered - */ - int VEHICLE__DIST_NEAR = ACTOR__DIST_NEAR; - - /** - * The feature id for the 'Dist med' reference list. - * - * - * @generated - * @ordered - */ - int VEHICLE__DIST_MED = ACTOR__DIST_MED; - - /** - * The feature id for the 'Dist far' reference list. - * - * - * @generated - * @ordered - */ - int VEHICLE__DIST_FAR = ACTOR__DIST_FAR; - /** * The number of structural features of the 'Vehicle' class. * @@ -1022,39 +941,6 @@ public interface CrossingScenarioPackage extends EPackage { */ EAttribute getActor_YSpeed(); - /** - * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_near Dist near}'. - * - * - * @return the meta object for the reference list 'Dist near'. - * @see crossingScenario.Actor#getDist_near() - * @see #getActor() - * @generated - */ - EReference getActor_Dist_near(); - - /** - * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_med Dist med}'. - * - * - * @return the meta object for the reference list 'Dist med'. - * @see crossingScenario.Actor#getDist_med() - * @see #getActor() - * @generated - */ - EReference getActor_Dist_med(); - - /** - * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_far Dist far}'. - * - * - * @return the meta object for the reference list 'Dist far'. - * @see crossingScenario.Actor#getDist_far() - * @see #getActor() - * @generated - */ - EReference getActor_Dist_far(); - /** * Returns the meta object for class '{@link crossingScenario.Relation Relation}'. * @@ -1358,30 +1244,6 @@ public interface CrossingScenarioPackage extends EPackage { */ EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed(); - /** - * The meta object literal for the 'Dist near' reference list feature. - * - * - * @generated - */ - EReference ACTOR__DIST_NEAR = eINSTANCE.getActor_Dist_near(); - - /** - * The meta object literal for the 'Dist med' reference list feature. - * - * - * @generated - */ - EReference ACTOR__DIST_MED = eINSTANCE.getActor_Dist_med(); - - /** - * The meta object literal for the 'Dist far' reference list feature. - * - * - * @generated - */ - EReference ACTOR__DIST_FAR = eINSTANCE.getActor_Dist_far(); - /** * The meta object literal for the '{@link crossingScenario.impl.RelationImpl Relation}' class. * 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; import crossingScenario.Actor; import crossingScenario.CrossingScenarioPackage; import crossingScenario.Lane; - -import java.util.Collection; - import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.notify.NotificationChain; - -import org.eclipse.emf.common.util.EList; - import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.InternalEObject; @@ -34,9 +28,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl; *
  • {@link crossingScenario.impl.ActorImpl#getXSpeed XSpeed}
    • *
  • {@link crossingScenario.impl.ActorImpl#getPlacedOn Placed On}
    • *
  • {@link crossingScenario.impl.ActorImpl#getYSpeed YSpeed}
    • - *
  • {@link crossingScenario.impl.ActorImpl#getDist_near Dist near}
    • - *
  • {@link crossingScenario.impl.ActorImpl#getDist_med Dist med}
    • - *
  • {@link crossingScenario.impl.ActorImpl#getDist_far Dist far}
    • * * * @generated @@ -391,48 +382,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.ACTOR__YSPEED, oldYSpeed, ySpeed)); } - /** - * - * - * @generated - */ - @Override - public EList getDist_near() { - // TODO: implement this method to return the 'Dist near' reference list - // Ensure that you remove @generated or mark it @generated NOT - // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting - // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. - throw new UnsupportedOperationException(); - } - - /** - * - * - * @generated - */ - @Override - public EList getDist_med() { - // TODO: implement this method to return the 'Dist med' reference list - // Ensure that you remove @generated or mark it @generated NOT - // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting - // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. - throw new UnsupportedOperationException(); - } - - /** - * - * - * @generated - */ - @Override - public EList getDist_far() { - // TODO: implement this method to return the 'Dist far' reference list - // Ensure that you remove @generated or mark it @generated NOT - // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting - // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used. - throw new UnsupportedOperationException(); - } - /** * * @@ -486,12 +435,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements return basicGetPlacedOn(); case CrossingScenarioPackage.ACTOR__YSPEED: return getYSpeed(); - case CrossingScenarioPackage.ACTOR__DIST_NEAR: - return getDist_near(); - case CrossingScenarioPackage.ACTOR__DIST_MED: - return getDist_med(); - case CrossingScenarioPackage.ACTOR__DIST_FAR: - return getDist_far(); } return super.eGet(featureID, resolve, coreType); } @@ -526,18 +469,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements case CrossingScenarioPackage.ACTOR__YSPEED: setYSpeed((Double)newValue); return; - case CrossingScenarioPackage.ACTOR__DIST_NEAR: - getDist_near().clear(); - getDist_near().addAll((Collection)newValue); - return; - case CrossingScenarioPackage.ACTOR__DIST_MED: - getDist_med().clear(); - getDist_med().addAll((Collection)newValue); - return; - case CrossingScenarioPackage.ACTOR__DIST_FAR: - getDist_far().clear(); - getDist_far().addAll((Collection)newValue); - return; } super.eSet(featureID, newValue); } @@ -571,15 +502,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements case CrossingScenarioPackage.ACTOR__YSPEED: setYSpeed(YSPEED_EDEFAULT); return; - case CrossingScenarioPackage.ACTOR__DIST_NEAR: - getDist_near().clear(); - return; - case CrossingScenarioPackage.ACTOR__DIST_MED: - getDist_med().clear(); - return; - case CrossingScenarioPackage.ACTOR__DIST_FAR: - getDist_far().clear(); - return; } super.eUnset(featureID); } @@ -606,12 +528,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements return placedOn != null; case CrossingScenarioPackage.ACTOR__YSPEED: return ySpeed != YSPEED_EDEFAULT; - case CrossingScenarioPackage.ACTOR__DIST_NEAR: - return !getDist_near().isEmpty(); - case CrossingScenarioPackage.ACTOR__DIST_MED: - return !getDist_med().isEmpty(); - case CrossingScenarioPackage.ACTOR__DIST_FAR: - return !getDist_far().isEmpty(); } return super.eIsSet(featureID); } 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 @@ -360,36 +360,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin return (EAttribute)actorEClass.getEStructuralFeatures().get(6); } - /** - * - * - * @generated - */ - @Override - public EReference getActor_Dist_near() { - return (EReference)actorEClass.getEStructuralFeatures().get(7); - } - - /** - * - * - * @generated - */ - @Override - public EReference getActor_Dist_med() { - return (EReference)actorEClass.getEStructuralFeatures().get(8); - } - - /** - * - * - * @generated - */ - @Override - public EReference getActor_Dist_far() { - return (EReference)actorEClass.getEStructuralFeatures().get(9); - } - /** * * @@ -551,9 +521,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin createEAttribute(actorEClass, ACTOR__XSPEED); createEReference(actorEClass, ACTOR__PLACED_ON); createEAttribute(actorEClass, ACTOR__YSPEED); - createEReference(actorEClass, ACTOR__DIST_NEAR); - createEReference(actorEClass, ACTOR__DIST_MED); - createEReference(actorEClass, ACTOR__DIST_FAR); relationEClass = createEClass(RELATION); createEReference(relationEClass, RELATION__TARGET); @@ -632,9 +599,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin 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); 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); 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); - 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); - 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); - 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); initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 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); -- cgit v1.2.3-54-g00ecf