From 93f14577be72fe938c9bcb0f77d4a618133e1c37 Mon Sep 17 00:00:00 2001
From: Aren Babikian
Date: Tue, 12 Jan 2021 13:35:18 -0500
Subject: improve simpleScenario MM
---
.../ecore-gen/simpleScenario/Actor.java | 35 +-
.../ecore-gen/simpleScenario/Distance.java | 232 +++++++++++
.../ecore-gen/simpleScenario/Lane.java | 23 +-
.../ecore-gen/simpleScenario/Pedestrian.java | 17 +
.../simpleScenario/SeperationDistance.java | 35 +-
.../simpleScenario/SimpleScenarioFactory.java | 27 +-
.../simpleScenario/SimpleScenarioPackage.java | 341 +++++++++++++---
.../ecore-gen/simpleScenario/Vehicle.java | 17 +
.../ecore-gen/simpleScenario/impl/ActorImpl.java | 61 +--
.../ecore-gen/simpleScenario/impl/LaneImpl.java | 46 +--
.../simpleScenario/impl/PedestrianImpl.java | 37 ++
.../impl/SeperationDistanceImpl.java | 70 +++-
.../impl/SimpleScenarioFactoryImpl.java | 50 ++-
.../impl/SimpleScenarioPackageImpl.java | 117 ++++--
.../ecore-gen/simpleScenario/impl/VehicleImpl.java | 37 ++
.../util/SimpleScenarioAdapterFactory.java | 36 ++
.../simpleScenario/util/SimpleScenarioSwitch.java | 44 +++
Domains/simpleScenario/model/simpleScenario.aird | 437 ++++++++++++++-------
Domains/simpleScenario/model/simpleScenario.ecore | 30 +-
.../simpleScenario/model/simpleScenario.genmodel | 13 +-
20 files changed, 1297 insertions(+), 408 deletions(-)
create mode 100644 Domains/simpleScenario/ecore-gen/simpleScenario/Distance.java
create mode 100644 Domains/simpleScenario/ecore-gen/simpleScenario/Pedestrian.java
create mode 100644 Domains/simpleScenario/ecore-gen/simpleScenario/Vehicle.java
create mode 100644 Domains/simpleScenario/ecore-gen/simpleScenario/impl/PedestrianImpl.java
create mode 100644 Domains/simpleScenario/ecore-gen/simpleScenario/impl/VehicleImpl.java
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java b/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java
index c4ee874e..996d349c 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java
@@ -15,7 +15,6 @@ import org.eclipse.emf.ecore.EObject;
* The following features are supported:
*
*
- * - {@link simpleScenario.Actor#getType Type}
* - {@link simpleScenario.Actor#getXPos XPos}
* - {@link simpleScenario.Actor#getYPos YPos}
* - {@link simpleScenario.Actor#getLength Length}
@@ -26,35 +25,10 @@ import org.eclipse.emf.ecore.EObject;
*
*
* @see simpleScenario.SimpleScenarioPackage#getActor()
- * @model
+ * @model abstract="true"
* @generated
*/
public interface Actor extends EObject {
- /**
- * Returns the value of the 'Type' attribute.
- * The literals are from the enumeration {@link simpleScenario.ActorType}.
- *
- *
- * @return the value of the 'Type' attribute.
- * @see simpleScenario.ActorType
- * @see #setType(ActorType)
- * @see simpleScenario.SimpleScenarioPackage#getActor_Type()
- * @model required="true"
- * @generated
- */
- ActorType getType();
-
- /**
- * Sets the value of the '{@link simpleScenario.Actor#getType Type}' attribute.
- *
- *
- * @param value the new value of the 'Type' attribute.
- * @see simpleScenario.ActorType
- * @see #getType()
- * @generated
- */
- void setType(ActorType value);
-
/**
* Returns the value of the 'XPos' attribute.
*
@@ -107,7 +81,7 @@ public interface Actor extends EObject {
* @return the value of the 'Length' attribute.
* @see #setLength(double)
* @see simpleScenario.SimpleScenarioPackage#getActor_Length()
- * @model default="0.0"
+ * @model default="0.0" required="true" derived="true"
* @generated
*/
double getLength();
@@ -129,7 +103,7 @@ public interface Actor extends EObject {
* @return the value of the 'Width' attribute.
* @see #setWidth(double)
* @see simpleScenario.SimpleScenarioPackage#getActor_Width()
- * @model
+ * @model required="true" derived="true"
* @generated
*/
double getWidth();
@@ -146,12 +120,13 @@ public interface Actor extends EObject {
/**
* Returns the value of the 'Speed' attribute.
+ * The default value is "0.0"
.
*
*
* @return the value of the 'Speed' attribute.
* @see #setSpeed(double)
* @see simpleScenario.SimpleScenarioPackage#getActor_Speed()
- * @model required="true"
+ * @model default="0.0" required="true"
* @generated
*/
double getSpeed();
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Distance.java b/Domains/simpleScenario/ecore-gen/simpleScenario/Distance.java
new file mode 100644
index 00000000..52f67665
--- /dev/null
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/Distance.java
@@ -0,0 +1,232 @@
+/**
+ */
+package simpleScenario;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.Enumerator;
+
+/**
+ *
+ * A representation of the literals of the enumeration 'Distance',
+ * and utility methods for working with them.
+ *
+ * @see simpleScenario.SimpleScenarioPackage#getDistance()
+ * @model
+ * @generated
+ */
+public enum Distance implements Enumerator {
+ /**
+ * The 'Near' literal object.
+ *
+ *
+ * @see #NEAR_VALUE
+ * @generated
+ * @ordered
+ */
+ NEAR(0, "Near", "Near"),
+
+ /**
+ * The 'Medium' literal object.
+ *
+ *
+ * @see #MEDIUM_VALUE
+ * @generated
+ * @ordered
+ */
+ MEDIUM(1, "Medium", "Medium"),
+
+ /**
+ * The 'Far' literal object.
+ *
+ *
+ * @see #FAR_VALUE
+ * @generated
+ * @ordered
+ */
+ FAR(2, "Far", "Far");
+
+ /**
+ * The 'Near' literal value.
+ *
+ *
+ * @see #NEAR
+ * @model name="Near"
+ * @generated
+ * @ordered
+ */
+ public static final int NEAR_VALUE = 0;
+
+ /**
+ * The 'Medium' literal value.
+ *
+ *
+ * @see #MEDIUM
+ * @model name="Medium"
+ * @generated
+ * @ordered
+ */
+ public static final int MEDIUM_VALUE = 1;
+
+ /**
+ * The 'Far' literal value.
+ *
+ *
+ * @see #FAR
+ * @model name="Far"
+ * @generated
+ * @ordered
+ */
+ public static final int FAR_VALUE = 2;
+
+ /**
+ * An array of all the 'Distance' enumerators.
+ *
+ *
+ * @generated
+ */
+ private static final Distance[] VALUES_ARRAY =
+ new Distance[] {
+ NEAR,
+ MEDIUM,
+ FAR,
+ };
+
+ /**
+ * A public read-only list of all the 'Distance' enumerators.
+ *
+ *
+ * @generated
+ */
+ public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
+
+ /**
+ * Returns the 'Distance' literal with the specified literal value.
+ *
+ *
+ * @param literal the literal.
+ * @return the matching enumerator or null
.
+ * @generated
+ */
+ public static Distance get(String literal) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ Distance result = VALUES_ARRAY[i];
+ if (result.toString().equals(literal)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the 'Distance' literal with the specified name.
+ *
+ *
+ * @param name the name.
+ * @return the matching enumerator or null
.
+ * @generated
+ */
+ public static Distance getByName(String name) {
+ for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+ Distance result = VALUES_ARRAY[i];
+ if (result.getName().equals(name)) {
+ return result;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns the 'Distance' literal with the specified integer value.
+ *
+ *
+ * @param value the integer value.
+ * @return the matching enumerator or null
.
+ * @generated
+ */
+ public static Distance get(int value) {
+ switch (value) {
+ case NEAR_VALUE: return NEAR;
+ case MEDIUM_VALUE: return MEDIUM;
+ case FAR_VALUE: return FAR;
+ }
+ return null;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private final int value;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private final String name;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private final String literal;
+
+ /**
+ * Only this class can construct instances.
+ *
+ *
+ * @generated
+ */
+ private Distance(int value, String name, String literal) {
+ this.value = value;
+ this.name = name;
+ this.literal = literal;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public int getValue() {
+ return value;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String getLiteral() {
+ return literal;
+ }
+
+ /**
+ * Returns the literal value of the enumerator, which is its string representation.
+ *
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ return literal;
+ }
+
+} //Distance
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java b/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java
index e4d608e6..9532cd64 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.ecore.EObject;
* {@link simpleScenario.Lane#getReferenceCoord Reference Coord}
* {@link simpleScenario.Lane#getAdjacent Adjacent}
* {@link simpleScenario.Lane#getActors Actors}
- * {@link simpleScenario.Lane#getWidthNum Width Num}
+ * {@link simpleScenario.Lane#getNumWidth Num Width}
*
*
* @see simpleScenario.SimpleScenarioPackage#getLane()
@@ -127,25 +127,26 @@ public interface Lane extends EObject {
EList getActors();
/**
- * Returns the value of the 'Width Num' attribute.
+ * Returns the value of the 'Num Width' attribute.
+ * The default value is "0.0"
.
*
*
- * @return the value of the 'Width Num' attribute.
- * @see #setWidthNum(double)
- * @see simpleScenario.SimpleScenarioPackage#getLane_WidthNum()
- * @model required="true"
+ * @return the value of the 'Num Width' attribute.
+ * @see #setNumWidth(double)
+ * @see simpleScenario.SimpleScenarioPackage#getLane_NumWidth()
+ * @model default="0.0" required="true" derived="true"
* @generated
*/
- double getWidthNum();
+ double getNumWidth();
/**
- * Sets the value of the '{@link simpleScenario.Lane#getWidthNum Width Num}' attribute.
+ * Sets the value of the '{@link simpleScenario.Lane#getNumWidth Num Width}' attribute.
*
*
- * @param value the new value of the 'Width Num' attribute.
- * @see #getWidthNum()
+ * @param value the new value of the 'Num Width' attribute.
+ * @see #getNumWidth()
* @generated
*/
- void setWidthNum(double value);
+ void setNumWidth(double value);
} // Lane
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Pedestrian.java b/Domains/simpleScenario/ecore-gen/simpleScenario/Pedestrian.java
new file mode 100644
index 00000000..27718759
--- /dev/null
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/Pedestrian.java
@@ -0,0 +1,17 @@
+/**
+ */
+package simpleScenario;
+
+
+/**
+ *
+ * A representation of the model object 'Pedestrian'.
+ *
+ *
+ *
+ * @see simpleScenario.SimpleScenarioPackage#getPedestrian()
+ * @model
+ * @generated
+ */
+public interface Pedestrian extends Actor {
+} // Pedestrian
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java b/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java
index 276be42a..140b4e4b 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java
@@ -13,6 +13,7 @@ package simpleScenario;
*
*
* - {@link simpleScenario.SeperationDistance#getDistance Distance}
+ * - {@link simpleScenario.SeperationDistance#getNumDistance Num Distance}
*
*
* @see simpleScenario.SimpleScenarioPackage#getSeperationDistance()
@@ -22,27 +23,49 @@ package simpleScenario;
public interface SeperationDistance extends SpatialRelation {
/**
* Returns the value of the 'Distance' attribute.
- * The literals are from the enumeration {@link simpleScenario.Size}.
+ * The literals are from the enumeration {@link simpleScenario.Distance}.
*
*
* @return the value of the 'Distance' attribute.
- * @see simpleScenario.Size
- * @see #setDistance(Size)
+ * @see simpleScenario.Distance
+ * @see #setDistance(Distance)
* @see simpleScenario.SimpleScenarioPackage#getSeperationDistance_Distance()
* @model required="true"
* @generated
*/
- Size getDistance();
+ Distance getDistance();
/**
* Sets the value of the '{@link simpleScenario.SeperationDistance#getDistance Distance}' attribute.
*
*
* @param value the new value of the 'Distance' attribute.
- * @see simpleScenario.Size
+ * @see simpleScenario.Distance
* @see #getDistance()
* @generated
*/
- void setDistance(Size value);
+ void setDistance(Distance value);
+
+ /**
+ * Returns the value of the 'Num Distance' attribute.
+ *
+ *
+ * @return the value of the 'Num Distance' attribute.
+ * @see #setNumDistance(double)
+ * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance_NumDistance()
+ * @model required="true" derived="true"
+ * @generated
+ */
+ double getNumDistance();
+
+ /**
+ * Sets the value of the '{@link simpleScenario.SeperationDistance#getNumDistance Num Distance}' attribute.
+ *
+ *
+ * @param value the new value of the 'Num Distance' attribute.
+ * @see #getNumDistance()
+ * @generated
+ */
+ void setNumDistance(double value);
} // SeperationDistance
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioFactory.java b/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioFactory.java
index 043d33b2..7743578f 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioFactory.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioFactory.java
@@ -39,15 +39,6 @@ public interface SimpleScenarioFactory extends EFactory {
*/
Lane createLane();
- /**
- * Returns a new object of class 'Actor'.
- *
- *
- * @return a new object of class 'Actor'.
- * @generated
- */
- Actor createActor();
-
/**
* Returns a new object of class 'Vision Blocked'.
*
@@ -84,6 +75,24 @@ public interface SimpleScenarioFactory extends EFactory {
*/
CollisionDoesNotExist createCollisionDoesNotExist();
+ /**
+ * Returns a new object of class 'Pedestrian'.
+ *
+ *
+ * @return a new object of class 'Pedestrian'.
+ * @generated
+ */
+ Pedestrian createPedestrian();
+
+ /**
+ * Returns a new object of class 'Vehicle'.
+ *
+ *
+ * @return a new object of class 'Vehicle'.
+ * @generated
+ */
+ Vehicle createVehicle();
+
/**
* Returns the package supported by this factory.
*
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java b/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java
index 16b3e021..3458d7c7 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java
@@ -177,13 +177,13 @@ public interface SimpleScenarioPackage extends EPackage {
int LANE__ACTORS = 4;
/**
- * The feature id for the 'Width Num' attribute.
+ * The feature id for the 'Num Width' attribute.
*
*
* @generated
* @ordered
*/
- int LANE__WIDTH_NUM = 5;
+ int LANE__NUM_WIDTH = 5;
/**
* The number of structural features of the 'Lane' class.
@@ -213,15 +213,6 @@ public interface SimpleScenarioPackage extends EPackage {
*/
int ACTOR = 2;
- /**
- * The feature id for the 'Type' attribute.
- *
- *
- * @generated
- * @ordered
- */
- int ACTOR__TYPE = 0;
-
/**
* The feature id for the 'XPos' attribute.
*
@@ -229,7 +220,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @generated
* @ordered
*/
- int ACTOR__XPOS = 1;
+ int ACTOR__XPOS = 0;
/**
* The feature id for the 'YPos' attribute.
@@ -238,7 +229,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @generated
* @ordered
*/
- int ACTOR__YPOS = 2;
+ int ACTOR__YPOS = 1;
/**
* The feature id for the 'Length' attribute.
@@ -247,7 +238,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @generated
* @ordered
*/
- int ACTOR__LENGTH = 3;
+ int ACTOR__LENGTH = 2;
/**
* The feature id for the 'Width' attribute.
@@ -256,7 +247,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @generated
* @ordered
*/
- int ACTOR__WIDTH = 4;
+ int ACTOR__WIDTH = 3;
/**
* The feature id for the 'Speed' attribute.
@@ -265,7 +256,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @generated
* @ordered
*/
- int ACTOR__SPEED = 5;
+ int ACTOR__SPEED = 4;
/**
* The feature id for the 'Relations' containment reference list.
@@ -274,7 +265,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @generated
* @ordered
*/
- int ACTOR__RELATIONS = 6;
+ int ACTOR__RELATIONS = 5;
/**
* The feature id for the 'Placed On' reference.
@@ -283,7 +274,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @generated
* @ordered
*/
- int ACTOR__PLACED_ON = 7;
+ int ACTOR__PLACED_ON = 6;
/**
* The number of structural features of the 'Actor' class.
@@ -292,7 +283,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @generated
* @ordered
*/
- int ACTOR_FEATURE_COUNT = 8;
+ int ACTOR_FEATURE_COUNT = 7;
/**
* The number of operations of the 'Actor' class.
@@ -488,6 +479,15 @@ public interface SimpleScenarioPackage extends EPackage {
*/
int SEPERATION_DISTANCE__DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 0;
+ /**
+ * The feature id for the 'Num Distance' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int SEPERATION_DISTANCE__NUM_DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 1;
+
/**
* The number of structural features of the 'Seperation Distance' class.
*
@@ -495,7 +495,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @generated
* @ordered
*/
- int SEPERATION_DISTANCE_FEATURE_COUNT = SPATIAL_RELATION_FEATURE_COUNT + 1;
+ int SEPERATION_DISTANCE_FEATURE_COUNT = SPATIAL_RELATION_FEATURE_COUNT + 2;
/**
* The number of operations of the 'Seperation Distance' class.
@@ -589,6 +589,188 @@ public interface SimpleScenarioPackage extends EPackage {
*/
int COLLISION_DOES_NOT_EXIST_OPERATION_COUNT = TEMPORAL_RELATION_OPERATION_COUNT + 0;
+ /**
+ * The meta object id for the '{@link simpleScenario.impl.PedestrianImpl Pedestrian}' class.
+ *
+ *
+ * @see simpleScenario.impl.PedestrianImpl
+ * @see simpleScenario.impl.SimpleScenarioPackageImpl#getPedestrian()
+ * @generated
+ */
+ int PEDESTRIAN = 10;
+
+ /**
+ * The feature id for the 'XPos' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PEDESTRIAN__XPOS = ACTOR__XPOS;
+
+ /**
+ * The feature id for the 'YPos' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PEDESTRIAN__YPOS = ACTOR__YPOS;
+
+ /**
+ * The feature id for the 'Length' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PEDESTRIAN__LENGTH = ACTOR__LENGTH;
+
+ /**
+ * The feature id for the 'Width' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PEDESTRIAN__WIDTH = ACTOR__WIDTH;
+
+ /**
+ * The feature id for the 'Speed' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PEDESTRIAN__SPEED = ACTOR__SPEED;
+
+ /**
+ * The feature id for the 'Relations' containment reference list.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PEDESTRIAN__RELATIONS = ACTOR__RELATIONS;
+
+ /**
+ * The feature id for the 'Placed On' reference.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PEDESTRIAN__PLACED_ON = ACTOR__PLACED_ON;
+
+ /**
+ * The number of structural features of the 'Pedestrian' class.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PEDESTRIAN_FEATURE_COUNT = ACTOR_FEATURE_COUNT + 0;
+
+ /**
+ * The number of operations of the 'Pedestrian' class.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int PEDESTRIAN_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0;
+
+ /**
+ * The meta object id for the '{@link simpleScenario.impl.VehicleImpl Vehicle}' class.
+ *
+ *
+ * @see simpleScenario.impl.VehicleImpl
+ * @see simpleScenario.impl.SimpleScenarioPackageImpl#getVehicle()
+ * @generated
+ */
+ int VEHICLE = 11;
+
+ /**
+ * The feature id for the 'XPos' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int VEHICLE__XPOS = ACTOR__XPOS;
+
+ /**
+ * The feature id for the 'YPos' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int VEHICLE__YPOS = ACTOR__YPOS;
+
+ /**
+ * The feature id for the 'Length' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int VEHICLE__LENGTH = ACTOR__LENGTH;
+
+ /**
+ * The feature id for the 'Width' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int VEHICLE__WIDTH = ACTOR__WIDTH;
+
+ /**
+ * The feature id for the 'Speed' attribute.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int VEHICLE__SPEED = ACTOR__SPEED;
+
+ /**
+ * The feature id for the 'Relations' containment reference list.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int VEHICLE__RELATIONS = ACTOR__RELATIONS;
+
+ /**
+ * The feature id for the 'Placed On' reference.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int VEHICLE__PLACED_ON = ACTOR__PLACED_ON;
+
+ /**
+ * The number of structural features of the 'Vehicle' class.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int VEHICLE_FEATURE_COUNT = ACTOR_FEATURE_COUNT + 0;
+
+ /**
+ * The number of operations of the 'Vehicle' class.
+ *
+ *
+ * @generated
+ * @ordered
+ */
+ int VEHICLE_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0;
+
/**
* The meta object id for the '{@link simpleScenario.Orientation Orientation}' enum.
*
@@ -597,7 +779,7 @@ public interface SimpleScenarioPackage extends EPackage {
* @see simpleScenario.impl.SimpleScenarioPackageImpl#getOrientation()
* @generated
*/
- int ORIENTATION = 10;
+ int ORIENTATION = 12;
/**
* The meta object id for the '{@link simpleScenario.Size Size}' enum.
@@ -607,18 +789,17 @@ public interface SimpleScenarioPackage extends EPackage {
* @see simpleScenario.impl.SimpleScenarioPackageImpl#getSize()
* @generated
*/
- int SIZE = 11;
+ int SIZE = 13;
/**
- * The meta object id for the '{@link simpleScenario.ActorType Actor Type}' enum.
+ * The meta object id for the '{@link simpleScenario.Distance Distance}' enum.
*
*
- * @see simpleScenario.ActorType
- * @see simpleScenario.impl.SimpleScenarioPackageImpl#getActorType()
+ * @see simpleScenario.Distance
+ * @see simpleScenario.impl.SimpleScenarioPackageImpl#getDistance()
* @generated
*/
- int ACTOR_TYPE = 12;
-
+ int DISTANCE = 14;
/**
* Returns the meta object for class '{@link simpleScenario.SimpleScenario Simple Scenario}'.
@@ -740,15 +921,15 @@ public interface SimpleScenarioPackage extends EPackage {
EReference getLane_Actors();
/**
- * Returns the meta object for the attribute '{@link simpleScenario.Lane#getWidthNum Width Num}'.
+ * Returns the meta object for the attribute '{@link simpleScenario.Lane#getNumWidth Num Width}'.
*
*
- * @return the meta object for the attribute 'Width Num'.
- * @see simpleScenario.Lane#getWidthNum()
+ * @return the meta object for the attribute 'Num Width'.
+ * @see simpleScenario.Lane#getNumWidth()
* @see #getLane()
* @generated
*/
- EAttribute getLane_WidthNum();
+ EAttribute getLane_NumWidth();
/**
* Returns the meta object for class '{@link simpleScenario.Actor Actor}'.
@@ -760,17 +941,6 @@ public interface SimpleScenarioPackage extends EPackage {
*/
EClass getActor();
- /**
- * Returns the meta object for the attribute '{@link simpleScenario.Actor#getType Type}'.
- *
- *
- * @return the meta object for the attribute 'Type'.
- * @see simpleScenario.Actor#getType()
- * @see #getActor()
- * @generated
- */
- EAttribute getActor_Type();
-
/**
* Returns the meta object for the attribute '{@link simpleScenario.Actor#getXPos XPos}'.
*
@@ -931,6 +1101,17 @@ public interface SimpleScenarioPackage extends EPackage {
*/
EAttribute getSeperationDistance_Distance();
+ /**
+ * Returns the meta object for the attribute '{@link simpleScenario.SeperationDistance#getNumDistance Num Distance}'.
+ *
+ *
+ * @return the meta object for the attribute 'Num Distance'.
+ * @see simpleScenario.SeperationDistance#getNumDistance()
+ * @see #getSeperationDistance()
+ * @generated
+ */
+ EAttribute getSeperationDistance_NumDistance();
+
/**
* Returns the meta object for class '{@link simpleScenario.CollisionExists Collision Exists}'.
*
@@ -962,6 +1143,26 @@ public interface SimpleScenarioPackage extends EPackage {
*/
EClass getCollisionDoesNotExist();
+ /**
+ * Returns the meta object for class '{@link simpleScenario.Pedestrian Pedestrian}'.
+ *
+ *
+ * @return the meta object for class 'Pedestrian'.
+ * @see simpleScenario.Pedestrian
+ * @generated
+ */
+ EClass getPedestrian();
+
+ /**
+ * Returns the meta object for class '{@link simpleScenario.Vehicle Vehicle}'.
+ *
+ *
+ * @return the meta object for class 'Vehicle'.
+ * @see simpleScenario.Vehicle
+ * @generated
+ */
+ EClass getVehicle();
+
/**
* Returns the meta object for enum '{@link simpleScenario.Orientation Orientation}'.
*
@@ -983,14 +1184,14 @@ public interface SimpleScenarioPackage extends EPackage {
EEnum getSize();
/**
- * Returns the meta object for enum '{@link simpleScenario.ActorType Actor Type}'.
+ * Returns the meta object for enum '{@link simpleScenario.Distance Distance}'.
*
*
- * @return the meta object for enum 'Actor Type'.
- * @see simpleScenario.ActorType
+ * @return the meta object for enum 'Distance'.
+ * @see simpleScenario.Distance
* @generated
*/
- EEnum getActorType();
+ EEnum getDistance();
/**
* Returns the factory that creates the instances of the model.
@@ -1108,12 +1309,12 @@ public interface SimpleScenarioPackage extends EPackage {
EReference LANE__ACTORS = eINSTANCE.getLane_Actors();
/**
- * The meta object literal for the 'Width Num' attribute feature.
+ * The meta object literal for the 'Num Width' attribute feature.
*
*
* @generated
*/
- EAttribute LANE__WIDTH_NUM = eINSTANCE.getLane_WidthNum();
+ EAttribute LANE__NUM_WIDTH = eINSTANCE.getLane_NumWidth();
/**
* The meta object literal for the '{@link simpleScenario.impl.ActorImpl Actor}' class.
@@ -1125,14 +1326,6 @@ public interface SimpleScenarioPackage extends EPackage {
*/
EClass ACTOR = eINSTANCE.getActor();
- /**
- * The meta object literal for the 'Type' attribute feature.
- *
- *
- * @generated
- */
- EAttribute ACTOR__TYPE = eINSTANCE.getActor_Type();
-
/**
* The meta object literal for the 'XPos' attribute feature.
*
@@ -1263,6 +1456,14 @@ public interface SimpleScenarioPackage extends EPackage {
*/
EAttribute SEPERATION_DISTANCE__DISTANCE = eINSTANCE.getSeperationDistance_Distance();
+ /**
+ * The meta object literal for the 'Num Distance' attribute feature.
+ *
+ *
+ * @generated
+ */
+ EAttribute SEPERATION_DISTANCE__NUM_DISTANCE = eINSTANCE.getSeperationDistance_NumDistance();
+
/**
* The meta object literal for the '{@link simpleScenario.impl.CollisionExistsImpl Collision Exists}' class.
*
@@ -1291,6 +1492,26 @@ public interface SimpleScenarioPackage extends EPackage {
*/
EClass COLLISION_DOES_NOT_EXIST = eINSTANCE.getCollisionDoesNotExist();
+ /**
+ * The meta object literal for the '{@link simpleScenario.impl.PedestrianImpl Pedestrian}' class.
+ *
+ *
+ * @see simpleScenario.impl.PedestrianImpl
+ * @see simpleScenario.impl.SimpleScenarioPackageImpl#getPedestrian()
+ * @generated
+ */
+ EClass PEDESTRIAN = eINSTANCE.getPedestrian();
+
+ /**
+ * The meta object literal for the '{@link simpleScenario.impl.VehicleImpl Vehicle}' class.
+ *
+ *
+ * @see simpleScenario.impl.VehicleImpl
+ * @see simpleScenario.impl.SimpleScenarioPackageImpl#getVehicle()
+ * @generated
+ */
+ EClass VEHICLE = eINSTANCE.getVehicle();
+
/**
* The meta object literal for the '{@link simpleScenario.Orientation Orientation}' enum.
*
@@ -1312,14 +1533,14 @@ public interface SimpleScenarioPackage extends EPackage {
EEnum SIZE = eINSTANCE.getSize();
/**
- * The meta object literal for the '{@link simpleScenario.ActorType Actor Type}' enum.
+ * The meta object literal for the '{@link simpleScenario.Distance Distance}' enum.
*
*
- * @see simpleScenario.ActorType
- * @see simpleScenario.impl.SimpleScenarioPackageImpl#getActorType()
+ * @see simpleScenario.Distance
+ * @see simpleScenario.impl.SimpleScenarioPackageImpl#getDistance()
* @generated
*/
- EEnum ACTOR_TYPE = eINSTANCE.getActorType();
+ EEnum DISTANCE = eINSTANCE.getDistance();
}
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/Vehicle.java b/Domains/simpleScenario/ecore-gen/simpleScenario/Vehicle.java
new file mode 100644
index 00000000..f37c527e
--- /dev/null
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/Vehicle.java
@@ -0,0 +1,17 @@
+/**
+ */
+package simpleScenario;
+
+
+/**
+ *
+ * A representation of the model object 'Vehicle'.
+ *
+ *
+ *
+ * @see simpleScenario.SimpleScenarioPackage#getVehicle()
+ * @model
+ * @generated
+ */
+public interface Vehicle extends Actor {
+} // Vehicle
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java
index 10375e9b..ffd19846 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java
@@ -19,7 +19,6 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
import simpleScenario.Actor;
-import simpleScenario.ActorType;
import simpleScenario.Lane;
import simpleScenario.Relation;
import simpleScenario.SimpleScenarioPackage;
@@ -32,7 +31,6 @@ import simpleScenario.SimpleScenarioPackage;
* The following features are implemented:
*
*
- * - {@link simpleScenario.impl.ActorImpl#getType Type}
* - {@link simpleScenario.impl.ActorImpl#getXPos XPos}
* - {@link simpleScenario.impl.ActorImpl#getYPos YPos}
* - {@link simpleScenario.impl.ActorImpl#getLength Length}
@@ -44,27 +42,7 @@ import simpleScenario.SimpleScenarioPackage;
*
* @generated
*/
-public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
- /**
- * The default value of the '{@link #getType() Type}' attribute.
- *
- *
- * @see #getType()
- * @generated
- * @ordered
- */
- protected static final ActorType TYPE_EDEFAULT = ActorType.PEDESTRIAN;
-
- /**
- * The cached value of the '{@link #getType() Type}' attribute.
- *
- *
- * @see #getType()
- * @generated
- * @ordered
- */
- protected ActorType type = TYPE_EDEFAULT;
-
+public abstract class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
/**
* The default value of the '{@link #getXPos() XPos}' attribute.
*
@@ -204,29 +182,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
return SimpleScenarioPackage.Literals.ACTOR;
}
- /**
- *
- *
- * @generated
- */
- @Override
- public ActorType getType() {
- return type;
- }
-
- /**
- *
- *
- * @generated
- */
- @Override
- public void setType(ActorType newType) {
- ActorType oldType = type;
- type = newType == null ? TYPE_EDEFAULT : newType;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__TYPE, oldType, type));
- }
-
/**
*
*
@@ -457,8 +412,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case SimpleScenarioPackage.ACTOR__TYPE:
- return getType();
case SimpleScenarioPackage.ACTOR__XPOS:
return getXPos();
case SimpleScenarioPackage.ACTOR__YPOS:
@@ -487,9 +440,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case SimpleScenarioPackage.ACTOR__TYPE:
- setType((ActorType)newValue);
- return;
case SimpleScenarioPackage.ACTOR__XPOS:
setXPos((Double)newValue);
return;
@@ -524,9 +474,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case SimpleScenarioPackage.ACTOR__TYPE:
- setType(TYPE_EDEFAULT);
- return;
case SimpleScenarioPackage.ACTOR__XPOS:
setXPos(XPOS_EDEFAULT);
return;
@@ -560,8 +507,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case SimpleScenarioPackage.ACTOR__TYPE:
- return type != TYPE_EDEFAULT;
case SimpleScenarioPackage.ACTOR__XPOS:
return xPos != XPOS_EDEFAULT;
case SimpleScenarioPackage.ACTOR__YPOS:
@@ -590,9 +535,7 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
if (eIsProxy()) return super.toString();
StringBuilder result = new StringBuilder(super.toString());
- result.append(" (type: ");
- result.append(type);
- result.append(", xPos: ");
+ result.append(" (xPos: ");
result.append(xPos);
result.append(", yPos: ");
result.append(yPos);
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java
index f0b4b811..fa250be8 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java
@@ -38,7 +38,7 @@ import simpleScenario.Size;
* - {@link simpleScenario.impl.LaneImpl#getReferenceCoord Reference Coord}
* - {@link simpleScenario.impl.LaneImpl#getAdjacent Adjacent}
* - {@link simpleScenario.impl.LaneImpl#getActors Actors}
- * - {@link simpleScenario.impl.LaneImpl#getWidthNum Width Num}
+ * - {@link simpleScenario.impl.LaneImpl#getNumWidth Num Width}
*
*
* @generated
@@ -125,24 +125,24 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
protected EList actors;
/**
- * The default value of the '{@link #getWidthNum() Width Num}' attribute.
+ * The default value of the '{@link #getNumWidth() Num Width}' attribute.
*
*
- * @see #getWidthNum()
+ * @see #getNumWidth()
* @generated
* @ordered
*/
- protected static final double WIDTH_NUM_EDEFAULT = 0.0;
+ protected static final double NUM_WIDTH_EDEFAULT = 0.0;
/**
- * The cached value of the '{@link #getWidthNum() Width Num}' attribute.
+ * The cached value of the '{@link #getNumWidth() Num Width}' attribute.
*
*
- * @see #getWidthNum()
+ * @see #getNumWidth()
* @generated
* @ordered
*/
- protected double widthNum = WIDTH_NUM_EDEFAULT;
+ protected double numWidth = NUM_WIDTH_EDEFAULT;
/**
*
@@ -264,8 +264,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
* @generated
*/
@Override
- public double getWidthNum() {
- return widthNum;
+ public double getNumWidth() {
+ return numWidth;
}
/**
@@ -274,11 +274,11 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
* @generated
*/
@Override
- public void setWidthNum(double newWidthNum) {
- double oldWidthNum = widthNum;
- widthNum = newWidthNum;
+ public void setNumWidth(double newNumWidth) {
+ double oldNumWidth = numWidth;
+ numWidth = newNumWidth;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__WIDTH_NUM, oldWidthNum, widthNum));
+ eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__NUM_WIDTH, oldNumWidth, numWidth));
}
/**
@@ -328,8 +328,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
return getAdjacent();
case SimpleScenarioPackage.LANE__ACTORS:
return getActors();
- case SimpleScenarioPackage.LANE__WIDTH_NUM:
- return getWidthNum();
+ case SimpleScenarioPackage.LANE__NUM_WIDTH:
+ return getNumWidth();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -360,8 +360,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
getActors().clear();
getActors().addAll((Collection extends Actor>)newValue);
return;
- case SimpleScenarioPackage.LANE__WIDTH_NUM:
- setWidthNum((Double)newValue);
+ case SimpleScenarioPackage.LANE__NUM_WIDTH:
+ setNumWidth((Double)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -390,8 +390,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
case SimpleScenarioPackage.LANE__ACTORS:
getActors().clear();
return;
- case SimpleScenarioPackage.LANE__WIDTH_NUM:
- setWidthNum(WIDTH_NUM_EDEFAULT);
+ case SimpleScenarioPackage.LANE__NUM_WIDTH:
+ setNumWidth(NUM_WIDTH_EDEFAULT);
return;
}
super.eUnset(featureID);
@@ -415,8 +415,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
return adjacent != null && !adjacent.isEmpty();
case SimpleScenarioPackage.LANE__ACTORS:
return actors != null && !actors.isEmpty();
- case SimpleScenarioPackage.LANE__WIDTH_NUM:
- return widthNum != WIDTH_NUM_EDEFAULT;
+ case SimpleScenarioPackage.LANE__NUM_WIDTH:
+ return numWidth != NUM_WIDTH_EDEFAULT;
}
return super.eIsSet(featureID);
}
@@ -437,8 +437,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
result.append(width);
result.append(", referenceCoord: ");
result.append(referenceCoord);
- result.append(", widthNum: ");
- result.append(widthNum);
+ result.append(", numWidth: ");
+ result.append(numWidth);
result.append(')');
return result.toString();
}
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/PedestrianImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/PedestrianImpl.java
new file mode 100644
index 00000000..6cd18543
--- /dev/null
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/PedestrianImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package simpleScenario.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import simpleScenario.Pedestrian;
+import simpleScenario.SimpleScenarioPackage;
+
+/**
+ *
+ * An implementation of the model object 'Pedestrian'.
+ *
+ *
+ * @generated
+ */
+public class PedestrianImpl extends ActorImpl implements Pedestrian {
+ /**
+ *
+ *
+ * @generated
+ */
+ protected PedestrianImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return SimpleScenarioPackage.Literals.PEDESTRIAN;
+ }
+
+} //PedestrianImpl
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java
index 12a4d73c..d0f6f231 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java
@@ -8,9 +8,9 @@ import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import simpleScenario.Distance;
import simpleScenario.SeperationDistance;
import simpleScenario.SimpleScenarioPackage;
-import simpleScenario.Size;
/**
*
@@ -21,6 +21,7 @@ import simpleScenario.Size;
*
*
* - {@link simpleScenario.impl.SeperationDistanceImpl#getDistance Distance}
+ * - {@link simpleScenario.impl.SeperationDistanceImpl#getNumDistance Num Distance}
*
*
* @generated
@@ -34,7 +35,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
* @generated
* @ordered
*/
- protected static final Size DISTANCE_EDEFAULT = Size.SMALL;
+ protected static final Distance DISTANCE_EDEFAULT = Distance.NEAR;
/**
* The cached value of the '{@link #getDistance() Distance}' attribute.
@@ -44,7 +45,27 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
* @generated
* @ordered
*/
- protected Size distance = DISTANCE_EDEFAULT;
+ protected Distance distance = DISTANCE_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getNumDistance() Num Distance}' attribute.
+ *
+ *
+ * @see #getNumDistance()
+ * @generated
+ * @ordered
+ */
+ protected static final double NUM_DISTANCE_EDEFAULT = 0.0;
+
+ /**
+ * The cached value of the '{@link #getNumDistance() Num Distance}' attribute.
+ *
+ *
+ * @see #getNumDistance()
+ * @generated
+ * @ordered
+ */
+ protected double numDistance = NUM_DISTANCE_EDEFAULT;
/**
*
@@ -71,7 +92,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
* @generated
*/
@Override
- public Size getDistance() {
+ public Distance getDistance() {
return distance;
}
@@ -81,13 +102,36 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
* @generated
*/
@Override
- public void setDistance(Size newDistance) {
- Size oldDistance = distance;
+ public void setDistance(Distance newDistance) {
+ Distance oldDistance = distance;
distance = newDistance == null ? DISTANCE_EDEFAULT : newDistance;
if (eNotificationRequired())
eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE, oldDistance, distance));
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public double getNumDistance() {
+ return numDistance;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public void setNumDistance(double newNumDistance) {
+ double oldNumDistance = numDistance;
+ numDistance = newNumDistance;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE, oldNumDistance, numDistance));
+ }
+
/**
*
*
@@ -98,6 +142,8 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
switch (featureID) {
case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
return getDistance();
+ case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
+ return getNumDistance();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -111,7 +157,10 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
- setDistance((Size)newValue);
+ setDistance((Distance)newValue);
+ return;
+ case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
+ setNumDistance((Double)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -128,6 +177,9 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
setDistance(DISTANCE_EDEFAULT);
return;
+ case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
+ setNumDistance(NUM_DISTANCE_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -142,6 +194,8 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
switch (featureID) {
case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
return distance != DISTANCE_EDEFAULT;
+ case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
+ return numDistance != NUM_DISTANCE_EDEFAULT;
}
return super.eIsSet(featureID);
}
@@ -158,6 +212,8 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
StringBuilder result = new StringBuilder(super.toString());
result.append(" (distance: ");
result.append(distance);
+ result.append(", numDistance: ");
+ result.append(numDistance);
result.append(')');
return result.toString();
}
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioFactoryImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioFactoryImpl.java
index c3237012..33db5584 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioFactoryImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioFactoryImpl.java
@@ -59,11 +59,12 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
switch (eClass.getClassifierID()) {
case SimpleScenarioPackage.SIMPLE_SCENARIO: return createSimpleScenario();
case SimpleScenarioPackage.LANE: return createLane();
- case SimpleScenarioPackage.ACTOR: return createActor();
case SimpleScenarioPackage.VISION_BLOCKED: return createVisionBlocked();
case SimpleScenarioPackage.SEPERATION_DISTANCE: return createSeperationDistance();
case SimpleScenarioPackage.COLLISION_EXISTS: return createCollisionExists();
case SimpleScenarioPackage.COLLISION_DOES_NOT_EXIST: return createCollisionDoesNotExist();
+ case SimpleScenarioPackage.PEDESTRIAN: return createPedestrian();
+ case SimpleScenarioPackage.VEHICLE: return createVehicle();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -81,8 +82,8 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
return createOrientationFromString(eDataType, initialValue);
case SimpleScenarioPackage.SIZE:
return createSizeFromString(eDataType, initialValue);
- case SimpleScenarioPackage.ACTOR_TYPE:
- return createActorTypeFromString(eDataType, initialValue);
+ case SimpleScenarioPackage.DISTANCE:
+ return createDistanceFromString(eDataType, initialValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
@@ -100,8 +101,8 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
return convertOrientationToString(eDataType, instanceValue);
case SimpleScenarioPackage.SIZE:
return convertSizeToString(eDataType, instanceValue);
- case SimpleScenarioPackage.ACTOR_TYPE:
- return convertActorTypeToString(eDataType, instanceValue);
+ case SimpleScenarioPackage.DISTANCE:
+ return convertDistanceToString(eDataType, instanceValue);
default:
throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
@@ -129,17 +130,6 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
return lane;
}
- /**
- *
- *
- * @generated
- */
- @Override
- public Actor createActor() {
- ActorImpl actor = new ActorImpl();
- return actor;
- }
-
/**
*
*
@@ -184,6 +174,28 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
return collisionDoesNotExist;
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Pedestrian createPedestrian() {
+ PedestrianImpl pedestrian = new PedestrianImpl();
+ return pedestrian;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public Vehicle createVehicle() {
+ VehicleImpl vehicle = new VehicleImpl();
+ return vehicle;
+ }
+
/**
*
*
@@ -229,8 +241,8 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
*
* @generated
*/
- public ActorType createActorTypeFromString(EDataType eDataType, String initialValue) {
- ActorType result = ActorType.get(initialValue);
+ public Distance createDistanceFromString(EDataType eDataType, String initialValue) {
+ Distance result = Distance.get(initialValue);
if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -240,7 +252,7 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
*
* @generated
*/
- public String convertActorTypeToString(EDataType eDataType, Object instanceValue) {
+ public String convertDistanceToString(EDataType eDataType, Object instanceValue) {
return instanceValue == null ? null : instanceValue.toString();
}
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java
index cff06365..837e0d0d 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java
@@ -11,11 +11,12 @@ import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.impl.EPackageImpl;
import simpleScenario.Actor;
-import simpleScenario.ActorType;
import simpleScenario.CollisionDoesNotExist;
import simpleScenario.CollisionExists;
+import simpleScenario.Distance;
import simpleScenario.Lane;
import simpleScenario.Orientation;
+import simpleScenario.Pedestrian;
import simpleScenario.Relation;
import simpleScenario.SeperationDistance;
import simpleScenario.SimpleScenario;
@@ -24,6 +25,7 @@ import simpleScenario.SimpleScenarioPackage;
import simpleScenario.Size;
import simpleScenario.SpatialRelation;
import simpleScenario.TemporalRelation;
+import simpleScenario.Vehicle;
import simpleScenario.VisionBlocked;
/**
@@ -103,6 +105,20 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
*/
private EClass collisionDoesNotExistEClass = null;
+ /**
+ *
+ *
+ * @generated
+ */
+ private EClass pedestrianEClass = null;
+
+ /**
+ *
+ *
+ * @generated
+ */
+ private EClass vehicleEClass = null;
+
/**
*
*
@@ -122,7 +138,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
*
* @generated
*/
- private EEnum actorTypeEEnum = null;
+ private EEnum distanceEEnum = null;
/**
* Creates an instance of the model Package, registered with
@@ -301,7 +317,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
* @generated
*/
@Override
- public EAttribute getLane_WidthNum() {
+ public EAttribute getLane_NumWidth() {
return (EAttribute)laneEClass.getEStructuralFeatures().get(5);
}
@@ -315,16 +331,6 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
return actorEClass;
}
- /**
- *
- *
- * @generated
- */
- @Override
- public EAttribute getActor_Type() {
- return (EAttribute)actorEClass.getEStructuralFeatures().get(0);
- }
-
/**
*
*
@@ -332,7 +338,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
*/
@Override
public EAttribute getActor_XPos() {
- return (EAttribute)actorEClass.getEStructuralFeatures().get(1);
+ return (EAttribute)actorEClass.getEStructuralFeatures().get(0);
}
/**
@@ -342,7 +348,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
*/
@Override
public EAttribute getActor_YPos() {
- return (EAttribute)actorEClass.getEStructuralFeatures().get(2);
+ return (EAttribute)actorEClass.getEStructuralFeatures().get(1);
}
/**
@@ -352,7 +358,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
*/
@Override
public EAttribute getActor_Length() {
- return (EAttribute)actorEClass.getEStructuralFeatures().get(3);
+ return (EAttribute)actorEClass.getEStructuralFeatures().get(2);
}
/**
@@ -362,7 +368,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
*/
@Override
public EAttribute getActor_Width() {
- return (EAttribute)actorEClass.getEStructuralFeatures().get(4);
+ return (EAttribute)actorEClass.getEStructuralFeatures().get(3);
}
/**
@@ -372,7 +378,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
*/
@Override
public EAttribute getActor_Speed() {
- return (EAttribute)actorEClass.getEStructuralFeatures().get(5);
+ return (EAttribute)actorEClass.getEStructuralFeatures().get(4);
}
/**
@@ -382,7 +388,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
*/
@Override
public EReference getActor_Relations() {
- return (EReference)actorEClass.getEStructuralFeatures().get(6);
+ return (EReference)actorEClass.getEStructuralFeatures().get(5);
}
/**
@@ -392,7 +398,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
*/
@Override
public EReference getActor_PlacedOn() {
- return (EReference)actorEClass.getEStructuralFeatures().get(7);
+ return (EReference)actorEClass.getEStructuralFeatures().get(6);
}
/**
@@ -475,6 +481,16 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
return (EAttribute)seperationDistanceEClass.getEStructuralFeatures().get(0);
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EAttribute getSeperationDistance_NumDistance() {
+ return (EAttribute)seperationDistanceEClass.getEStructuralFeatures().get(1);
+ }
+
/**
*
*
@@ -505,6 +521,26 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
return collisionDoesNotExistEClass;
}
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EClass getPedestrian() {
+ return pedestrianEClass;
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ public EClass getVehicle() {
+ return vehicleEClass;
+ }
+
/**
*
*
@@ -531,8 +567,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
* @generated
*/
@Override
- public EEnum getActorType() {
- return actorTypeEEnum;
+ public EEnum getDistance() {
+ return distanceEEnum;
}
/**
@@ -576,10 +612,9 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
createEAttribute(laneEClass, LANE__REFERENCE_COORD);
createEReference(laneEClass, LANE__ADJACENT);
createEReference(laneEClass, LANE__ACTORS);
- createEAttribute(laneEClass, LANE__WIDTH_NUM);
+ createEAttribute(laneEClass, LANE__NUM_WIDTH);
actorEClass = createEClass(ACTOR);
- createEAttribute(actorEClass, ACTOR__TYPE);
createEAttribute(actorEClass, ACTOR__XPOS);
createEAttribute(actorEClass, ACTOR__YPOS);
createEAttribute(actorEClass, ACTOR__LENGTH);
@@ -600,16 +635,21 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
seperationDistanceEClass = createEClass(SEPERATION_DISTANCE);
createEAttribute(seperationDistanceEClass, SEPERATION_DISTANCE__DISTANCE);
+ createEAttribute(seperationDistanceEClass, SEPERATION_DISTANCE__NUM_DISTANCE);
collisionExistsEClass = createEClass(COLLISION_EXISTS);
createEAttribute(collisionExistsEClass, COLLISION_EXISTS__COLLISION_TIME);
collisionDoesNotExistEClass = createEClass(COLLISION_DOES_NOT_EXIST);
+ pedestrianEClass = createEClass(PEDESTRIAN);
+
+ vehicleEClass = createEClass(VEHICLE);
+
// Create enums
orientationEEnum = createEEnum(ORIENTATION);
sizeEEnum = createEEnum(SIZE);
- actorTypeEEnum = createEEnum(ACTOR_TYPE);
+ distanceEEnum = createEEnum(DISTANCE);
}
/**
@@ -646,6 +686,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
seperationDistanceEClass.getESuperTypes().add(this.getSpatialRelation());
collisionExistsEClass.getESuperTypes().add(this.getTemporalRelation());
collisionDoesNotExistEClass.getESuperTypes().add(this.getTemporalRelation());
+ pedestrianEClass.getESuperTypes().add(this.getActor());
+ vehicleEClass.getESuperTypes().add(this.getActor());
// Initialize classes, features, and operations; add parameters
initEClass(simpleScenarioEClass, SimpleScenario.class, "SimpleScenario", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -660,15 +702,14 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
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);
initEReference(getLane_Adjacent(), this.getLane(), null, "adjacent", null, 0, 2, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
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);
- initEAttribute(getLane_WidthNum(), ecorePackage.getEDouble(), "widthNum", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ 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);
- initEClass(actorEClass, Actor.class, "Actor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getActor_Type(), this.getActorType(), "type", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(actorEClass, Actor.class, "Actor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
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);
initEAttribute(getActor_YPos(), ecorePackage.getEDouble(), "yPos", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getActor_Length(), ecorePackage.getEDouble(), "length", "0.0", 0, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getActor_Width(), ecorePackage.getEDouble(), "width", null, 0, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getActor_Speed(), ecorePackage.getEDouble(), "speed", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ 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);
+ 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);
+ initEAttribute(getActor_Speed(), ecorePackage.getEDouble(), "speed", "0.0", 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
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);
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);
@@ -683,13 +724,18 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
initEReference(getVisionBlocked_BlockedBy(), this.getActor(), null, "blockedBy", null, 0, 1, VisionBlocked.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(seperationDistanceEClass, SeperationDistance.class, "SeperationDistance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getSeperationDistance_Distance(), this.getSize(), "distance", null, 1, 1, SeperationDistance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSeperationDistance_Distance(), this.getDistance(), "distance", null, 1, 1, SeperationDistance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSeperationDistance_NumDistance(), ecorePackage.getEDouble(), "numDistance", null, 1, 1, SeperationDistance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
initEClass(collisionExistsEClass, CollisionExists.class, "CollisionExists", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getCollisionExists_CollisionTime(), ecorePackage.getEDouble(), "collisionTime", null, 1, 1, CollisionExists.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(collisionDoesNotExistEClass, CollisionDoesNotExist.class, "CollisionDoesNotExist", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(pedestrianEClass, Pedestrian.class, "Pedestrian", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
+ initEClass(vehicleEClass, Vehicle.class, "Vehicle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+
// Initialize enums and add enum literals
initEEnum(orientationEEnum, Orientation.class, "Orientation");
addEEnumLiteral(orientationEEnum, Orientation.VERTICAL);
@@ -700,9 +746,10 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
addEEnumLiteral(sizeEEnum, Size.MEDIUM);
addEEnumLiteral(sizeEEnum, Size.LARGE);
- initEEnum(actorTypeEEnum, ActorType.class, "ActorType");
- addEEnumLiteral(actorTypeEEnum, ActorType.PEDESTRIAN);
- addEEnumLiteral(actorTypeEEnum, ActorType.VEHICLE);
+ initEEnum(distanceEEnum, Distance.class, "Distance");
+ addEEnumLiteral(distanceEEnum, Distance.NEAR);
+ addEEnumLiteral(distanceEEnum, Distance.MEDIUM);
+ addEEnumLiteral(distanceEEnum, Distance.FAR);
// Create resource
createResource(eNS_URI);
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/impl/VehicleImpl.java b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/VehicleImpl.java
new file mode 100644
index 00000000..fc4be628
--- /dev/null
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/impl/VehicleImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package simpleScenario.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import simpleScenario.SimpleScenarioPackage;
+import simpleScenario.Vehicle;
+
+/**
+ *
+ * An implementation of the model object 'Vehicle'.
+ *
+ *
+ * @generated
+ */
+public class VehicleImpl extends ActorImpl implements Vehicle {
+ /**
+ *
+ *
+ * @generated
+ */
+ protected VehicleImpl() {
+ super();
+ }
+
+ /**
+ *
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return SimpleScenarioPackage.Literals.VEHICLE;
+ }
+
+} //VehicleImpl
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioAdapterFactory.java b/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioAdapterFactory.java
index eb9bc05f..88cb187c 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioAdapterFactory.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioAdapterFactory.java
@@ -108,6 +108,14 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
return createCollisionDoesNotExistAdapter();
}
@Override
+ public Adapter casePedestrian(Pedestrian object) {
+ return createPedestrianAdapter();
+ }
+ @Override
+ public Adapter caseVehicle(Vehicle object) {
+ return createVehicleAdapter();
+ }
+ @Override
public Adapter defaultCase(EObject object) {
return createEObjectAdapter();
}
@@ -267,6 +275,34 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
return null;
}
+ /**
+ * Creates a new adapter for an object of class '{@link simpleScenario.Pedestrian Pedestrian}'.
+ *
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @return the new adapter.
+ * @see simpleScenario.Pedestrian
+ * @generated
+ */
+ public Adapter createPedestrianAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link simpleScenario.Vehicle Vehicle}'.
+ *
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ *
+ * @return the new adapter.
+ * @see simpleScenario.Vehicle
+ * @generated
+ */
+ public Adapter createVehicleAdapter() {
+ return null;
+ }
+
/**
* Creates a new adapter for the default case.
*
diff --git a/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioSwitch.java b/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioSwitch.java
index 204ac66f..86131abb 100644
--- a/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioSwitch.java
+++ b/Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioSwitch.java
@@ -136,6 +136,20 @@ public class SimpleScenarioSwitch extends Switch {
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case SimpleScenarioPackage.PEDESTRIAN: {
+ Pedestrian pedestrian = (Pedestrian)theEObject;
+ T result = casePedestrian(pedestrian);
+ if (result == null) result = caseActor(pedestrian);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
+ case SimpleScenarioPackage.VEHICLE: {
+ Vehicle vehicle = (Vehicle)theEObject;
+ T result = caseVehicle(vehicle);
+ if (result == null) result = caseActor(vehicle);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
default: return defaultCase(theEObject);
}
}
@@ -290,6 +304,36 @@ public class SimpleScenarioSwitch extends Switch {
return null;
}
+ /**
+ * Returns the result of interpreting the object as an instance of 'Pedestrian'.
+ *
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of 'Pedestrian'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T casePedestrian(Pedestrian object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of 'Vehicle'.
+ *
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of 'Vehicle'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseVehicle(Vehicle object) {
+ return null;
+ }
+
/**
* Returns the result of interpreting the object as an instance of 'EObject'.
*
diff --git a/Domains/simpleScenario/model/simpleScenario.aird b/Domains/simpleScenario/model/simpleScenario.aird
index b2ddb3a4..e338345d 100644
--- a/Domains/simpleScenario/model/simpleScenario.aird
+++ b/Domains/simpleScenario/model/simpleScenario.aird
@@ -5,7 +5,7 @@
simpleScenario.genmodel
-
+
@@ -48,6 +48,12 @@
+
+
+ bold
+
+
+
@@ -67,7 +73,7 @@
-
+
@@ -92,7 +98,7 @@
-
+
@@ -109,7 +115,7 @@
-
+
@@ -130,15 +136,11 @@
-
+
-
-
-
-
@@ -163,7 +165,7 @@
-
+
@@ -172,7 +174,7 @@
-
+
@@ -181,7 +183,7 @@
-
+
@@ -190,7 +192,7 @@
-
+
@@ -199,7 +201,7 @@
-
+
@@ -208,11 +210,15 @@
+
+
+
+
-
+
@@ -225,7 +231,7 @@
-
+
@@ -234,7 +240,7 @@
-
+
@@ -249,7 +255,7 @@
-
+
@@ -264,7 +270,7 @@
-
+
@@ -279,9 +285,9 @@
-
+
-
+
@@ -294,7 +300,7 @@
-
+
@@ -309,24 +315,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -341,7 +330,76 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -389,7 +447,7 @@
-
+
@@ -404,8 +462,8 @@
-
-
+
+
@@ -444,119 +502,119 @@
-
-
-
+
+
+
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
+
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -564,33 +622,88 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -627,7 +740,7 @@
KEEP_LOCATION
KEEP_SIZE
KEEP_RATIO
-
+
@@ -642,12 +755,12 @@
-
+
bold
-
+
@@ -655,10 +768,10 @@
-
-
-
-
+
+
+
+
bold
@@ -667,6 +780,9 @@
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
@@ -723,24 +839,17 @@
-
+
KEEP_LOCATION
KEEP_SIZE
KEEP_RATIO
-
-
+
+ italic
+
-
-
-
-
- bold
-
-
-
@@ -757,26 +866,26 @@
-
+
-
-
+
+ bold
-
+
-
-
+
+ bold
-
+
bold
@@ -835,14 +944,22 @@
KEEP_LOCATION
KEEP_SIZE
KEEP_RATIO
-
+
-
+
-
+
+ bold
+
+
+
+
+
+
+
bold
@@ -905,12 +1022,12 @@
-
+
-
+
italic
-
+
@@ -1035,32 +1152,86 @@
-
-
-
+
+
+
KEEP_LOCATION
KEEP_SIZE
KEEP_RATIO
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
+
+
+
+
+
+
+
+
+ KEEP_LOCATION
+ KEEP_SIZE
+ KEEP_RATIO
+
+
+
+
+
+
+
+
+
+
+
+ italic
+
+
+
+
+
+
+
+
+
+
+
+ italic
+
+
+
+
diff --git a/Domains/simpleScenario/model/simpleScenario.ecore b/Domains/simpleScenario/model/simpleScenario.ecore
index 340a63b7..c164b048 100644
--- a/Domains/simpleScenario/model/simpleScenario.ecore
+++ b/Domains/simpleScenario/model/simpleScenario.ecore
@@ -20,8 +20,9 @@
eType="#//Lane"/>
-
+
@@ -32,14 +33,16 @@
-
-
+
-
+
+
-
-
+ eType="#//Distance"/>
+
-
-
-
+
+
+
+
+
+
diff --git a/Domains/simpleScenario/model/simpleScenario.genmodel b/Domains/simpleScenario/model/simpleScenario.genmodel
index cdff27fe..4ef7d81f 100644
--- a/Domains/simpleScenario/model/simpleScenario.genmodel
+++ b/Domains/simpleScenario/model/simpleScenario.genmodel
@@ -15,9 +15,10 @@
-
-
-
+
+
+
+
@@ -31,10 +32,9 @@
-
+
-
@@ -53,10 +53,13 @@
+
+
+
--
cgit v1.2.3-70-g09d2