aboutsummaryrefslogtreecommitdiffstats
path: root/Domains/simpleScenario/ecore-gen
diff options
context:
space:
mode:
authorLibravatar Aren Babikian <aren.babikian@mail.mcgill.ca>2021-01-12 13:35:18 -0500
committerLibravatar Aren Babikian <aren.babikian@mail.mcgill.ca>2021-01-12 13:35:18 -0500
commit93f14577be72fe938c9bcb0f77d4a618133e1c37 (patch)
tree8af6ce78b425f88ffba99cf45008e582d8fde3c6 /Domains/simpleScenario/ecore-gen
parentrename simpleScenario folder (diff)
downloadVIATRA-Generator-93f14577be72fe938c9bcb0f77d4a618133e1c37.tar.gz
VIATRA-Generator-93f14577be72fe938c9bcb0f77d4a618133e1c37.tar.zst
VIATRA-Generator-93f14577be72fe938c9bcb0f77d4a618133e1c37.zip
improve simpleScenario MM
Diffstat (limited to 'Domains/simpleScenario/ecore-gen')
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/Actor.java35
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/Distance.java232
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/Lane.java23
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/Pedestrian.java17
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/SeperationDistance.java35
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioFactory.java27
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/SimpleScenarioPackage.java341
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/Vehicle.java17
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/ActorImpl.java61
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/LaneImpl.java46
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/PedestrianImpl.java37
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/SeperationDistanceImpl.java70
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioFactoryImpl.java50
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/SimpleScenarioPackageImpl.java117
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/impl/VehicleImpl.java37
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioAdapterFactory.java36
-rw-r--r--Domains/simpleScenario/ecore-gen/simpleScenario/util/SimpleScenarioSwitch.java44
17 files changed, 966 insertions, 259 deletions
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;
15 * The following features are supported: 15 * The following features are supported:
16 * </p> 16 * </p>
17 * <ul> 17 * <ul>
18 * <li>{@link simpleScenario.Actor#getType <em>Type</em>}</li>
19 * <li>{@link simpleScenario.Actor#getXPos <em>XPos</em>}</li> 18 * <li>{@link simpleScenario.Actor#getXPos <em>XPos</em>}</li>
20 * <li>{@link simpleScenario.Actor#getYPos <em>YPos</em>}</li> 19 * <li>{@link simpleScenario.Actor#getYPos <em>YPos</em>}</li>
21 * <li>{@link simpleScenario.Actor#getLength <em>Length</em>}</li> 20 * <li>{@link simpleScenario.Actor#getLength <em>Length</em>}</li>
@@ -26,36 +25,11 @@ import org.eclipse.emf.ecore.EObject;
26 * </ul> 25 * </ul>
27 * 26 *
28 * @see simpleScenario.SimpleScenarioPackage#getActor() 27 * @see simpleScenario.SimpleScenarioPackage#getActor()
29 * @model 28 * @model abstract="true"
30 * @generated 29 * @generated
31 */ 30 */
32public interface Actor extends EObject { 31public interface Actor extends EObject {
33 /** 32 /**
34 * Returns the value of the '<em><b>Type</b></em>' attribute.
35 * The literals are from the enumeration {@link simpleScenario.ActorType}.
36 * <!-- begin-user-doc -->
37 * <!-- end-user-doc -->
38 * @return the value of the '<em>Type</em>' attribute.
39 * @see simpleScenario.ActorType
40 * @see #setType(ActorType)
41 * @see simpleScenario.SimpleScenarioPackage#getActor_Type()
42 * @model required="true"
43 * @generated
44 */
45 ActorType getType();
46
47 /**
48 * Sets the value of the '{@link simpleScenario.Actor#getType <em>Type</em>}' attribute.
49 * <!-- begin-user-doc -->
50 * <!-- end-user-doc -->
51 * @param value the new value of the '<em>Type</em>' attribute.
52 * @see simpleScenario.ActorType
53 * @see #getType()
54 * @generated
55 */
56 void setType(ActorType value);
57
58 /**
59 * Returns the value of the '<em><b>XPos</b></em>' attribute. 33 * Returns the value of the '<em><b>XPos</b></em>' attribute.
60 * <!-- begin-user-doc --> 34 * <!-- begin-user-doc -->
61 * <!-- end-user-doc --> 35 * <!-- end-user-doc -->
@@ -107,7 +81,7 @@ public interface Actor extends EObject {
107 * @return the value of the '<em>Length</em>' attribute. 81 * @return the value of the '<em>Length</em>' attribute.
108 * @see #setLength(double) 82 * @see #setLength(double)
109 * @see simpleScenario.SimpleScenarioPackage#getActor_Length() 83 * @see simpleScenario.SimpleScenarioPackage#getActor_Length()
110 * @model default="0.0" 84 * @model default="0.0" required="true" derived="true"
111 * @generated 85 * @generated
112 */ 86 */
113 double getLength(); 87 double getLength();
@@ -129,7 +103,7 @@ public interface Actor extends EObject {
129 * @return the value of the '<em>Width</em>' attribute. 103 * @return the value of the '<em>Width</em>' attribute.
130 * @see #setWidth(double) 104 * @see #setWidth(double)
131 * @see simpleScenario.SimpleScenarioPackage#getActor_Width() 105 * @see simpleScenario.SimpleScenarioPackage#getActor_Width()
132 * @model 106 * @model required="true" derived="true"
133 * @generated 107 * @generated
134 */ 108 */
135 double getWidth(); 109 double getWidth();
@@ -146,12 +120,13 @@ public interface Actor extends EObject {
146 120
147 /** 121 /**
148 * Returns the value of the '<em><b>Speed</b></em>' attribute. 122 * Returns the value of the '<em><b>Speed</b></em>' attribute.
123 * The default value is <code>"0.0"</code>.
149 * <!-- begin-user-doc --> 124 * <!-- begin-user-doc -->
150 * <!-- end-user-doc --> 125 * <!-- end-user-doc -->
151 * @return the value of the '<em>Speed</em>' attribute. 126 * @return the value of the '<em>Speed</em>' attribute.
152 * @see #setSpeed(double) 127 * @see #setSpeed(double)
153 * @see simpleScenario.SimpleScenarioPackage#getActor_Speed() 128 * @see simpleScenario.SimpleScenarioPackage#getActor_Speed()
154 * @model required="true" 129 * @model default="0.0" required="true"
155 * @generated 130 * @generated
156 */ 131 */
157 double getSpeed(); 132 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 @@
1/**
2 */
3package simpleScenario;
4
5import java.util.Arrays;
6import java.util.Collections;
7import java.util.List;
8
9import org.eclipse.emf.common.util.Enumerator;
10
11/**
12 * <!-- begin-user-doc -->
13 * A representation of the literals of the enumeration '<em><b>Distance</b></em>',
14 * and utility methods for working with them.
15 * <!-- end-user-doc -->
16 * @see simpleScenario.SimpleScenarioPackage#getDistance()
17 * @model
18 * @generated
19 */
20public enum Distance implements Enumerator {
21 /**
22 * The '<em><b>Near</b></em>' literal object.
23 * <!-- begin-user-doc -->
24 * <!-- end-user-doc -->
25 * @see #NEAR_VALUE
26 * @generated
27 * @ordered
28 */
29 NEAR(0, "Near", "Near"),
30
31 /**
32 * The '<em><b>Medium</b></em>' literal object.
33 * <!-- begin-user-doc -->
34 * <!-- end-user-doc -->
35 * @see #MEDIUM_VALUE
36 * @generated
37 * @ordered
38 */
39 MEDIUM(1, "Medium", "Medium"),
40
41 /**
42 * The '<em><b>Far</b></em>' literal object.
43 * <!-- begin-user-doc -->
44 * <!-- end-user-doc -->
45 * @see #FAR_VALUE
46 * @generated
47 * @ordered
48 */
49 FAR(2, "Far", "Far");
50
51 /**
52 * The '<em><b>Near</b></em>' literal value.
53 * <!-- begin-user-doc -->
54 * <!-- end-user-doc -->
55 * @see #NEAR
56 * @model name="Near"
57 * @generated
58 * @ordered
59 */
60 public static final int NEAR_VALUE = 0;
61
62 /**
63 * The '<em><b>Medium</b></em>' literal value.
64 * <!-- begin-user-doc -->
65 * <!-- end-user-doc -->
66 * @see #MEDIUM
67 * @model name="Medium"
68 * @generated
69 * @ordered
70 */
71 public static final int MEDIUM_VALUE = 1;
72
73 /**
74 * The '<em><b>Far</b></em>' literal value.
75 * <!-- begin-user-doc -->
76 * <!-- end-user-doc -->
77 * @see #FAR
78 * @model name="Far"
79 * @generated
80 * @ordered
81 */
82 public static final int FAR_VALUE = 2;
83
84 /**
85 * An array of all the '<em><b>Distance</b></em>' enumerators.
86 * <!-- begin-user-doc -->
87 * <!-- end-user-doc -->
88 * @generated
89 */
90 private static final Distance[] VALUES_ARRAY =
91 new Distance[] {
92 NEAR,
93 MEDIUM,
94 FAR,
95 };
96
97 /**
98 * A public read-only list of all the '<em><b>Distance</b></em>' enumerators.
99 * <!-- begin-user-doc -->
100 * <!-- end-user-doc -->
101 * @generated
102 */
103 public static final List<Distance> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
104
105 /**
106 * Returns the '<em><b>Distance</b></em>' literal with the specified literal value.
107 * <!-- begin-user-doc -->
108 * <!-- end-user-doc -->
109 * @param literal the literal.
110 * @return the matching enumerator or <code>null</code>.
111 * @generated
112 */
113 public static Distance get(String literal) {
114 for (int i = 0; i < VALUES_ARRAY.length; ++i) {
115 Distance result = VALUES_ARRAY[i];
116 if (result.toString().equals(literal)) {
117 return result;
118 }
119 }
120 return null;
121 }
122
123 /**
124 * Returns the '<em><b>Distance</b></em>' literal with the specified name.
125 * <!-- begin-user-doc -->
126 * <!-- end-user-doc -->
127 * @param name the name.
128 * @return the matching enumerator or <code>null</code>.
129 * @generated
130 */
131 public static Distance getByName(String name) {
132 for (int i = 0; i < VALUES_ARRAY.length; ++i) {
133 Distance result = VALUES_ARRAY[i];
134 if (result.getName().equals(name)) {
135 return result;
136 }
137 }
138 return null;
139 }
140
141 /**
142 * Returns the '<em><b>Distance</b></em>' literal with the specified integer value.
143 * <!-- begin-user-doc -->
144 * <!-- end-user-doc -->
145 * @param value the integer value.
146 * @return the matching enumerator or <code>null</code>.
147 * @generated
148 */
149 public static Distance get(int value) {
150 switch (value) {
151 case NEAR_VALUE: return NEAR;
152 case MEDIUM_VALUE: return MEDIUM;
153 case FAR_VALUE: return FAR;
154 }
155 return null;
156 }
157
158 /**
159 * <!-- begin-user-doc -->
160 * <!-- end-user-doc -->
161 * @generated
162 */
163 private final int value;
164
165 /**
166 * <!-- begin-user-doc -->
167 * <!-- end-user-doc -->
168 * @generated
169 */
170 private final String name;
171
172 /**
173 * <!-- begin-user-doc -->
174 * <!-- end-user-doc -->
175 * @generated
176 */
177 private final String literal;
178
179 /**
180 * Only this class can construct instances.
181 * <!-- begin-user-doc -->
182 * <!-- end-user-doc -->
183 * @generated
184 */
185 private Distance(int value, String name, String literal) {
186 this.value = value;
187 this.name = name;
188 this.literal = literal;
189 }
190
191 /**
192 * <!-- begin-user-doc -->
193 * <!-- end-user-doc -->
194 * @generated
195 */
196 @Override
197 public int getValue() {
198 return value;
199 }
200
201 /**
202 * <!-- begin-user-doc -->
203 * <!-- end-user-doc -->
204 * @generated
205 */
206 @Override
207 public String getName() {
208 return name;
209 }
210
211 /**
212 * <!-- begin-user-doc -->
213 * <!-- end-user-doc -->
214 * @generated
215 */
216 @Override
217 public String getLiteral() {
218 return literal;
219 }
220
221 /**
222 * Returns the literal value of the enumerator, which is its string representation.
223 * <!-- begin-user-doc -->
224 * <!-- end-user-doc -->
225 * @generated
226 */
227 @Override
228 public String toString() {
229 return literal;
230 }
231
232} //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;
20 * <li>{@link simpleScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li> 20 * <li>{@link simpleScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li>
21 * <li>{@link simpleScenario.Lane#getAdjacent <em>Adjacent</em>}</li> 21 * <li>{@link simpleScenario.Lane#getAdjacent <em>Adjacent</em>}</li>
22 * <li>{@link simpleScenario.Lane#getActors <em>Actors</em>}</li> 22 * <li>{@link simpleScenario.Lane#getActors <em>Actors</em>}</li>
23 * <li>{@link simpleScenario.Lane#getWidthNum <em>Width Num</em>}</li> 23 * <li>{@link simpleScenario.Lane#getNumWidth <em>Num Width</em>}</li>
24 * </ul> 24 * </ul>
25 * 25 *
26 * @see simpleScenario.SimpleScenarioPackage#getLane() 26 * @see simpleScenario.SimpleScenarioPackage#getLane()
@@ -127,25 +127,26 @@ public interface Lane extends EObject {
127 EList<Actor> getActors(); 127 EList<Actor> getActors();
128 128
129 /** 129 /**
130 * Returns the value of the '<em><b>Width Num</b></em>' attribute. 130 * Returns the value of the '<em><b>Num Width</b></em>' attribute.
131 * The default value is <code>"0.0"</code>.
131 * <!-- begin-user-doc --> 132 * <!-- begin-user-doc -->
132 * <!-- end-user-doc --> 133 * <!-- end-user-doc -->
133 * @return the value of the '<em>Width Num</em>' attribute. 134 * @return the value of the '<em>Num Width</em>' attribute.
134 * @see #setWidthNum(double) 135 * @see #setNumWidth(double)
135 * @see simpleScenario.SimpleScenarioPackage#getLane_WidthNum() 136 * @see simpleScenario.SimpleScenarioPackage#getLane_NumWidth()
136 * @model required="true" 137 * @model default="0.0" required="true" derived="true"
137 * @generated 138 * @generated
138 */ 139 */
139 double getWidthNum(); 140 double getNumWidth();
140 141
141 /** 142 /**
142 * Sets the value of the '{@link simpleScenario.Lane#getWidthNum <em>Width Num</em>}' attribute. 143 * Sets the value of the '{@link simpleScenario.Lane#getNumWidth <em>Num Width</em>}' attribute.
143 * <!-- begin-user-doc --> 144 * <!-- begin-user-doc -->
144 * <!-- end-user-doc --> 145 * <!-- end-user-doc -->
145 * @param value the new value of the '<em>Width Num</em>' attribute. 146 * @param value the new value of the '<em>Num Width</em>' attribute.
146 * @see #getWidthNum() 147 * @see #getNumWidth()
147 * @generated 148 * @generated
148 */ 149 */
149 void setWidthNum(double value); 150 void setNumWidth(double value);
150 151
151} // Lane 152} // 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 @@
1/**
2 */
3package simpleScenario;
4
5
6/**
7 * <!-- begin-user-doc -->
8 * A representation of the model object '<em><b>Pedestrian</b></em>'.
9 * <!-- end-user-doc -->
10 *
11 *
12 * @see simpleScenario.SimpleScenarioPackage#getPedestrian()
13 * @model
14 * @generated
15 */
16public interface Pedestrian extends Actor {
17} // 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;
13 * </p> 13 * </p>
14 * <ul> 14 * <ul>
15 * <li>{@link simpleScenario.SeperationDistance#getDistance <em>Distance</em>}</li> 15 * <li>{@link simpleScenario.SeperationDistance#getDistance <em>Distance</em>}</li>
16 * <li>{@link simpleScenario.SeperationDistance#getNumDistance <em>Num Distance</em>}</li>
16 * </ul> 17 * </ul>
17 * 18 *
18 * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance() 19 * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance()
@@ -22,27 +23,49 @@ package simpleScenario;
22public interface SeperationDistance extends SpatialRelation { 23public interface SeperationDistance extends SpatialRelation {
23 /** 24 /**
24 * Returns the value of the '<em><b>Distance</b></em>' attribute. 25 * Returns the value of the '<em><b>Distance</b></em>' attribute.
25 * The literals are from the enumeration {@link simpleScenario.Size}. 26 * The literals are from the enumeration {@link simpleScenario.Distance}.
26 * <!-- begin-user-doc --> 27 * <!-- begin-user-doc -->
27 * <!-- end-user-doc --> 28 * <!-- end-user-doc -->
28 * @return the value of the '<em>Distance</em>' attribute. 29 * @return the value of the '<em>Distance</em>' attribute.
29 * @see simpleScenario.Size 30 * @see simpleScenario.Distance
30 * @see #setDistance(Size) 31 * @see #setDistance(Distance)
31 * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance_Distance() 32 * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance_Distance()
32 * @model required="true" 33 * @model required="true"
33 * @generated 34 * @generated
34 */ 35 */
35 Size getDistance(); 36 Distance getDistance();
36 37
37 /** 38 /**
38 * Sets the value of the '{@link simpleScenario.SeperationDistance#getDistance <em>Distance</em>}' attribute. 39 * Sets the value of the '{@link simpleScenario.SeperationDistance#getDistance <em>Distance</em>}' attribute.
39 * <!-- begin-user-doc --> 40 * <!-- begin-user-doc -->
40 * <!-- end-user-doc --> 41 * <!-- end-user-doc -->
41 * @param value the new value of the '<em>Distance</em>' attribute. 42 * @param value the new value of the '<em>Distance</em>' attribute.
42 * @see simpleScenario.Size 43 * @see simpleScenario.Distance
43 * @see #getDistance() 44 * @see #getDistance()
44 * @generated 45 * @generated
45 */ 46 */
46 void setDistance(Size value); 47 void setDistance(Distance value);
48
49 /**
50 * Returns the value of the '<em><b>Num Distance</b></em>' attribute.
51 * <!-- begin-user-doc -->
52 * <!-- end-user-doc -->
53 * @return the value of the '<em>Num Distance</em>' attribute.
54 * @see #setNumDistance(double)
55 * @see simpleScenario.SimpleScenarioPackage#getSeperationDistance_NumDistance()
56 * @model required="true" derived="true"
57 * @generated
58 */
59 double getNumDistance();
60
61 /**
62 * Sets the value of the '{@link simpleScenario.SeperationDistance#getNumDistance <em>Num Distance</em>}' attribute.
63 * <!-- begin-user-doc -->
64 * <!-- end-user-doc -->
65 * @param value the new value of the '<em>Num Distance</em>' attribute.
66 * @see #getNumDistance()
67 * @generated
68 */
69 void setNumDistance(double value);
47 70
48} // SeperationDistance 71} // 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
@@ -40,15 +40,6 @@ public interface SimpleScenarioFactory extends EFactory {
40 Lane createLane(); 40 Lane createLane();
41 41
42 /** 42 /**
43 * Returns a new object of class '<em>Actor</em>'.
44 * <!-- begin-user-doc -->
45 * <!-- end-user-doc -->
46 * @return a new object of class '<em>Actor</em>'.
47 * @generated
48 */
49 Actor createActor();
50
51 /**
52 * Returns a new object of class '<em>Vision Blocked</em>'. 43 * Returns a new object of class '<em>Vision Blocked</em>'.
53 * <!-- begin-user-doc --> 44 * <!-- begin-user-doc -->
54 * <!-- end-user-doc --> 45 * <!-- end-user-doc -->
@@ -85,6 +76,24 @@ public interface SimpleScenarioFactory extends EFactory {
85 CollisionDoesNotExist createCollisionDoesNotExist(); 76 CollisionDoesNotExist createCollisionDoesNotExist();
86 77
87 /** 78 /**
79 * Returns a new object of class '<em>Pedestrian</em>'.
80 * <!-- begin-user-doc -->
81 * <!-- end-user-doc -->
82 * @return a new object of class '<em>Pedestrian</em>'.
83 * @generated
84 */
85 Pedestrian createPedestrian();
86
87 /**
88 * Returns a new object of class '<em>Vehicle</em>'.
89 * <!-- begin-user-doc -->
90 * <!-- end-user-doc -->
91 * @return a new object of class '<em>Vehicle</em>'.
92 * @generated
93 */
94 Vehicle createVehicle();
95
96 /**
88 * Returns the package supported by this factory. 97 * Returns the package supported by this factory.
89 * <!-- begin-user-doc --> 98 * <!-- begin-user-doc -->
90 * <!-- end-user-doc --> 99 * <!-- end-user-doc -->
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 {
177 int LANE__ACTORS = 4; 177 int LANE__ACTORS = 4;
178 178
179 /** 179 /**
180 * The feature id for the '<em><b>Width Num</b></em>' attribute. 180 * The feature id for the '<em><b>Num Width</b></em>' attribute.
181 * <!-- begin-user-doc --> 181 * <!-- begin-user-doc -->
182 * <!-- end-user-doc --> 182 * <!-- end-user-doc -->
183 * @generated 183 * @generated
184 * @ordered 184 * @ordered
185 */ 185 */
186 int LANE__WIDTH_NUM = 5; 186 int LANE__NUM_WIDTH = 5;
187 187
188 /** 188 /**
189 * The number of structural features of the '<em>Lane</em>' class. 189 * The number of structural features of the '<em>Lane</em>' class.
@@ -214,22 +214,13 @@ public interface SimpleScenarioPackage extends EPackage {
214 int ACTOR = 2; 214 int ACTOR = 2;
215 215
216 /** 216 /**
217 * The feature id for the '<em><b>Type</b></em>' attribute.
218 * <!-- begin-user-doc -->
219 * <!-- end-user-doc -->
220 * @generated
221 * @ordered
222 */
223 int ACTOR__TYPE = 0;
224
225 /**
226 * The feature id for the '<em><b>XPos</b></em>' attribute. 217 * The feature id for the '<em><b>XPos</b></em>' attribute.
227 * <!-- begin-user-doc --> 218 * <!-- begin-user-doc -->
228 * <!-- end-user-doc --> 219 * <!-- end-user-doc -->
229 * @generated 220 * @generated
230 * @ordered 221 * @ordered
231 */ 222 */
232 int ACTOR__XPOS = 1; 223 int ACTOR__XPOS = 0;
233 224
234 /** 225 /**
235 * The feature id for the '<em><b>YPos</b></em>' attribute. 226 * The feature id for the '<em><b>YPos</b></em>' attribute.
@@ -238,7 +229,7 @@ public interface SimpleScenarioPackage extends EPackage {
238 * @generated 229 * @generated
239 * @ordered 230 * @ordered
240 */ 231 */
241 int ACTOR__YPOS = 2; 232 int ACTOR__YPOS = 1;
242 233
243 /** 234 /**
244 * The feature id for the '<em><b>Length</b></em>' attribute. 235 * The feature id for the '<em><b>Length</b></em>' attribute.
@@ -247,7 +238,7 @@ public interface SimpleScenarioPackage extends EPackage {
247 * @generated 238 * @generated
248 * @ordered 239 * @ordered
249 */ 240 */
250 int ACTOR__LENGTH = 3; 241 int ACTOR__LENGTH = 2;
251 242
252 /** 243 /**
253 * The feature id for the '<em><b>Width</b></em>' attribute. 244 * The feature id for the '<em><b>Width</b></em>' attribute.
@@ -256,7 +247,7 @@ public interface SimpleScenarioPackage extends EPackage {
256 * @generated 247 * @generated
257 * @ordered 248 * @ordered
258 */ 249 */
259 int ACTOR__WIDTH = 4; 250 int ACTOR__WIDTH = 3;
260 251
261 /** 252 /**
262 * The feature id for the '<em><b>Speed</b></em>' attribute. 253 * The feature id for the '<em><b>Speed</b></em>' attribute.
@@ -265,7 +256,7 @@ public interface SimpleScenarioPackage extends EPackage {
265 * @generated 256 * @generated
266 * @ordered 257 * @ordered
267 */ 258 */
268 int ACTOR__SPEED = 5; 259 int ACTOR__SPEED = 4;
269 260
270 /** 261 /**
271 * The feature id for the '<em><b>Relations</b></em>' containment reference list. 262 * The feature id for the '<em><b>Relations</b></em>' containment reference list.
@@ -274,7 +265,7 @@ public interface SimpleScenarioPackage extends EPackage {
274 * @generated 265 * @generated
275 * @ordered 266 * @ordered
276 */ 267 */
277 int ACTOR__RELATIONS = 6; 268 int ACTOR__RELATIONS = 5;
278 269
279 /** 270 /**
280 * The feature id for the '<em><b>Placed On</b></em>' reference. 271 * The feature id for the '<em><b>Placed On</b></em>' reference.
@@ -283,7 +274,7 @@ public interface SimpleScenarioPackage extends EPackage {
283 * @generated 274 * @generated
284 * @ordered 275 * @ordered
285 */ 276 */
286 int ACTOR__PLACED_ON = 7; 277 int ACTOR__PLACED_ON = 6;
287 278
288 /** 279 /**
289 * The number of structural features of the '<em>Actor</em>' class. 280 * The number of structural features of the '<em>Actor</em>' class.
@@ -292,7 +283,7 @@ public interface SimpleScenarioPackage extends EPackage {
292 * @generated 283 * @generated
293 * @ordered 284 * @ordered
294 */ 285 */
295 int ACTOR_FEATURE_COUNT = 8; 286 int ACTOR_FEATURE_COUNT = 7;
296 287
297 /** 288 /**
298 * The number of operations of the '<em>Actor</em>' class. 289 * The number of operations of the '<em>Actor</em>' class.
@@ -489,13 +480,22 @@ public interface SimpleScenarioPackage extends EPackage {
489 int SEPERATION_DISTANCE__DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 0; 480 int SEPERATION_DISTANCE__DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 0;
490 481
491 /** 482 /**
483 * The feature id for the '<em><b>Num Distance</b></em>' attribute.
484 * <!-- begin-user-doc -->
485 * <!-- end-user-doc -->
486 * @generated
487 * @ordered
488 */
489 int SEPERATION_DISTANCE__NUM_DISTANCE = SPATIAL_RELATION_FEATURE_COUNT + 1;
490
491 /**
492 * The number of structural features of the '<em>Seperation Distance</em>' class. 492 * The number of structural features of the '<em>Seperation Distance</em>' class.
493 * <!-- begin-user-doc --> 493 * <!-- begin-user-doc -->
494 * <!-- end-user-doc --> 494 * <!-- end-user-doc -->
495 * @generated 495 * @generated
496 * @ordered 496 * @ordered
497 */ 497 */
498 int SEPERATION_DISTANCE_FEATURE_COUNT = SPATIAL_RELATION_FEATURE_COUNT + 1; 498 int SEPERATION_DISTANCE_FEATURE_COUNT = SPATIAL_RELATION_FEATURE_COUNT + 2;
499 499
500 /** 500 /**
501 * The number of operations of the '<em>Seperation Distance</em>' class. 501 * The number of operations of the '<em>Seperation Distance</em>' class.
@@ -590,6 +590,188 @@ public interface SimpleScenarioPackage extends EPackage {
590 int COLLISION_DOES_NOT_EXIST_OPERATION_COUNT = TEMPORAL_RELATION_OPERATION_COUNT + 0; 590 int COLLISION_DOES_NOT_EXIST_OPERATION_COUNT = TEMPORAL_RELATION_OPERATION_COUNT + 0;
591 591
592 /** 592 /**
593 * The meta object id for the '{@link simpleScenario.impl.PedestrianImpl <em>Pedestrian</em>}' class.
594 * <!-- begin-user-doc -->
595 * <!-- end-user-doc -->
596 * @see simpleScenario.impl.PedestrianImpl
597 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getPedestrian()
598 * @generated
599 */
600 int PEDESTRIAN = 10;
601
602 /**
603 * The feature id for the '<em><b>XPos</b></em>' attribute.
604 * <!-- begin-user-doc -->
605 * <!-- end-user-doc -->
606 * @generated
607 * @ordered
608 */
609 int PEDESTRIAN__XPOS = ACTOR__XPOS;
610
611 /**
612 * The feature id for the '<em><b>YPos</b></em>' attribute.
613 * <!-- begin-user-doc -->
614 * <!-- end-user-doc -->
615 * @generated
616 * @ordered
617 */
618 int PEDESTRIAN__YPOS = ACTOR__YPOS;
619
620 /**
621 * The feature id for the '<em><b>Length</b></em>' attribute.
622 * <!-- begin-user-doc -->
623 * <!-- end-user-doc -->
624 * @generated
625 * @ordered
626 */
627 int PEDESTRIAN__LENGTH = ACTOR__LENGTH;
628
629 /**
630 * The feature id for the '<em><b>Width</b></em>' attribute.
631 * <!-- begin-user-doc -->
632 * <!-- end-user-doc -->
633 * @generated
634 * @ordered
635 */
636 int PEDESTRIAN__WIDTH = ACTOR__WIDTH;
637
638 /**
639 * The feature id for the '<em><b>Speed</b></em>' attribute.
640 * <!-- begin-user-doc -->
641 * <!-- end-user-doc -->
642 * @generated
643 * @ordered
644 */
645 int PEDESTRIAN__SPEED = ACTOR__SPEED;
646
647 /**
648 * The feature id for the '<em><b>Relations</b></em>' containment reference list.
649 * <!-- begin-user-doc -->
650 * <!-- end-user-doc -->
651 * @generated
652 * @ordered
653 */
654 int PEDESTRIAN__RELATIONS = ACTOR__RELATIONS;
655
656 /**
657 * The feature id for the '<em><b>Placed On</b></em>' reference.
658 * <!-- begin-user-doc -->
659 * <!-- end-user-doc -->
660 * @generated
661 * @ordered
662 */
663 int PEDESTRIAN__PLACED_ON = ACTOR__PLACED_ON;
664
665 /**
666 * The number of structural features of the '<em>Pedestrian</em>' class.
667 * <!-- begin-user-doc -->
668 * <!-- end-user-doc -->
669 * @generated
670 * @ordered
671 */
672 int PEDESTRIAN_FEATURE_COUNT = ACTOR_FEATURE_COUNT + 0;
673
674 /**
675 * The number of operations of the '<em>Pedestrian</em>' class.
676 * <!-- begin-user-doc -->
677 * <!-- end-user-doc -->
678 * @generated
679 * @ordered
680 */
681 int PEDESTRIAN_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0;
682
683 /**
684 * The meta object id for the '{@link simpleScenario.impl.VehicleImpl <em>Vehicle</em>}' class.
685 * <!-- begin-user-doc -->
686 * <!-- end-user-doc -->
687 * @see simpleScenario.impl.VehicleImpl
688 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getVehicle()
689 * @generated
690 */
691 int VEHICLE = 11;
692
693 /**
694 * The feature id for the '<em><b>XPos</b></em>' attribute.
695 * <!-- begin-user-doc -->
696 * <!-- end-user-doc -->
697 * @generated
698 * @ordered
699 */
700 int VEHICLE__XPOS = ACTOR__XPOS;
701
702 /**
703 * The feature id for the '<em><b>YPos</b></em>' attribute.
704 * <!-- begin-user-doc -->
705 * <!-- end-user-doc -->
706 * @generated
707 * @ordered
708 */
709 int VEHICLE__YPOS = ACTOR__YPOS;
710
711 /**
712 * The feature id for the '<em><b>Length</b></em>' attribute.
713 * <!-- begin-user-doc -->
714 * <!-- end-user-doc -->
715 * @generated
716 * @ordered
717 */
718 int VEHICLE__LENGTH = ACTOR__LENGTH;
719
720 /**
721 * The feature id for the '<em><b>Width</b></em>' attribute.
722 * <!-- begin-user-doc -->
723 * <!-- end-user-doc -->
724 * @generated
725 * @ordered
726 */
727 int VEHICLE__WIDTH = ACTOR__WIDTH;
728
729 /**
730 * The feature id for the '<em><b>Speed</b></em>' attribute.
731 * <!-- begin-user-doc -->
732 * <!-- end-user-doc -->
733 * @generated
734 * @ordered
735 */
736 int VEHICLE__SPEED = ACTOR__SPEED;
737
738 /**
739 * The feature id for the '<em><b>Relations</b></em>' containment reference list.
740 * <!-- begin-user-doc -->
741 * <!-- end-user-doc -->
742 * @generated
743 * @ordered
744 */
745 int VEHICLE__RELATIONS = ACTOR__RELATIONS;
746
747 /**
748 * The feature id for the '<em><b>Placed On</b></em>' reference.
749 * <!-- begin-user-doc -->
750 * <!-- end-user-doc -->
751 * @generated
752 * @ordered
753 */
754 int VEHICLE__PLACED_ON = ACTOR__PLACED_ON;
755
756 /**
757 * The number of structural features of the '<em>Vehicle</em>' class.
758 * <!-- begin-user-doc -->
759 * <!-- end-user-doc -->
760 * @generated
761 * @ordered
762 */
763 int VEHICLE_FEATURE_COUNT = ACTOR_FEATURE_COUNT + 0;
764
765 /**
766 * The number of operations of the '<em>Vehicle</em>' class.
767 * <!-- begin-user-doc -->
768 * <!-- end-user-doc -->
769 * @generated
770 * @ordered
771 */
772 int VEHICLE_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0;
773
774 /**
593 * The meta object id for the '{@link simpleScenario.Orientation <em>Orientation</em>}' enum. 775 * The meta object id for the '{@link simpleScenario.Orientation <em>Orientation</em>}' enum.
594 * <!-- begin-user-doc --> 776 * <!-- begin-user-doc -->
595 * <!-- end-user-doc --> 777 * <!-- end-user-doc -->
@@ -597,7 +779,7 @@ public interface SimpleScenarioPackage extends EPackage {
597 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getOrientation() 779 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getOrientation()
598 * @generated 780 * @generated
599 */ 781 */
600 int ORIENTATION = 10; 782 int ORIENTATION = 12;
601 783
602 /** 784 /**
603 * The meta object id for the '{@link simpleScenario.Size <em>Size</em>}' enum. 785 * The meta object id for the '{@link simpleScenario.Size <em>Size</em>}' enum.
@@ -607,18 +789,17 @@ public interface SimpleScenarioPackage extends EPackage {
607 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSize() 789 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getSize()
608 * @generated 790 * @generated
609 */ 791 */
610 int SIZE = 11; 792 int SIZE = 13;
611 793
612 /** 794 /**
613 * The meta object id for the '{@link simpleScenario.ActorType <em>Actor Type</em>}' enum. 795 * The meta object id for the '{@link simpleScenario.Distance <em>Distance</em>}' enum.
614 * <!-- begin-user-doc --> 796 * <!-- begin-user-doc -->
615 * <!-- end-user-doc --> 797 * <!-- end-user-doc -->
616 * @see simpleScenario.ActorType 798 * @see simpleScenario.Distance
617 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getActorType() 799 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getDistance()
618 * @generated 800 * @generated
619 */ 801 */
620 int ACTOR_TYPE = 12; 802 int DISTANCE = 14;
621
622 803
623 /** 804 /**
624 * Returns the meta object for class '{@link simpleScenario.SimpleScenario <em>Simple Scenario</em>}'. 805 * Returns the meta object for class '{@link simpleScenario.SimpleScenario <em>Simple Scenario</em>}'.
@@ -740,15 +921,15 @@ public interface SimpleScenarioPackage extends EPackage {
740 EReference getLane_Actors(); 921 EReference getLane_Actors();
741 922
742 /** 923 /**
743 * Returns the meta object for the attribute '{@link simpleScenario.Lane#getWidthNum <em>Width Num</em>}'. 924 * Returns the meta object for the attribute '{@link simpleScenario.Lane#getNumWidth <em>Num Width</em>}'.
744 * <!-- begin-user-doc --> 925 * <!-- begin-user-doc -->
745 * <!-- end-user-doc --> 926 * <!-- end-user-doc -->
746 * @return the meta object for the attribute '<em>Width Num</em>'. 927 * @return the meta object for the attribute '<em>Num Width</em>'.
747 * @see simpleScenario.Lane#getWidthNum() 928 * @see simpleScenario.Lane#getNumWidth()
748 * @see #getLane() 929 * @see #getLane()
749 * @generated 930 * @generated
750 */ 931 */
751 EAttribute getLane_WidthNum(); 932 EAttribute getLane_NumWidth();
752 933
753 /** 934 /**
754 * Returns the meta object for class '{@link simpleScenario.Actor <em>Actor</em>}'. 935 * Returns the meta object for class '{@link simpleScenario.Actor <em>Actor</em>}'.
@@ -761,17 +942,6 @@ public interface SimpleScenarioPackage extends EPackage {
761 EClass getActor(); 942 EClass getActor();
762 943
763 /** 944 /**
764 * Returns the meta object for the attribute '{@link simpleScenario.Actor#getType <em>Type</em>}'.
765 * <!-- begin-user-doc -->
766 * <!-- end-user-doc -->
767 * @return the meta object for the attribute '<em>Type</em>'.
768 * @see simpleScenario.Actor#getType()
769 * @see #getActor()
770 * @generated
771 */
772 EAttribute getActor_Type();
773
774 /**
775 * Returns the meta object for the attribute '{@link simpleScenario.Actor#getXPos <em>XPos</em>}'. 945 * Returns the meta object for the attribute '{@link simpleScenario.Actor#getXPos <em>XPos</em>}'.
776 * <!-- begin-user-doc --> 946 * <!-- begin-user-doc -->
777 * <!-- end-user-doc --> 947 * <!-- end-user-doc -->
@@ -932,6 +1102,17 @@ public interface SimpleScenarioPackage extends EPackage {
932 EAttribute getSeperationDistance_Distance(); 1102 EAttribute getSeperationDistance_Distance();
933 1103
934 /** 1104 /**
1105 * Returns the meta object for the attribute '{@link simpleScenario.SeperationDistance#getNumDistance <em>Num Distance</em>}'.
1106 * <!-- begin-user-doc -->
1107 * <!-- end-user-doc -->
1108 * @return the meta object for the attribute '<em>Num Distance</em>'.
1109 * @see simpleScenario.SeperationDistance#getNumDistance()
1110 * @see #getSeperationDistance()
1111 * @generated
1112 */
1113 EAttribute getSeperationDistance_NumDistance();
1114
1115 /**
935 * Returns the meta object for class '{@link simpleScenario.CollisionExists <em>Collision Exists</em>}'. 1116 * Returns the meta object for class '{@link simpleScenario.CollisionExists <em>Collision Exists</em>}'.
936 * <!-- begin-user-doc --> 1117 * <!-- begin-user-doc -->
937 * <!-- end-user-doc --> 1118 * <!-- end-user-doc -->
@@ -963,6 +1144,26 @@ public interface SimpleScenarioPackage extends EPackage {
963 EClass getCollisionDoesNotExist(); 1144 EClass getCollisionDoesNotExist();
964 1145
965 /** 1146 /**
1147 * Returns the meta object for class '{@link simpleScenario.Pedestrian <em>Pedestrian</em>}'.
1148 * <!-- begin-user-doc -->
1149 * <!-- end-user-doc -->
1150 * @return the meta object for class '<em>Pedestrian</em>'.
1151 * @see simpleScenario.Pedestrian
1152 * @generated
1153 */
1154 EClass getPedestrian();
1155
1156 /**
1157 * Returns the meta object for class '{@link simpleScenario.Vehicle <em>Vehicle</em>}'.
1158 * <!-- begin-user-doc -->
1159 * <!-- end-user-doc -->
1160 * @return the meta object for class '<em>Vehicle</em>'.
1161 * @see simpleScenario.Vehicle
1162 * @generated
1163 */
1164 EClass getVehicle();
1165
1166 /**
966 * Returns the meta object for enum '{@link simpleScenario.Orientation <em>Orientation</em>}'. 1167 * Returns the meta object for enum '{@link simpleScenario.Orientation <em>Orientation</em>}'.
967 * <!-- begin-user-doc --> 1168 * <!-- begin-user-doc -->
968 * <!-- end-user-doc --> 1169 * <!-- end-user-doc -->
@@ -983,14 +1184,14 @@ public interface SimpleScenarioPackage extends EPackage {
983 EEnum getSize(); 1184 EEnum getSize();
984 1185
985 /** 1186 /**
986 * Returns the meta object for enum '{@link simpleScenario.ActorType <em>Actor Type</em>}'. 1187 * Returns the meta object for enum '{@link simpleScenario.Distance <em>Distance</em>}'.
987 * <!-- begin-user-doc --> 1188 * <!-- begin-user-doc -->
988 * <!-- end-user-doc --> 1189 * <!-- end-user-doc -->
989 * @return the meta object for enum '<em>Actor Type</em>'. 1190 * @return the meta object for enum '<em>Distance</em>'.
990 * @see simpleScenario.ActorType 1191 * @see simpleScenario.Distance
991 * @generated 1192 * @generated
992 */ 1193 */
993 EEnum getActorType(); 1194 EEnum getDistance();
994 1195
995 /** 1196 /**
996 * Returns the factory that creates the instances of the model. 1197 * Returns the factory that creates the instances of the model.
@@ -1108,12 +1309,12 @@ public interface SimpleScenarioPackage extends EPackage {
1108 EReference LANE__ACTORS = eINSTANCE.getLane_Actors(); 1309 EReference LANE__ACTORS = eINSTANCE.getLane_Actors();
1109 1310
1110 /** 1311 /**
1111 * The meta object literal for the '<em><b>Width Num</b></em>' attribute feature. 1312 * The meta object literal for the '<em><b>Num Width</b></em>' attribute feature.
1112 * <!-- begin-user-doc --> 1313 * <!-- begin-user-doc -->
1113 * <!-- end-user-doc --> 1314 * <!-- end-user-doc -->
1114 * @generated 1315 * @generated
1115 */ 1316 */
1116 EAttribute LANE__WIDTH_NUM = eINSTANCE.getLane_WidthNum(); 1317 EAttribute LANE__NUM_WIDTH = eINSTANCE.getLane_NumWidth();
1117 1318
1118 /** 1319 /**
1119 * The meta object literal for the '{@link simpleScenario.impl.ActorImpl <em>Actor</em>}' class. 1320 * The meta object literal for the '{@link simpleScenario.impl.ActorImpl <em>Actor</em>}' class.
@@ -1126,14 +1327,6 @@ public interface SimpleScenarioPackage extends EPackage {
1126 EClass ACTOR = eINSTANCE.getActor(); 1327 EClass ACTOR = eINSTANCE.getActor();
1127 1328
1128 /** 1329 /**
1129 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
1130 * <!-- begin-user-doc -->
1131 * <!-- end-user-doc -->
1132 * @generated
1133 */
1134 EAttribute ACTOR__TYPE = eINSTANCE.getActor_Type();
1135
1136 /**
1137 * The meta object literal for the '<em><b>XPos</b></em>' attribute feature. 1330 * The meta object literal for the '<em><b>XPos</b></em>' attribute feature.
1138 * <!-- begin-user-doc --> 1331 * <!-- begin-user-doc -->
1139 * <!-- end-user-doc --> 1332 * <!-- end-user-doc -->
@@ -1264,6 +1457,14 @@ public interface SimpleScenarioPackage extends EPackage {
1264 EAttribute SEPERATION_DISTANCE__DISTANCE = eINSTANCE.getSeperationDistance_Distance(); 1457 EAttribute SEPERATION_DISTANCE__DISTANCE = eINSTANCE.getSeperationDistance_Distance();
1265 1458
1266 /** 1459 /**
1460 * The meta object literal for the '<em><b>Num Distance</b></em>' attribute feature.
1461 * <!-- begin-user-doc -->
1462 * <!-- end-user-doc -->
1463 * @generated
1464 */
1465 EAttribute SEPERATION_DISTANCE__NUM_DISTANCE = eINSTANCE.getSeperationDistance_NumDistance();
1466
1467 /**
1267 * The meta object literal for the '{@link simpleScenario.impl.CollisionExistsImpl <em>Collision Exists</em>}' class. 1468 * The meta object literal for the '{@link simpleScenario.impl.CollisionExistsImpl <em>Collision Exists</em>}' class.
1268 * <!-- begin-user-doc --> 1469 * <!-- begin-user-doc -->
1269 * <!-- end-user-doc --> 1470 * <!-- end-user-doc -->
@@ -1292,6 +1493,26 @@ public interface SimpleScenarioPackage extends EPackage {
1292 EClass COLLISION_DOES_NOT_EXIST = eINSTANCE.getCollisionDoesNotExist(); 1493 EClass COLLISION_DOES_NOT_EXIST = eINSTANCE.getCollisionDoesNotExist();
1293 1494
1294 /** 1495 /**
1496 * The meta object literal for the '{@link simpleScenario.impl.PedestrianImpl <em>Pedestrian</em>}' class.
1497 * <!-- begin-user-doc -->
1498 * <!-- end-user-doc -->
1499 * @see simpleScenario.impl.PedestrianImpl
1500 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getPedestrian()
1501 * @generated
1502 */
1503 EClass PEDESTRIAN = eINSTANCE.getPedestrian();
1504
1505 /**
1506 * The meta object literal for the '{@link simpleScenario.impl.VehicleImpl <em>Vehicle</em>}' class.
1507 * <!-- begin-user-doc -->
1508 * <!-- end-user-doc -->
1509 * @see simpleScenario.impl.VehicleImpl
1510 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getVehicle()
1511 * @generated
1512 */
1513 EClass VEHICLE = eINSTANCE.getVehicle();
1514
1515 /**
1295 * The meta object literal for the '{@link simpleScenario.Orientation <em>Orientation</em>}' enum. 1516 * The meta object literal for the '{@link simpleScenario.Orientation <em>Orientation</em>}' enum.
1296 * <!-- begin-user-doc --> 1517 * <!-- begin-user-doc -->
1297 * <!-- end-user-doc --> 1518 * <!-- end-user-doc -->
@@ -1312,14 +1533,14 @@ public interface SimpleScenarioPackage extends EPackage {
1312 EEnum SIZE = eINSTANCE.getSize(); 1533 EEnum SIZE = eINSTANCE.getSize();
1313 1534
1314 /** 1535 /**
1315 * The meta object literal for the '{@link simpleScenario.ActorType <em>Actor Type</em>}' enum. 1536 * The meta object literal for the '{@link simpleScenario.Distance <em>Distance</em>}' enum.
1316 * <!-- begin-user-doc --> 1537 * <!-- begin-user-doc -->
1317 * <!-- end-user-doc --> 1538 * <!-- end-user-doc -->
1318 * @see simpleScenario.ActorType 1539 * @see simpleScenario.Distance
1319 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getActorType() 1540 * @see simpleScenario.impl.SimpleScenarioPackageImpl#getDistance()
1320 * @generated 1541 * @generated
1321 */ 1542 */
1322 EEnum ACTOR_TYPE = eINSTANCE.getActorType(); 1543 EEnum DISTANCE = eINSTANCE.getDistance();
1323 1544
1324 } 1545 }
1325 1546
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 @@
1/**
2 */
3package simpleScenario;
4
5
6/**
7 * <!-- begin-user-doc -->
8 * A representation of the model object '<em><b>Vehicle</b></em>'.
9 * <!-- end-user-doc -->
10 *
11 *
12 * @see simpleScenario.SimpleScenarioPackage#getVehicle()
13 * @model
14 * @generated
15 */
16public interface Vehicle extends Actor {
17} // 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;
19import org.eclipse.emf.ecore.util.InternalEList; 19import org.eclipse.emf.ecore.util.InternalEList;
20 20
21import simpleScenario.Actor; 21import simpleScenario.Actor;
22import simpleScenario.ActorType;
23import simpleScenario.Lane; 22import simpleScenario.Lane;
24import simpleScenario.Relation; 23import simpleScenario.Relation;
25import simpleScenario.SimpleScenarioPackage; 24import simpleScenario.SimpleScenarioPackage;
@@ -32,7 +31,6 @@ import simpleScenario.SimpleScenarioPackage;
32 * The following features are implemented: 31 * The following features are implemented:
33 * </p> 32 * </p>
34 * <ul> 33 * <ul>
35 * <li>{@link simpleScenario.impl.ActorImpl#getType <em>Type</em>}</li>
36 * <li>{@link simpleScenario.impl.ActorImpl#getXPos <em>XPos</em>}</li> 34 * <li>{@link simpleScenario.impl.ActorImpl#getXPos <em>XPos</em>}</li>
37 * <li>{@link simpleScenario.impl.ActorImpl#getYPos <em>YPos</em>}</li> 35 * <li>{@link simpleScenario.impl.ActorImpl#getYPos <em>YPos</em>}</li>
38 * <li>{@link simpleScenario.impl.ActorImpl#getLength <em>Length</em>}</li> 36 * <li>{@link simpleScenario.impl.ActorImpl#getLength <em>Length</em>}</li>
@@ -44,27 +42,7 @@ import simpleScenario.SimpleScenarioPackage;
44 * 42 *
45 * @generated 43 * @generated
46 */ 44 */
47public class ActorImpl extends MinimalEObjectImpl.Container implements Actor { 45public abstract class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
48 /**
49 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
50 * <!-- begin-user-doc -->
51 * <!-- end-user-doc -->
52 * @see #getType()
53 * @generated
54 * @ordered
55 */
56 protected static final ActorType TYPE_EDEFAULT = ActorType.PEDESTRIAN;
57
58 /**
59 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
60 * <!-- begin-user-doc -->
61 * <!-- end-user-doc -->
62 * @see #getType()
63 * @generated
64 * @ordered
65 */
66 protected ActorType type = TYPE_EDEFAULT;
67
68 /** 46 /**
69 * The default value of the '{@link #getXPos() <em>XPos</em>}' attribute. 47 * The default value of the '{@link #getXPos() <em>XPos</em>}' attribute.
70 * <!-- begin-user-doc --> 48 * <!-- begin-user-doc -->
@@ -210,29 +188,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
210 * @generated 188 * @generated
211 */ 189 */
212 @Override 190 @Override
213 public ActorType getType() {
214 return type;
215 }
216
217 /**
218 * <!-- begin-user-doc -->
219 * <!-- end-user-doc -->
220 * @generated
221 */
222 @Override
223 public void setType(ActorType newType) {
224 ActorType oldType = type;
225 type = newType == null ? TYPE_EDEFAULT : newType;
226 if (eNotificationRequired())
227 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.ACTOR__TYPE, oldType, type));
228 }
229
230 /**
231 * <!-- begin-user-doc -->
232 * <!-- end-user-doc -->
233 * @generated
234 */
235 @Override
236 public double getXPos() { 191 public double getXPos() {
237 return xPos; 192 return xPos;
238 } 193 }
@@ -457,8 +412,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
457 @Override 412 @Override
458 public Object eGet(int featureID, boolean resolve, boolean coreType) { 413 public Object eGet(int featureID, boolean resolve, boolean coreType) {
459 switch (featureID) { 414 switch (featureID) {
460 case SimpleScenarioPackage.ACTOR__TYPE:
461 return getType();
462 case SimpleScenarioPackage.ACTOR__XPOS: 415 case SimpleScenarioPackage.ACTOR__XPOS:
463 return getXPos(); 416 return getXPos();
464 case SimpleScenarioPackage.ACTOR__YPOS: 417 case SimpleScenarioPackage.ACTOR__YPOS:
@@ -487,9 +440,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
487 @Override 440 @Override
488 public void eSet(int featureID, Object newValue) { 441 public void eSet(int featureID, Object newValue) {
489 switch (featureID) { 442 switch (featureID) {
490 case SimpleScenarioPackage.ACTOR__TYPE:
491 setType((ActorType)newValue);
492 return;
493 case SimpleScenarioPackage.ACTOR__XPOS: 443 case SimpleScenarioPackage.ACTOR__XPOS:
494 setXPos((Double)newValue); 444 setXPos((Double)newValue);
495 return; 445 return;
@@ -524,9 +474,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
524 @Override 474 @Override
525 public void eUnset(int featureID) { 475 public void eUnset(int featureID) {
526 switch (featureID) { 476 switch (featureID) {
527 case SimpleScenarioPackage.ACTOR__TYPE:
528 setType(TYPE_EDEFAULT);
529 return;
530 case SimpleScenarioPackage.ACTOR__XPOS: 477 case SimpleScenarioPackage.ACTOR__XPOS:
531 setXPos(XPOS_EDEFAULT); 478 setXPos(XPOS_EDEFAULT);
532 return; 479 return;
@@ -560,8 +507,6 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
560 @Override 507 @Override
561 public boolean eIsSet(int featureID) { 508 public boolean eIsSet(int featureID) {
562 switch (featureID) { 509 switch (featureID) {
563 case SimpleScenarioPackage.ACTOR__TYPE:
564 return type != TYPE_EDEFAULT;
565 case SimpleScenarioPackage.ACTOR__XPOS: 510 case SimpleScenarioPackage.ACTOR__XPOS:
566 return xPos != XPOS_EDEFAULT; 511 return xPos != XPOS_EDEFAULT;
567 case SimpleScenarioPackage.ACTOR__YPOS: 512 case SimpleScenarioPackage.ACTOR__YPOS:
@@ -590,9 +535,7 @@ public class ActorImpl extends MinimalEObjectImpl.Container implements Actor {
590 if (eIsProxy()) return super.toString(); 535 if (eIsProxy()) return super.toString();
591 536
592 StringBuilder result = new StringBuilder(super.toString()); 537 StringBuilder result = new StringBuilder(super.toString());
593 result.append(" (type: "); 538 result.append(" (xPos: ");
594 result.append(type);
595 result.append(", xPos: ");
596 result.append(xPos); 539 result.append(xPos);
597 result.append(", yPos: "); 540 result.append(", yPos: ");
598 result.append(yPos); 541 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;
38 * <li>{@link simpleScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li> 38 * <li>{@link simpleScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li>
39 * <li>{@link simpleScenario.impl.LaneImpl#getAdjacent <em>Adjacent</em>}</li> 39 * <li>{@link simpleScenario.impl.LaneImpl#getAdjacent <em>Adjacent</em>}</li>
40 * <li>{@link simpleScenario.impl.LaneImpl#getActors <em>Actors</em>}</li> 40 * <li>{@link simpleScenario.impl.LaneImpl#getActors <em>Actors</em>}</li>
41 * <li>{@link simpleScenario.impl.LaneImpl#getWidthNum <em>Width Num</em>}</li> 41 * <li>{@link simpleScenario.impl.LaneImpl#getNumWidth <em>Num Width</em>}</li>
42 * </ul> 42 * </ul>
43 * 43 *
44 * @generated 44 * @generated
@@ -125,24 +125,24 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
125 protected EList<Actor> actors; 125 protected EList<Actor> actors;
126 126
127 /** 127 /**
128 * The default value of the '{@link #getWidthNum() <em>Width Num</em>}' attribute. 128 * The default value of the '{@link #getNumWidth() <em>Num Width</em>}' attribute.
129 * <!-- begin-user-doc --> 129 * <!-- begin-user-doc -->
130 * <!-- end-user-doc --> 130 * <!-- end-user-doc -->
131 * @see #getWidthNum() 131 * @see #getNumWidth()
132 * @generated 132 * @generated
133 * @ordered 133 * @ordered
134 */ 134 */
135 protected static final double WIDTH_NUM_EDEFAULT = 0.0; 135 protected static final double NUM_WIDTH_EDEFAULT = 0.0;
136 136
137 /** 137 /**
138 * The cached value of the '{@link #getWidthNum() <em>Width Num</em>}' attribute. 138 * The cached value of the '{@link #getNumWidth() <em>Num Width</em>}' attribute.
139 * <!-- begin-user-doc --> 139 * <!-- begin-user-doc -->
140 * <!-- end-user-doc --> 140 * <!-- end-user-doc -->
141 * @see #getWidthNum() 141 * @see #getNumWidth()
142 * @generated 142 * @generated
143 * @ordered 143 * @ordered
144 */ 144 */
145 protected double widthNum = WIDTH_NUM_EDEFAULT; 145 protected double numWidth = NUM_WIDTH_EDEFAULT;
146 146
147 /** 147 /**
148 * <!-- begin-user-doc --> 148 * <!-- begin-user-doc -->
@@ -264,8 +264,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
264 * @generated 264 * @generated
265 */ 265 */
266 @Override 266 @Override
267 public double getWidthNum() { 267 public double getNumWidth() {
268 return widthNum; 268 return numWidth;
269 } 269 }
270 270
271 /** 271 /**
@@ -274,11 +274,11 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
274 * @generated 274 * @generated
275 */ 275 */
276 @Override 276 @Override
277 public void setWidthNum(double newWidthNum) { 277 public void setNumWidth(double newNumWidth) {
278 double oldWidthNum = widthNum; 278 double oldNumWidth = numWidth;
279 widthNum = newWidthNum; 279 numWidth = newNumWidth;
280 if (eNotificationRequired()) 280 if (eNotificationRequired())
281 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__WIDTH_NUM, oldWidthNum, widthNum)); 281 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.LANE__NUM_WIDTH, oldNumWidth, numWidth));
282 } 282 }
283 283
284 /** 284 /**
@@ -328,8 +328,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
328 return getAdjacent(); 328 return getAdjacent();
329 case SimpleScenarioPackage.LANE__ACTORS: 329 case SimpleScenarioPackage.LANE__ACTORS:
330 return getActors(); 330 return getActors();
331 case SimpleScenarioPackage.LANE__WIDTH_NUM: 331 case SimpleScenarioPackage.LANE__NUM_WIDTH:
332 return getWidthNum(); 332 return getNumWidth();
333 } 333 }
334 return super.eGet(featureID, resolve, coreType); 334 return super.eGet(featureID, resolve, coreType);
335 } 335 }
@@ -360,8 +360,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
360 getActors().clear(); 360 getActors().clear();
361 getActors().addAll((Collection<? extends Actor>)newValue); 361 getActors().addAll((Collection<? extends Actor>)newValue);
362 return; 362 return;
363 case SimpleScenarioPackage.LANE__WIDTH_NUM: 363 case SimpleScenarioPackage.LANE__NUM_WIDTH:
364 setWidthNum((Double)newValue); 364 setNumWidth((Double)newValue);
365 return; 365 return;
366 } 366 }
367 super.eSet(featureID, newValue); 367 super.eSet(featureID, newValue);
@@ -390,8 +390,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
390 case SimpleScenarioPackage.LANE__ACTORS: 390 case SimpleScenarioPackage.LANE__ACTORS:
391 getActors().clear(); 391 getActors().clear();
392 return; 392 return;
393 case SimpleScenarioPackage.LANE__WIDTH_NUM: 393 case SimpleScenarioPackage.LANE__NUM_WIDTH:
394 setWidthNum(WIDTH_NUM_EDEFAULT); 394 setNumWidth(NUM_WIDTH_EDEFAULT);
395 return; 395 return;
396 } 396 }
397 super.eUnset(featureID); 397 super.eUnset(featureID);
@@ -415,8 +415,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
415 return adjacent != null && !adjacent.isEmpty(); 415 return adjacent != null && !adjacent.isEmpty();
416 case SimpleScenarioPackage.LANE__ACTORS: 416 case SimpleScenarioPackage.LANE__ACTORS:
417 return actors != null && !actors.isEmpty(); 417 return actors != null && !actors.isEmpty();
418 case SimpleScenarioPackage.LANE__WIDTH_NUM: 418 case SimpleScenarioPackage.LANE__NUM_WIDTH:
419 return widthNum != WIDTH_NUM_EDEFAULT; 419 return numWidth != NUM_WIDTH_EDEFAULT;
420 } 420 }
421 return super.eIsSet(featureID); 421 return super.eIsSet(featureID);
422 } 422 }
@@ -437,8 +437,8 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
437 result.append(width); 437 result.append(width);
438 result.append(", referenceCoord: "); 438 result.append(", referenceCoord: ");
439 result.append(referenceCoord); 439 result.append(referenceCoord);
440 result.append(", widthNum: "); 440 result.append(", numWidth: ");
441 result.append(widthNum); 441 result.append(numWidth);
442 result.append(')'); 442 result.append(')');
443 return result.toString(); 443 return result.toString();
444 } 444 }
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 @@
1/**
2 */
3package simpleScenario.impl;
4
5import org.eclipse.emf.ecore.EClass;
6
7import simpleScenario.Pedestrian;
8import simpleScenario.SimpleScenarioPackage;
9
10/**
11 * <!-- begin-user-doc -->
12 * An implementation of the model object '<em><b>Pedestrian</b></em>'.
13 * <!-- end-user-doc -->
14 *
15 * @generated
16 */
17public class PedestrianImpl extends ActorImpl implements Pedestrian {
18 /**
19 * <!-- begin-user-doc -->
20 * <!-- end-user-doc -->
21 * @generated
22 */
23 protected PedestrianImpl() {
24 super();
25 }
26
27 /**
28 * <!-- begin-user-doc -->
29 * <!-- end-user-doc -->
30 * @generated
31 */
32 @Override
33 protected EClass eStaticClass() {
34 return SimpleScenarioPackage.Literals.PEDESTRIAN;
35 }
36
37} //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;
8 8
9import org.eclipse.emf.ecore.impl.ENotificationImpl; 9import org.eclipse.emf.ecore.impl.ENotificationImpl;
10 10
11import simpleScenario.Distance;
11import simpleScenario.SeperationDistance; 12import simpleScenario.SeperationDistance;
12import simpleScenario.SimpleScenarioPackage; 13import simpleScenario.SimpleScenarioPackage;
13import simpleScenario.Size;
14 14
15/** 15/**
16 * <!-- begin-user-doc --> 16 * <!-- begin-user-doc -->
@@ -21,6 +21,7 @@ import simpleScenario.Size;
21 * </p> 21 * </p>
22 * <ul> 22 * <ul>
23 * <li>{@link simpleScenario.impl.SeperationDistanceImpl#getDistance <em>Distance</em>}</li> 23 * <li>{@link simpleScenario.impl.SeperationDistanceImpl#getDistance <em>Distance</em>}</li>
24 * <li>{@link simpleScenario.impl.SeperationDistanceImpl#getNumDistance <em>Num Distance</em>}</li>
24 * </ul> 25 * </ul>
25 * 26 *
26 * @generated 27 * @generated
@@ -34,7 +35,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
34 * @generated 35 * @generated
35 * @ordered 36 * @ordered
36 */ 37 */
37 protected static final Size DISTANCE_EDEFAULT = Size.SMALL; 38 protected static final Distance DISTANCE_EDEFAULT = Distance.NEAR;
38 39
39 /** 40 /**
40 * The cached value of the '{@link #getDistance() <em>Distance</em>}' attribute. 41 * The cached value of the '{@link #getDistance() <em>Distance</em>}' attribute.
@@ -44,7 +45,27 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
44 * @generated 45 * @generated
45 * @ordered 46 * @ordered
46 */ 47 */
47 protected Size distance = DISTANCE_EDEFAULT; 48 protected Distance distance = DISTANCE_EDEFAULT;
49
50 /**
51 * The default value of the '{@link #getNumDistance() <em>Num Distance</em>}' attribute.
52 * <!-- begin-user-doc -->
53 * <!-- end-user-doc -->
54 * @see #getNumDistance()
55 * @generated
56 * @ordered
57 */
58 protected static final double NUM_DISTANCE_EDEFAULT = 0.0;
59
60 /**
61 * The cached value of the '{@link #getNumDistance() <em>Num Distance</em>}' attribute.
62 * <!-- begin-user-doc -->
63 * <!-- end-user-doc -->
64 * @see #getNumDistance()
65 * @generated
66 * @ordered
67 */
68 protected double numDistance = NUM_DISTANCE_EDEFAULT;
48 69
49 /** 70 /**
50 * <!-- begin-user-doc --> 71 * <!-- begin-user-doc -->
@@ -71,7 +92,7 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
71 * @generated 92 * @generated
72 */ 93 */
73 @Override 94 @Override
74 public Size getDistance() { 95 public Distance getDistance() {
75 return distance; 96 return distance;
76 } 97 }
77 98
@@ -81,8 +102,8 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
81 * @generated 102 * @generated
82 */ 103 */
83 @Override 104 @Override
84 public void setDistance(Size newDistance) { 105 public void setDistance(Distance newDistance) {
85 Size oldDistance = distance; 106 Distance oldDistance = distance;
86 distance = newDistance == null ? DISTANCE_EDEFAULT : newDistance; 107 distance = newDistance == null ? DISTANCE_EDEFAULT : newDistance;
87 if (eNotificationRequired()) 108 if (eNotificationRequired())
88 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE, oldDistance, distance)); 109 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE, oldDistance, distance));
@@ -94,10 +115,35 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
94 * @generated 115 * @generated
95 */ 116 */
96 @Override 117 @Override
118 public double getNumDistance() {
119 return numDistance;
120 }
121
122 /**
123 * <!-- begin-user-doc -->
124 * <!-- end-user-doc -->
125 * @generated
126 */
127 @Override
128 public void setNumDistance(double newNumDistance) {
129 double oldNumDistance = numDistance;
130 numDistance = newNumDistance;
131 if (eNotificationRequired())
132 eNotify(new ENotificationImpl(this, Notification.SET, SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE, oldNumDistance, numDistance));
133 }
134
135 /**
136 * <!-- begin-user-doc -->
137 * <!-- end-user-doc -->
138 * @generated
139 */
140 @Override
97 public Object eGet(int featureID, boolean resolve, boolean coreType) { 141 public Object eGet(int featureID, boolean resolve, boolean coreType) {
98 switch (featureID) { 142 switch (featureID) {
99 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE: 143 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
100 return getDistance(); 144 return getDistance();
145 case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
146 return getNumDistance();
101 } 147 }
102 return super.eGet(featureID, resolve, coreType); 148 return super.eGet(featureID, resolve, coreType);
103 } 149 }
@@ -111,7 +157,10 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
111 public void eSet(int featureID, Object newValue) { 157 public void eSet(int featureID, Object newValue) {
112 switch (featureID) { 158 switch (featureID) {
113 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE: 159 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
114 setDistance((Size)newValue); 160 setDistance((Distance)newValue);
161 return;
162 case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
163 setNumDistance((Double)newValue);
115 return; 164 return;
116 } 165 }
117 super.eSet(featureID, newValue); 166 super.eSet(featureID, newValue);
@@ -128,6 +177,9 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
128 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE: 177 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
129 setDistance(DISTANCE_EDEFAULT); 178 setDistance(DISTANCE_EDEFAULT);
130 return; 179 return;
180 case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
181 setNumDistance(NUM_DISTANCE_EDEFAULT);
182 return;
131 } 183 }
132 super.eUnset(featureID); 184 super.eUnset(featureID);
133 } 185 }
@@ -142,6 +194,8 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
142 switch (featureID) { 194 switch (featureID) {
143 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE: 195 case SimpleScenarioPackage.SEPERATION_DISTANCE__DISTANCE:
144 return distance != DISTANCE_EDEFAULT; 196 return distance != DISTANCE_EDEFAULT;
197 case SimpleScenarioPackage.SEPERATION_DISTANCE__NUM_DISTANCE:
198 return numDistance != NUM_DISTANCE_EDEFAULT;
145 } 199 }
146 return super.eIsSet(featureID); 200 return super.eIsSet(featureID);
147 } 201 }
@@ -158,6 +212,8 @@ public class SeperationDistanceImpl extends SpatialRelationImpl implements Seper
158 StringBuilder result = new StringBuilder(super.toString()); 212 StringBuilder result = new StringBuilder(super.toString());
159 result.append(" (distance: "); 213 result.append(" (distance: ");
160 result.append(distance); 214 result.append(distance);
215 result.append(", numDistance: ");
216 result.append(numDistance);
161 result.append(')'); 217 result.append(')');
162 return result.toString(); 218 return result.toString();
163 } 219 }
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
59 switch (eClass.getClassifierID()) { 59 switch (eClass.getClassifierID()) {
60 case SimpleScenarioPackage.SIMPLE_SCENARIO: return createSimpleScenario(); 60 case SimpleScenarioPackage.SIMPLE_SCENARIO: return createSimpleScenario();
61 case SimpleScenarioPackage.LANE: return createLane(); 61 case SimpleScenarioPackage.LANE: return createLane();
62 case SimpleScenarioPackage.ACTOR: return createActor();
63 case SimpleScenarioPackage.VISION_BLOCKED: return createVisionBlocked(); 62 case SimpleScenarioPackage.VISION_BLOCKED: return createVisionBlocked();
64 case SimpleScenarioPackage.SEPERATION_DISTANCE: return createSeperationDistance(); 63 case SimpleScenarioPackage.SEPERATION_DISTANCE: return createSeperationDistance();
65 case SimpleScenarioPackage.COLLISION_EXISTS: return createCollisionExists(); 64 case SimpleScenarioPackage.COLLISION_EXISTS: return createCollisionExists();
66 case SimpleScenarioPackage.COLLISION_DOES_NOT_EXIST: return createCollisionDoesNotExist(); 65 case SimpleScenarioPackage.COLLISION_DOES_NOT_EXIST: return createCollisionDoesNotExist();
66 case SimpleScenarioPackage.PEDESTRIAN: return createPedestrian();
67 case SimpleScenarioPackage.VEHICLE: return createVehicle();
67 default: 68 default:
68 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); 69 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
69 } 70 }
@@ -81,8 +82,8 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
81 return createOrientationFromString(eDataType, initialValue); 82 return createOrientationFromString(eDataType, initialValue);
82 case SimpleScenarioPackage.SIZE: 83 case SimpleScenarioPackage.SIZE:
83 return createSizeFromString(eDataType, initialValue); 84 return createSizeFromString(eDataType, initialValue);
84 case SimpleScenarioPackage.ACTOR_TYPE: 85 case SimpleScenarioPackage.DISTANCE:
85 return createActorTypeFromString(eDataType, initialValue); 86 return createDistanceFromString(eDataType, initialValue);
86 default: 87 default:
87 throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); 88 throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
88 } 89 }
@@ -100,8 +101,8 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
100 return convertOrientationToString(eDataType, instanceValue); 101 return convertOrientationToString(eDataType, instanceValue);
101 case SimpleScenarioPackage.SIZE: 102 case SimpleScenarioPackage.SIZE:
102 return convertSizeToString(eDataType, instanceValue); 103 return convertSizeToString(eDataType, instanceValue);
103 case SimpleScenarioPackage.ACTOR_TYPE: 104 case SimpleScenarioPackage.DISTANCE:
104 return convertActorTypeToString(eDataType, instanceValue); 105 return convertDistanceToString(eDataType, instanceValue);
105 default: 106 default:
106 throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); 107 throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
107 } 108 }
@@ -135,17 +136,6 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
135 * @generated 136 * @generated
136 */ 137 */
137 @Override 138 @Override
138 public Actor createActor() {
139 ActorImpl actor = new ActorImpl();
140 return actor;
141 }
142
143 /**
144 * <!-- begin-user-doc -->
145 * <!-- end-user-doc -->
146 * @generated
147 */
148 @Override
149 public VisionBlocked createVisionBlocked() { 139 public VisionBlocked createVisionBlocked() {
150 VisionBlockedImpl visionBlocked = new VisionBlockedImpl(); 140 VisionBlockedImpl visionBlocked = new VisionBlockedImpl();
151 return visionBlocked; 141 return visionBlocked;
@@ -189,6 +179,28 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
189 * <!-- end-user-doc --> 179 * <!-- end-user-doc -->
190 * @generated 180 * @generated
191 */ 181 */
182 @Override
183 public Pedestrian createPedestrian() {
184 PedestrianImpl pedestrian = new PedestrianImpl();
185 return pedestrian;
186 }
187
188 /**
189 * <!-- begin-user-doc -->
190 * <!-- end-user-doc -->
191 * @generated
192 */
193 @Override
194 public Vehicle createVehicle() {
195 VehicleImpl vehicle = new VehicleImpl();
196 return vehicle;
197 }
198
199 /**
200 * <!-- begin-user-doc -->
201 * <!-- end-user-doc -->
202 * @generated
203 */
192 public Orientation createOrientationFromString(EDataType eDataType, String initialValue) { 204 public Orientation createOrientationFromString(EDataType eDataType, String initialValue) {
193 Orientation result = Orientation.get(initialValue); 205 Orientation result = Orientation.get(initialValue);
194 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); 206 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
@@ -229,8 +241,8 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
229 * <!-- end-user-doc --> 241 * <!-- end-user-doc -->
230 * @generated 242 * @generated
231 */ 243 */
232 public ActorType createActorTypeFromString(EDataType eDataType, String initialValue) { 244 public Distance createDistanceFromString(EDataType eDataType, String initialValue) {
233 ActorType result = ActorType.get(initialValue); 245 Distance result = Distance.get(initialValue);
234 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); 246 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
235 return result; 247 return result;
236 } 248 }
@@ -240,7 +252,7 @@ public class SimpleScenarioFactoryImpl extends EFactoryImpl implements SimpleSce
240 * <!-- end-user-doc --> 252 * <!-- end-user-doc -->
241 * @generated 253 * @generated
242 */ 254 */
243 public String convertActorTypeToString(EDataType eDataType, Object instanceValue) { 255 public String convertDistanceToString(EDataType eDataType, Object instanceValue) {
244 return instanceValue == null ? null : instanceValue.toString(); 256 return instanceValue == null ? null : instanceValue.toString();
245 } 257 }
246 258
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;
11import org.eclipse.emf.ecore.impl.EPackageImpl; 11import org.eclipse.emf.ecore.impl.EPackageImpl;
12 12
13import simpleScenario.Actor; 13import simpleScenario.Actor;
14import simpleScenario.ActorType;
15import simpleScenario.CollisionDoesNotExist; 14import simpleScenario.CollisionDoesNotExist;
16import simpleScenario.CollisionExists; 15import simpleScenario.CollisionExists;
16import simpleScenario.Distance;
17import simpleScenario.Lane; 17import simpleScenario.Lane;
18import simpleScenario.Orientation; 18import simpleScenario.Orientation;
19import simpleScenario.Pedestrian;
19import simpleScenario.Relation; 20import simpleScenario.Relation;
20import simpleScenario.SeperationDistance; 21import simpleScenario.SeperationDistance;
21import simpleScenario.SimpleScenario; 22import simpleScenario.SimpleScenario;
@@ -24,6 +25,7 @@ import simpleScenario.SimpleScenarioPackage;
24import simpleScenario.Size; 25import simpleScenario.Size;
25import simpleScenario.SpatialRelation; 26import simpleScenario.SpatialRelation;
26import simpleScenario.TemporalRelation; 27import simpleScenario.TemporalRelation;
28import simpleScenario.Vehicle;
27import simpleScenario.VisionBlocked; 29import simpleScenario.VisionBlocked;
28 30
29/** 31/**
@@ -108,6 +110,20 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
108 * <!-- end-user-doc --> 110 * <!-- end-user-doc -->
109 * @generated 111 * @generated
110 */ 112 */
113 private EClass pedestrianEClass = null;
114
115 /**
116 * <!-- begin-user-doc -->
117 * <!-- end-user-doc -->
118 * @generated
119 */
120 private EClass vehicleEClass = null;
121
122 /**
123 * <!-- begin-user-doc -->
124 * <!-- end-user-doc -->
125 * @generated
126 */
111 private EEnum orientationEEnum = null; 127 private EEnum orientationEEnum = null;
112 128
113 /** 129 /**
@@ -122,7 +138,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
122 * <!-- end-user-doc --> 138 * <!-- end-user-doc -->
123 * @generated 139 * @generated
124 */ 140 */
125 private EEnum actorTypeEEnum = null; 141 private EEnum distanceEEnum = null;
126 142
127 /** 143 /**
128 * Creates an instance of the model <b>Package</b>, registered with 144 * Creates an instance of the model <b>Package</b>, registered with
@@ -301,7 +317,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
301 * @generated 317 * @generated
302 */ 318 */
303 @Override 319 @Override
304 public EAttribute getLane_WidthNum() { 320 public EAttribute getLane_NumWidth() {
305 return (EAttribute)laneEClass.getEStructuralFeatures().get(5); 321 return (EAttribute)laneEClass.getEStructuralFeatures().get(5);
306 } 322 }
307 323
@@ -321,18 +337,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
321 * @generated 337 * @generated
322 */ 338 */
323 @Override 339 @Override
324 public EAttribute getActor_Type() {
325 return (EAttribute)actorEClass.getEStructuralFeatures().get(0);
326 }
327
328 /**
329 * <!-- begin-user-doc -->
330 * <!-- end-user-doc -->
331 * @generated
332 */
333 @Override
334 public EAttribute getActor_XPos() { 340 public EAttribute getActor_XPos() {
335 return (EAttribute)actorEClass.getEStructuralFeatures().get(1); 341 return (EAttribute)actorEClass.getEStructuralFeatures().get(0);
336 } 342 }
337 343
338 /** 344 /**
@@ -342,7 +348,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
342 */ 348 */
343 @Override 349 @Override
344 public EAttribute getActor_YPos() { 350 public EAttribute getActor_YPos() {
345 return (EAttribute)actorEClass.getEStructuralFeatures().get(2); 351 return (EAttribute)actorEClass.getEStructuralFeatures().get(1);
346 } 352 }
347 353
348 /** 354 /**
@@ -352,7 +358,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
352 */ 358 */
353 @Override 359 @Override
354 public EAttribute getActor_Length() { 360 public EAttribute getActor_Length() {
355 return (EAttribute)actorEClass.getEStructuralFeatures().get(3); 361 return (EAttribute)actorEClass.getEStructuralFeatures().get(2);
356 } 362 }
357 363
358 /** 364 /**
@@ -362,7 +368,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
362 */ 368 */
363 @Override 369 @Override
364 public EAttribute getActor_Width() { 370 public EAttribute getActor_Width() {
365 return (EAttribute)actorEClass.getEStructuralFeatures().get(4); 371 return (EAttribute)actorEClass.getEStructuralFeatures().get(3);
366 } 372 }
367 373
368 /** 374 /**
@@ -372,7 +378,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
372 */ 378 */
373 @Override 379 @Override
374 public EAttribute getActor_Speed() { 380 public EAttribute getActor_Speed() {
375 return (EAttribute)actorEClass.getEStructuralFeatures().get(5); 381 return (EAttribute)actorEClass.getEStructuralFeatures().get(4);
376 } 382 }
377 383
378 /** 384 /**
@@ -382,7 +388,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
382 */ 388 */
383 @Override 389 @Override
384 public EReference getActor_Relations() { 390 public EReference getActor_Relations() {
385 return (EReference)actorEClass.getEStructuralFeatures().get(6); 391 return (EReference)actorEClass.getEStructuralFeatures().get(5);
386 } 392 }
387 393
388 /** 394 /**
@@ -392,7 +398,7 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
392 */ 398 */
393 @Override 399 @Override
394 public EReference getActor_PlacedOn() { 400 public EReference getActor_PlacedOn() {
395 return (EReference)actorEClass.getEStructuralFeatures().get(7); 401 return (EReference)actorEClass.getEStructuralFeatures().get(6);
396 } 402 }
397 403
398 /** 404 /**
@@ -481,6 +487,16 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
481 * @generated 487 * @generated
482 */ 488 */
483 @Override 489 @Override
490 public EAttribute getSeperationDistance_NumDistance() {
491 return (EAttribute)seperationDistanceEClass.getEStructuralFeatures().get(1);
492 }
493
494 /**
495 * <!-- begin-user-doc -->
496 * <!-- end-user-doc -->
497 * @generated
498 */
499 @Override
484 public EClass getCollisionExists() { 500 public EClass getCollisionExists() {
485 return collisionExistsEClass; 501 return collisionExistsEClass;
486 } 502 }
@@ -511,6 +527,26 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
511 * @generated 527 * @generated
512 */ 528 */
513 @Override 529 @Override
530 public EClass getPedestrian() {
531 return pedestrianEClass;
532 }
533
534 /**
535 * <!-- begin-user-doc -->
536 * <!-- end-user-doc -->
537 * @generated
538 */
539 @Override
540 public EClass getVehicle() {
541 return vehicleEClass;
542 }
543
544 /**
545 * <!-- begin-user-doc -->
546 * <!-- end-user-doc -->
547 * @generated
548 */
549 @Override
514 public EEnum getOrientation() { 550 public EEnum getOrientation() {
515 return orientationEEnum; 551 return orientationEEnum;
516 } 552 }
@@ -531,8 +567,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
531 * @generated 567 * @generated
532 */ 568 */
533 @Override 569 @Override
534 public EEnum getActorType() { 570 public EEnum getDistance() {
535 return actorTypeEEnum; 571 return distanceEEnum;
536 } 572 }
537 573
538 /** 574 /**
@@ -576,10 +612,9 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
576 createEAttribute(laneEClass, LANE__REFERENCE_COORD); 612 createEAttribute(laneEClass, LANE__REFERENCE_COORD);
577 createEReference(laneEClass, LANE__ADJACENT); 613 createEReference(laneEClass, LANE__ADJACENT);
578 createEReference(laneEClass, LANE__ACTORS); 614 createEReference(laneEClass, LANE__ACTORS);
579 createEAttribute(laneEClass, LANE__WIDTH_NUM); 615 createEAttribute(laneEClass, LANE__NUM_WIDTH);
580 616
581 actorEClass = createEClass(ACTOR); 617 actorEClass = createEClass(ACTOR);
582 createEAttribute(actorEClass, ACTOR__TYPE);
583 createEAttribute(actorEClass, ACTOR__XPOS); 618 createEAttribute(actorEClass, ACTOR__XPOS);
584 createEAttribute(actorEClass, ACTOR__YPOS); 619 createEAttribute(actorEClass, ACTOR__YPOS);
585 createEAttribute(actorEClass, ACTOR__LENGTH); 620 createEAttribute(actorEClass, ACTOR__LENGTH);
@@ -600,16 +635,21 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
600 635
601 seperationDistanceEClass = createEClass(SEPERATION_DISTANCE); 636 seperationDistanceEClass = createEClass(SEPERATION_DISTANCE);
602 createEAttribute(seperationDistanceEClass, SEPERATION_DISTANCE__DISTANCE); 637 createEAttribute(seperationDistanceEClass, SEPERATION_DISTANCE__DISTANCE);
638 createEAttribute(seperationDistanceEClass, SEPERATION_DISTANCE__NUM_DISTANCE);
603 639
604 collisionExistsEClass = createEClass(COLLISION_EXISTS); 640 collisionExistsEClass = createEClass(COLLISION_EXISTS);
605 createEAttribute(collisionExistsEClass, COLLISION_EXISTS__COLLISION_TIME); 641 createEAttribute(collisionExistsEClass, COLLISION_EXISTS__COLLISION_TIME);
606 642
607 collisionDoesNotExistEClass = createEClass(COLLISION_DOES_NOT_EXIST); 643 collisionDoesNotExistEClass = createEClass(COLLISION_DOES_NOT_EXIST);
608 644
645 pedestrianEClass = createEClass(PEDESTRIAN);
646
647 vehicleEClass = createEClass(VEHICLE);
648
609 // Create enums 649 // Create enums
610 orientationEEnum = createEEnum(ORIENTATION); 650 orientationEEnum = createEEnum(ORIENTATION);
611 sizeEEnum = createEEnum(SIZE); 651 sizeEEnum = createEEnum(SIZE);
612 actorTypeEEnum = createEEnum(ACTOR_TYPE); 652 distanceEEnum = createEEnum(DISTANCE);
613 } 653 }
614 654
615 /** 655 /**
@@ -646,6 +686,8 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
646 seperationDistanceEClass.getESuperTypes().add(this.getSpatialRelation()); 686 seperationDistanceEClass.getESuperTypes().add(this.getSpatialRelation());
647 collisionExistsEClass.getESuperTypes().add(this.getTemporalRelation()); 687 collisionExistsEClass.getESuperTypes().add(this.getTemporalRelation());
648 collisionDoesNotExistEClass.getESuperTypes().add(this.getTemporalRelation()); 688 collisionDoesNotExistEClass.getESuperTypes().add(this.getTemporalRelation());
689 pedestrianEClass.getESuperTypes().add(this.getActor());
690 vehicleEClass.getESuperTypes().add(this.getActor());
649 691
650 // Initialize classes, features, and operations; add parameters 692 // Initialize classes, features, and operations; add parameters
651 initEClass(simpleScenarioEClass, SimpleScenario.class, "SimpleScenario", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 693 initEClass(simpleScenarioEClass, SimpleScenario.class, "SimpleScenario", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -660,15 +702,14 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
660 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); 702 initEAttribute(getLane_ReferenceCoord(), ecorePackage.getEDouble(), "referenceCoord", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
661 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); 703 initEReference(getLane_Adjacent(), this.getLane(), null, "adjacent", null, 0, 2, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
662 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); 704 initEReference(getLane_Actors(), this.getActor(), this.getActor_PlacedOn(), "actors", null, 0, -1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
663 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); 705 initEAttribute(getLane_NumWidth(), ecorePackage.getEDouble(), "numWidth", "0.0", 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
664 706
665 initEClass(actorEClass, Actor.class, "Actor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 707 initEClass(actorEClass, Actor.class, "Actor", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
666 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);
667 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); 708 initEAttribute(getActor_XPos(), ecorePackage.getEDouble(), "xPos", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
668 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); 709 initEAttribute(getActor_YPos(), ecorePackage.getEDouble(), "yPos", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
669 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); 710 initEAttribute(getActor_Length(), ecorePackage.getEDouble(), "length", "0.0", 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
670 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); 711 initEAttribute(getActor_Width(), ecorePackage.getEDouble(), "width", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
671 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); 712 initEAttribute(getActor_Speed(), ecorePackage.getEDouble(), "speed", "0.0", 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
672 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); 713 initEReference(getActor_Relations(), this.getRelation(), null, "relations", null, 0, -1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
673 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); 714 initEReference(getActor_PlacedOn(), this.getLane(), this.getLane_Actors(), "placedOn", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
674 715
@@ -683,13 +724,18 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
683 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); 724 initEReference(getVisionBlocked_BlockedBy(), this.getActor(), null, "blockedBy", null, 0, 1, VisionBlocked.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
684 725
685 initEClass(seperationDistanceEClass, SeperationDistance.class, "SeperationDistance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 726 initEClass(seperationDistanceEClass, SeperationDistance.class, "SeperationDistance", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
686 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); 727 initEAttribute(getSeperationDistance_Distance(), this.getDistance(), "distance", null, 1, 1, SeperationDistance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
728 initEAttribute(getSeperationDistance_NumDistance(), ecorePackage.getEDouble(), "numDistance", null, 1, 1, SeperationDistance.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
687 729
688 initEClass(collisionExistsEClass, CollisionExists.class, "CollisionExists", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 730 initEClass(collisionExistsEClass, CollisionExists.class, "CollisionExists", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
689 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); 731 initEAttribute(getCollisionExists_CollisionTime(), ecorePackage.getEDouble(), "collisionTime", null, 1, 1, CollisionExists.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
690 732
691 initEClass(collisionDoesNotExistEClass, CollisionDoesNotExist.class, "CollisionDoesNotExist", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 733 initEClass(collisionDoesNotExistEClass, CollisionDoesNotExist.class, "CollisionDoesNotExist", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
692 734
735 initEClass(pedestrianEClass, Pedestrian.class, "Pedestrian", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
736
737 initEClass(vehicleEClass, Vehicle.class, "Vehicle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
738
693 // Initialize enums and add enum literals 739 // Initialize enums and add enum literals
694 initEEnum(orientationEEnum, Orientation.class, "Orientation"); 740 initEEnum(orientationEEnum, Orientation.class, "Orientation");
695 addEEnumLiteral(orientationEEnum, Orientation.VERTICAL); 741 addEEnumLiteral(orientationEEnum, Orientation.VERTICAL);
@@ -700,9 +746,10 @@ public class SimpleScenarioPackageImpl extends EPackageImpl implements SimpleSce
700 addEEnumLiteral(sizeEEnum, Size.MEDIUM); 746 addEEnumLiteral(sizeEEnum, Size.MEDIUM);
701 addEEnumLiteral(sizeEEnum, Size.LARGE); 747 addEEnumLiteral(sizeEEnum, Size.LARGE);
702 748
703 initEEnum(actorTypeEEnum, ActorType.class, "ActorType"); 749 initEEnum(distanceEEnum, Distance.class, "Distance");
704 addEEnumLiteral(actorTypeEEnum, ActorType.PEDESTRIAN); 750 addEEnumLiteral(distanceEEnum, Distance.NEAR);
705 addEEnumLiteral(actorTypeEEnum, ActorType.VEHICLE); 751 addEEnumLiteral(distanceEEnum, Distance.MEDIUM);
752 addEEnumLiteral(distanceEEnum, Distance.FAR);
706 753
707 // Create resource 754 // Create resource
708 createResource(eNS_URI); 755 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 @@
1/**
2 */
3package simpleScenario.impl;
4
5import org.eclipse.emf.ecore.EClass;
6
7import simpleScenario.SimpleScenarioPackage;
8import simpleScenario.Vehicle;
9
10/**
11 * <!-- begin-user-doc -->
12 * An implementation of the model object '<em><b>Vehicle</b></em>'.
13 * <!-- end-user-doc -->
14 *
15 * @generated
16 */
17public class VehicleImpl extends ActorImpl implements Vehicle {
18 /**
19 * <!-- begin-user-doc -->
20 * <!-- end-user-doc -->
21 * @generated
22 */
23 protected VehicleImpl() {
24 super();
25 }
26
27 /**
28 * <!-- begin-user-doc -->
29 * <!-- end-user-doc -->
30 * @generated
31 */
32 @Override
33 protected EClass eStaticClass() {
34 return SimpleScenarioPackage.Literals.VEHICLE;
35 }
36
37} //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 {
108 return createCollisionDoesNotExistAdapter(); 108 return createCollisionDoesNotExistAdapter();
109 } 109 }
110 @Override 110 @Override
111 public Adapter casePedestrian(Pedestrian object) {
112 return createPedestrianAdapter();
113 }
114 @Override
115 public Adapter caseVehicle(Vehicle object) {
116 return createVehicleAdapter();
117 }
118 @Override
111 public Adapter defaultCase(EObject object) { 119 public Adapter defaultCase(EObject object) {
112 return createEObjectAdapter(); 120 return createEObjectAdapter();
113 } 121 }
@@ -268,6 +276,34 @@ public class SimpleScenarioAdapterFactory extends AdapterFactoryImpl {
268 } 276 }
269 277
270 /** 278 /**
279 * Creates a new adapter for an object of class '{@link simpleScenario.Pedestrian <em>Pedestrian</em>}'.
280 * <!-- begin-user-doc -->
281 * This default implementation returns null so that we can easily ignore cases;
282 * it's useful to ignore a case when inheritance will catch all the cases anyway.
283 * <!-- end-user-doc -->
284 * @return the new adapter.
285 * @see simpleScenario.Pedestrian
286 * @generated
287 */
288 public Adapter createPedestrianAdapter() {
289 return null;
290 }
291
292 /**
293 * Creates a new adapter for an object of class '{@link simpleScenario.Vehicle <em>Vehicle</em>}'.
294 * <!-- begin-user-doc -->
295 * This default implementation returns null so that we can easily ignore cases;
296 * it's useful to ignore a case when inheritance will catch all the cases anyway.
297 * <!-- end-user-doc -->
298 * @return the new adapter.
299 * @see simpleScenario.Vehicle
300 * @generated
301 */
302 public Adapter createVehicleAdapter() {
303 return null;
304 }
305
306 /**
271 * Creates a new adapter for the default case. 307 * Creates a new adapter for the default case.
272 * <!-- begin-user-doc --> 308 * <!-- begin-user-doc -->
273 * This default implementation returns null. 309 * This default implementation returns null.
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<T> extends Switch<T> {
136 if (result == null) result = defaultCase(theEObject); 136 if (result == null) result = defaultCase(theEObject);
137 return result; 137 return result;
138 } 138 }
139 case SimpleScenarioPackage.PEDESTRIAN: {
140 Pedestrian pedestrian = (Pedestrian)theEObject;
141 T result = casePedestrian(pedestrian);
142 if (result == null) result = caseActor(pedestrian);
143 if (result == null) result = defaultCase(theEObject);
144 return result;
145 }
146 case SimpleScenarioPackage.VEHICLE: {
147 Vehicle vehicle = (Vehicle)theEObject;
148 T result = caseVehicle(vehicle);
149 if (result == null) result = caseActor(vehicle);
150 if (result == null) result = defaultCase(theEObject);
151 return result;
152 }
139 default: return defaultCase(theEObject); 153 default: return defaultCase(theEObject);
140 } 154 }
141 } 155 }
@@ -291,6 +305,36 @@ public class SimpleScenarioSwitch<T> extends Switch<T> {
291 } 305 }
292 306
293 /** 307 /**
308 * Returns the result of interpreting the object as an instance of '<em>Pedestrian</em>'.
309 * <!-- begin-user-doc -->
310 * This implementation returns null;
311 * returning a non-null result will terminate the switch.
312 * <!-- end-user-doc -->
313 * @param object the target of the switch.
314 * @return the result of interpreting the object as an instance of '<em>Pedestrian</em>'.
315 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
316 * @generated
317 */
318 public T casePedestrian(Pedestrian object) {
319 return null;
320 }
321
322 /**
323 * Returns the result of interpreting the object as an instance of '<em>Vehicle</em>'.
324 * <!-- begin-user-doc -->
325 * This implementation returns null;
326 * returning a non-null result will terminate the switch.
327 * <!-- end-user-doc -->
328 * @param object the target of the switch.
329 * @return the result of interpreting the object as an instance of '<em>Vehicle</em>'.
330 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
331 * @generated
332 */
333 public T caseVehicle(Vehicle object) {
334 return null;
335 }
336
337 /**
294 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. 338 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
295 * <!-- begin-user-doc --> 339 * <!-- begin-user-doc -->
296 * This implementation returns null; 340 * This implementation returns null;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-08-30 00:09:49 +0000