aboutsummaryrefslogtreecommitdiffstats
path: root/Domains/crossingScenario/ecore-gen
diff options
context:
space:
mode:
authorLibravatar Aren Babikian <aren.babikian@mail.mcgill.ca>2021-01-17 01:16:26 -0500
committerLibravatar Aren Babikian <aren.babikian@mail.mcgill.ca>2021-01-17 01:16:26 -0500
commit86518413bed5988092b30d1139bb72ef302ae09c (patch)
treebbba38bde609234dd4824e64c25422806f0864de /Domains/crossingScenario/ecore-gen
parentBegin vql implementation + fix enums bug (diff)
downloadVIATRA-Generator-86518413bed5988092b30d1139bb72ef302ae09c.tar.gz
VIATRA-Generator-86518413bed5988092b30d1139bb72ef302ae09c.tar.zst
VIATRA-Generator-86518413bed5988092b30d1139bb72ef302ae09c.zip
complete queries for lane structure
Diffstat (limited to 'Domains/crossingScenario/ecore-gen')
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java46
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioFactory.java27
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java274
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java28
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/Lane_Horizontal.java17
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/Lane_Vertical.java17
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java32
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java126
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java77
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java61
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/impl/Lane_HorizontalImpl.java37
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/impl/Lane_VerticalImpl.java37
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java36
-rw-r--r--Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java44
14 files changed, 676 insertions, 183 deletions
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java
index afbe34e7..b4f01423 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java
@@ -20,6 +20,8 @@ import org.eclipse.emf.ecore.EObject;
20 * <li>{@link crossingScenario.CrossingScenario#getActors <em>Actors</em>}</li> 20 * <li>{@link crossingScenario.CrossingScenario#getActors <em>Actors</em>}</li>
21 * <li>{@link crossingScenario.CrossingScenario#getLanes <em>Lanes</em>}</li> 21 * <li>{@link crossingScenario.CrossingScenario#getLanes <em>Lanes</em>}</li>
22 * <li>{@link crossingScenario.CrossingScenario#getMaxTime <em>Max Time</em>}</li> 22 * <li>{@link crossingScenario.CrossingScenario#getMaxTime <em>Max Time</em>}</li>
23 * <li>{@link crossingScenario.CrossingScenario#getHorizontal_head <em>Horizontal head</em>}</li>
24 * <li>{@link crossingScenario.CrossingScenario#getVertical_head <em>Vertical head</em>}</li>
23 * </ul> 25 * </ul>
24 * 26 *
25 * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario() 27 * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario()
@@ -117,4 +119,48 @@ public interface CrossingScenario extends EObject {
117 */ 119 */
118 void setMaxTime(double value); 120 void setMaxTime(double value);
119 121
122 /**
123 * Returns the value of the '<em><b>Horizontal head</b></em>' reference.
124 * <!-- begin-user-doc -->
125 * <!-- end-user-doc -->
126 * @return the value of the '<em>Horizontal head</em>' reference.
127 * @see #setHorizontal_head(Lane_Horizontal)
128 * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_Horizontal_head()
129 * @model required="true"
130 * @generated
131 */
132 Lane_Horizontal getHorizontal_head();
133
134 /**
135 * Sets the value of the '{@link crossingScenario.CrossingScenario#getHorizontal_head <em>Horizontal head</em>}' reference.
136 * <!-- begin-user-doc -->
137 * <!-- end-user-doc -->
138 * @param value the new value of the '<em>Horizontal head</em>' reference.
139 * @see #getHorizontal_head()
140 * @generated
141 */
142 void setHorizontal_head(Lane_Horizontal value);
143
144 /**
145 * Returns the value of the '<em><b>Vertical head</b></em>' reference.
146 * <!-- begin-user-doc -->
147 * <!-- end-user-doc -->
148 * @return the value of the '<em>Vertical head</em>' reference.
149 * @see #setVertical_head(Lane_Vertical)
150 * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_Vertical_head()
151 * @model required="true"
152 * @generated
153 */
154 Lane_Vertical getVertical_head();
155
156 /**
157 * Sets the value of the '{@link crossingScenario.CrossingScenario#getVertical_head <em>Vertical head</em>}' reference.
158 * <!-- begin-user-doc -->
159 * <!-- end-user-doc -->
160 * @param value the new value of the '<em>Vertical head</em>' reference.
161 * @see #getVertical_head()
162 * @generated
163 */
164 void setVertical_head(Lane_Vertical value);
165
120} // CrossingScenario 166} // CrossingScenario
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioFactory.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioFactory.java
index b281559c..8ac3df81 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioFactory.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioFactory.java
@@ -31,15 +31,6 @@ public interface CrossingScenarioFactory extends EFactory {
31 CrossingScenario createCrossingScenario(); 31 CrossingScenario createCrossingScenario();
32 32
33 /** 33 /**
34 * Returns a new object of class '<em>Lane</em>'.
35 * <!-- begin-user-doc -->
36 * <!-- end-user-doc -->
37 * @return a new object of class '<em>Lane</em>'.
38 * @generated
39 */
40 Lane createLane();
41
42 /**
43 * Returns a new object of class '<em>Vision Blocked</em>'. 34 * Returns a new object of class '<em>Vision Blocked</em>'.
44 * <!-- begin-user-doc --> 35 * <!-- begin-user-doc -->
45 * <!-- end-user-doc --> 36 * <!-- end-user-doc -->
@@ -94,6 +85,24 @@ public interface CrossingScenarioFactory extends EFactory {
94 Vehicle createVehicle(); 85 Vehicle createVehicle();
95 86
96 /** 87 /**
88 * Returns a new object of class '<em>Lane Horizontal</em>'.
89 * <!-- begin-user-doc -->
90 * <!-- end-user-doc -->
91 * @return a new object of class '<em>Lane Horizontal</em>'.
92 * @generated
93 */
94 Lane_Horizontal createLane_Horizontal();
95
96 /**
97 * Returns a new object of class '<em>Lane Vertical</em>'.
98 * <!-- begin-user-doc -->
99 * <!-- end-user-doc -->
100 * @return a new object of class '<em>Lane Vertical</em>'.
101 * @generated
102 */
103 Lane_Vertical createLane_Vertical();
104
105 /**
97 * Returns the package supported by this factory. 106 * Returns the package supported by this factory.
98 * <!-- begin-user-doc --> 107 * <!-- begin-user-doc -->
99 * <!-- end-user-doc --> 108 * <!-- end-user-doc -->
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
index c690a23c..813466ef 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
@@ -113,41 +113,50 @@ public interface CrossingScenarioPackage extends EPackage {
113 int CROSSING_SCENARIO__MAX_TIME = 4; 113 int CROSSING_SCENARIO__MAX_TIME = 4;
114 114
115 /** 115 /**
116 * The number of structural features of the '<em>Crossing Scenario</em>' class. 116 * The feature id for the '<em><b>Horizontal head</b></em>' reference.
117 * <!-- begin-user-doc --> 117 * <!-- begin-user-doc -->
118 * <!-- end-user-doc --> 118 * <!-- end-user-doc -->
119 * @generated 119 * @generated
120 * @ordered 120 * @ordered
121 */ 121 */
122 int CROSSING_SCENARIO_FEATURE_COUNT = 5; 122 int CROSSING_SCENARIO__HORIZONTAL_HEAD = 5;
123 123
124 /** 124 /**
125 * The number of operations of the '<em>Crossing Scenario</em>' class. 125 * The feature id for the '<em><b>Vertical head</b></em>' reference.
126 * <!-- begin-user-doc --> 126 * <!-- begin-user-doc -->
127 * <!-- end-user-doc --> 127 * <!-- end-user-doc -->
128 * @generated 128 * @generated
129 * @ordered 129 * @ordered
130 */ 130 */
131 int CROSSING_SCENARIO_OPERATION_COUNT = 0; 131 int CROSSING_SCENARIO__VERTICAL_HEAD = 6;
132 132
133 /** 133 /**
134 * The meta object id for the '{@link crossingScenario.impl.LaneImpl <em>Lane</em>}' class. 134 * The number of structural features of the '<em>Crossing Scenario</em>' class.
135 * <!-- begin-user-doc --> 135 * <!-- begin-user-doc -->
136 * <!-- end-user-doc --> 136 * <!-- end-user-doc -->
137 * @see crossingScenario.impl.LaneImpl
138 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane()
139 * @generated 137 * @generated
138 * @ordered
140 */ 139 */
141 int LANE = 1; 140 int CROSSING_SCENARIO_FEATURE_COUNT = 7;
142 141
143 /** 142 /**
144 * The feature id for the '<em><b>Orientation</b></em>' attribute. 143 * The number of operations of the '<em>Crossing Scenario</em>' class.
145 * <!-- begin-user-doc --> 144 * <!-- begin-user-doc -->
146 * <!-- end-user-doc --> 145 * <!-- end-user-doc -->
147 * @generated 146 * @generated
148 * @ordered 147 * @ordered
149 */ 148 */
150 int LANE__ORIENTATION = 0; 149 int CROSSING_SCENARIO_OPERATION_COUNT = 0;
150
151 /**
152 * The meta object id for the '{@link crossingScenario.impl.LaneImpl <em>Lane</em>}' class.
153 * <!-- begin-user-doc -->
154 * <!-- end-user-doc -->
155 * @see crossingScenario.impl.LaneImpl
156 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane()
157 * @generated
158 */
159 int LANE = 1;
151 160
152 /** 161 /**
153 * The feature id for the '<em><b>Width</b></em>' attribute. 162 * The feature id for the '<em><b>Width</b></em>' attribute.
@@ -156,7 +165,7 @@ public interface CrossingScenarioPackage extends EPackage {
156 * @generated 165 * @generated
157 * @ordered 166 * @ordered
158 */ 167 */
159 int LANE__WIDTH = 1; 168 int LANE__WIDTH = 0;
160 169
161 /** 170 /**
162 * The feature id for the '<em><b>Reference Coord</b></em>' attribute. 171 * The feature id for the '<em><b>Reference Coord</b></em>' attribute.
@@ -165,7 +174,7 @@ public interface CrossingScenarioPackage extends EPackage {
165 * @generated 174 * @generated
166 * @ordered 175 * @ordered
167 */ 176 */
168 int LANE__REFERENCE_COORD = 2; 177 int LANE__REFERENCE_COORD = 1;
169 178
170 /** 179 /**
171 * The feature id for the '<em><b>Prev Lane</b></em>' reference. 180 * The feature id for the '<em><b>Prev Lane</b></em>' reference.
@@ -174,7 +183,7 @@ public interface CrossingScenarioPackage extends EPackage {
174 * @generated 183 * @generated
175 * @ordered 184 * @ordered
176 */ 185 */
177 int LANE__PREV_LANE = 3; 186 int LANE__PREV_LANE = 2;
178 187
179 /** 188 /**
180 * The feature id for the '<em><b>Actors</b></em>' reference list. 189 * The feature id for the '<em><b>Actors</b></em>' reference list.
@@ -183,7 +192,7 @@ public interface CrossingScenarioPackage extends EPackage {
183 * @generated 192 * @generated
184 * @ordered 193 * @ordered
185 */ 194 */
186 int LANE__ACTORS = 4; 195 int LANE__ACTORS = 3;
187 196
188 /** 197 /**
189 * The feature id for the '<em><b>Num Width</b></em>' attribute. 198 * The feature id for the '<em><b>Num Width</b></em>' attribute.
@@ -192,7 +201,7 @@ public interface CrossingScenarioPackage extends EPackage {
192 * @generated 201 * @generated
193 * @ordered 202 * @ordered
194 */ 203 */
195 int LANE__NUM_WIDTH = 5; 204 int LANE__NUM_WIDTH = 4;
196 205
197 /** 206 /**
198 * The number of structural features of the '<em>Lane</em>' class. 207 * The number of structural features of the '<em>Lane</em>' class.
@@ -201,7 +210,7 @@ public interface CrossingScenarioPackage extends EPackage {
201 * @generated 210 * @generated
202 * @ordered 211 * @ordered
203 */ 212 */
204 int LANE_FEATURE_COUNT = 6; 213 int LANE_FEATURE_COUNT = 5;
205 214
206 /** 215 /**
207 * The number of operations of the '<em>Lane</em>' class. 216 * The number of operations of the '<em>Lane</em>' class.
@@ -799,14 +808,150 @@ public interface CrossingScenarioPackage extends EPackage {
799 int VEHICLE_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0; 808 int VEHICLE_OPERATION_COUNT = ACTOR_OPERATION_COUNT + 0;
800 809
801 /** 810 /**
802 * The meta object id for the '{@link crossingScenario.Orientation <em>Orientation</em>}' enum. 811 * The meta object id for the '{@link crossingScenario.impl.Lane_HorizontalImpl <em>Lane Horizontal</em>}' class.
812 * <!-- begin-user-doc -->
813 * <!-- end-user-doc -->
814 * @see crossingScenario.impl.Lane_HorizontalImpl
815 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane_Horizontal()
816 * @generated
817 */
818 int LANE_HORIZONTAL = 12;
819
820 /**
821 * The feature id for the '<em><b>Width</b></em>' attribute.
822 * <!-- begin-user-doc -->
823 * <!-- end-user-doc -->
824 * @generated
825 * @ordered
826 */
827 int LANE_HORIZONTAL__WIDTH = LANE__WIDTH;
828
829 /**
830 * The feature id for the '<em><b>Reference Coord</b></em>' attribute.
831 * <!-- begin-user-doc -->
832 * <!-- end-user-doc -->
833 * @generated
834 * @ordered
835 */
836 int LANE_HORIZONTAL__REFERENCE_COORD = LANE__REFERENCE_COORD;
837
838 /**
839 * The feature id for the '<em><b>Prev Lane</b></em>' reference.
840 * <!-- begin-user-doc -->
841 * <!-- end-user-doc -->
842 * @generated
843 * @ordered
844 */
845 int LANE_HORIZONTAL__PREV_LANE = LANE__PREV_LANE;
846
847 /**
848 * The feature id for the '<em><b>Actors</b></em>' reference list.
849 * <!-- begin-user-doc -->
850 * <!-- end-user-doc -->
851 * @generated
852 * @ordered
853 */
854 int LANE_HORIZONTAL__ACTORS = LANE__ACTORS;
855
856 /**
857 * The feature id for the '<em><b>Num Width</b></em>' attribute.
858 * <!-- begin-user-doc -->
859 * <!-- end-user-doc -->
860 * @generated
861 * @ordered
862 */
863 int LANE_HORIZONTAL__NUM_WIDTH = LANE__NUM_WIDTH;
864
865 /**
866 * The number of structural features of the '<em>Lane Horizontal</em>' class.
867 * <!-- begin-user-doc -->
868 * <!-- end-user-doc -->
869 * @generated
870 * @ordered
871 */
872 int LANE_HORIZONTAL_FEATURE_COUNT = LANE_FEATURE_COUNT + 0;
873
874 /**
875 * The number of operations of the '<em>Lane Horizontal</em>' class.
876 * <!-- begin-user-doc -->
877 * <!-- end-user-doc -->
878 * @generated
879 * @ordered
880 */
881 int LANE_HORIZONTAL_OPERATION_COUNT = LANE_OPERATION_COUNT + 0;
882
883 /**
884 * The meta object id for the '{@link crossingScenario.impl.Lane_VerticalImpl <em>Lane Vertical</em>}' class.
885 * <!-- begin-user-doc -->
886 * <!-- end-user-doc -->
887 * @see crossingScenario.impl.Lane_VerticalImpl
888 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane_Vertical()
889 * @generated
890 */
891 int LANE_VERTICAL = 13;
892
893 /**
894 * The feature id for the '<em><b>Width</b></em>' attribute.
895 * <!-- begin-user-doc -->
896 * <!-- end-user-doc -->
897 * @generated
898 * @ordered
899 */
900 int LANE_VERTICAL__WIDTH = LANE__WIDTH;
901
902 /**
903 * The feature id for the '<em><b>Reference Coord</b></em>' attribute.
803 * <!-- begin-user-doc --> 904 * <!-- begin-user-doc -->
804 * <!-- end-user-doc --> 905 * <!-- end-user-doc -->
805 * @see crossingScenario.Orientation
806 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getOrientation()
807 * @generated 906 * @generated
907 * @ordered
808 */ 908 */
809 int ORIENTATION = 12; 909 int LANE_VERTICAL__REFERENCE_COORD = LANE__REFERENCE_COORD;
910
911 /**
912 * The feature id for the '<em><b>Prev Lane</b></em>' reference.
913 * <!-- begin-user-doc -->
914 * <!-- end-user-doc -->
915 * @generated
916 * @ordered
917 */
918 int LANE_VERTICAL__PREV_LANE = LANE__PREV_LANE;
919
920 /**
921 * The feature id for the '<em><b>Actors</b></em>' reference list.
922 * <!-- begin-user-doc -->
923 * <!-- end-user-doc -->
924 * @generated
925 * @ordered
926 */
927 int LANE_VERTICAL__ACTORS = LANE__ACTORS;
928
929 /**
930 * The feature id for the '<em><b>Num Width</b></em>' attribute.
931 * <!-- begin-user-doc -->
932 * <!-- end-user-doc -->
933 * @generated
934 * @ordered
935 */
936 int LANE_VERTICAL__NUM_WIDTH = LANE__NUM_WIDTH;
937
938 /**
939 * The number of structural features of the '<em>Lane Vertical</em>' class.
940 * <!-- begin-user-doc -->
941 * <!-- end-user-doc -->
942 * @generated
943 * @ordered
944 */
945 int LANE_VERTICAL_FEATURE_COUNT = LANE_FEATURE_COUNT + 0;
946
947 /**
948 * The number of operations of the '<em>Lane Vertical</em>' class.
949 * <!-- begin-user-doc -->
950 * <!-- end-user-doc -->
951 * @generated
952 * @ordered
953 */
954 int LANE_VERTICAL_OPERATION_COUNT = LANE_OPERATION_COUNT + 0;
810 955
811 /** 956 /**
812 * The meta object id for the '{@link crossingScenario.Size <em>Size</em>}' enum. 957 * The meta object id for the '{@link crossingScenario.Size <em>Size</em>}' enum.
@@ -816,7 +961,7 @@ public interface CrossingScenarioPackage extends EPackage {
816 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSize() 961 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSize()
817 * @generated 962 * @generated
818 */ 963 */
819 int SIZE = 13; 964 int SIZE = 14;
820 965
821 /** 966 /**
822 * The meta object id for the '{@link crossingScenario.Distance <em>Distance</em>}' enum. 967 * The meta object id for the '{@link crossingScenario.Distance <em>Distance</em>}' enum.
@@ -826,7 +971,7 @@ public interface CrossingScenarioPackage extends EPackage {
826 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getDistance() 971 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getDistance()
827 * @generated 972 * @generated
828 */ 973 */
829 int DISTANCE = 14; 974 int DISTANCE = 15;
830 975
831 976
832 /** 977 /**
@@ -895,25 +1040,36 @@ public interface CrossingScenarioPackage extends EPackage {
895 EAttribute getCrossingScenario_MaxTime(); 1040 EAttribute getCrossingScenario_MaxTime();
896 1041
897 /** 1042 /**
898 * Returns the meta object for class '{@link crossingScenario.Lane <em>Lane</em>}'. 1043 * Returns the meta object for the reference '{@link crossingScenario.CrossingScenario#getHorizontal_head <em>Horizontal head</em>}'.
899 * <!-- begin-user-doc --> 1044 * <!-- begin-user-doc -->
900 * <!-- end-user-doc --> 1045 * <!-- end-user-doc -->
901 * @return the meta object for class '<em>Lane</em>'. 1046 * @return the meta object for the reference '<em>Horizontal head</em>'.
902 * @see crossingScenario.Lane 1047 * @see crossingScenario.CrossingScenario#getHorizontal_head()
1048 * @see #getCrossingScenario()
903 * @generated 1049 * @generated
904 */ 1050 */
905 EClass getLane(); 1051 EReference getCrossingScenario_Horizontal_head();
906 1052
907 /** 1053 /**
908 * Returns the meta object for the attribute '{@link crossingScenario.Lane#getOrientation <em>Orientation</em>}'. 1054 * Returns the meta object for the reference '{@link crossingScenario.CrossingScenario#getVertical_head <em>Vertical head</em>}'.
909 * <!-- begin-user-doc --> 1055 * <!-- begin-user-doc -->
910 * <!-- end-user-doc --> 1056 * <!-- end-user-doc -->
911 * @return the meta object for the attribute '<em>Orientation</em>'. 1057 * @return the meta object for the reference '<em>Vertical head</em>'.
912 * @see crossingScenario.Lane#getOrientation() 1058 * @see crossingScenario.CrossingScenario#getVertical_head()
913 * @see #getLane() 1059 * @see #getCrossingScenario()
1060 * @generated
1061 */
1062 EReference getCrossingScenario_Vertical_head();
1063
1064 /**
1065 * Returns the meta object for class '{@link crossingScenario.Lane <em>Lane</em>}'.
1066 * <!-- begin-user-doc -->
1067 * <!-- end-user-doc -->
1068 * @return the meta object for class '<em>Lane</em>'.
1069 * @see crossingScenario.Lane
914 * @generated 1070 * @generated
915 */ 1071 */
916 EAttribute getLane_Orientation(); 1072 EClass getLane();
917 1073
918 /** 1074 /**
919 * Returns the meta object for the attribute '{@link crossingScenario.Lane#getWidth <em>Width</em>}'. 1075 * Returns the meta object for the attribute '{@link crossingScenario.Lane#getWidth <em>Width</em>}'.
@@ -1203,14 +1359,24 @@ public interface CrossingScenarioPackage extends EPackage {
1203 EClass getVehicle(); 1359 EClass getVehicle();
1204 1360
1205 /** 1361 /**
1206 * Returns the meta object for enum '{@link crossingScenario.Orientation <em>Orientation</em>}'. 1362 * Returns the meta object for class '{@link crossingScenario.Lane_Horizontal <em>Lane Horizontal</em>}'.
1363 * <!-- begin-user-doc -->
1364 * <!-- end-user-doc -->
1365 * @return the meta object for class '<em>Lane Horizontal</em>'.
1366 * @see crossingScenario.Lane_Horizontal
1367 * @generated
1368 */
1369 EClass getLane_Horizontal();
1370
1371 /**
1372 * Returns the meta object for class '{@link crossingScenario.Lane_Vertical <em>Lane Vertical</em>}'.
1207 * <!-- begin-user-doc --> 1373 * <!-- begin-user-doc -->
1208 * <!-- end-user-doc --> 1374 * <!-- end-user-doc -->
1209 * @return the meta object for enum '<em>Orientation</em>'. 1375 * @return the meta object for class '<em>Lane Vertical</em>'.
1210 * @see crossingScenario.Orientation 1376 * @see crossingScenario.Lane_Vertical
1211 * @generated 1377 * @generated
1212 */ 1378 */
1213 EEnum getOrientation(); 1379 EClass getLane_Vertical();
1214 1380
1215 /** 1381 /**
1216 * Returns the meta object for enum '{@link crossingScenario.Size <em>Size</em>}'. 1382 * Returns the meta object for enum '{@link crossingScenario.Size <em>Size</em>}'.
@@ -1306,22 +1472,30 @@ public interface CrossingScenarioPackage extends EPackage {
1306 EAttribute CROSSING_SCENARIO__MAX_TIME = eINSTANCE.getCrossingScenario_MaxTime(); 1472 EAttribute CROSSING_SCENARIO__MAX_TIME = eINSTANCE.getCrossingScenario_MaxTime();
1307 1473
1308 /** 1474 /**
1309 * The meta object literal for the '{@link crossingScenario.impl.LaneImpl <em>Lane</em>}' class. 1475 * The meta object literal for the '<em><b>Horizontal head</b></em>' reference feature.
1310 * <!-- begin-user-doc --> 1476 * <!-- begin-user-doc -->
1311 * <!-- end-user-doc --> 1477 * <!-- end-user-doc -->
1312 * @see crossingScenario.impl.LaneImpl
1313 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane()
1314 * @generated 1478 * @generated
1315 */ 1479 */
1316 EClass LANE = eINSTANCE.getLane(); 1480 EReference CROSSING_SCENARIO__HORIZONTAL_HEAD = eINSTANCE.getCrossingScenario_Horizontal_head();
1481
1482 /**
1483 * The meta object literal for the '<em><b>Vertical head</b></em>' reference feature.
1484 * <!-- begin-user-doc -->
1485 * <!-- end-user-doc -->
1486 * @generated
1487 */
1488 EReference CROSSING_SCENARIO__VERTICAL_HEAD = eINSTANCE.getCrossingScenario_Vertical_head();
1317 1489
1318 /** 1490 /**
1319 * The meta object literal for the '<em><b>Orientation</b></em>' attribute feature. 1491 * The meta object literal for the '{@link crossingScenario.impl.LaneImpl <em>Lane</em>}' class.
1320 * <!-- begin-user-doc --> 1492 * <!-- begin-user-doc -->
1321 * <!-- end-user-doc --> 1493 * <!-- end-user-doc -->
1494 * @see crossingScenario.impl.LaneImpl
1495 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane()
1322 * @generated 1496 * @generated
1323 */ 1497 */
1324 EAttribute LANE__ORIENTATION = eINSTANCE.getLane_Orientation(); 1498 EClass LANE = eINSTANCE.getLane();
1325 1499
1326 /** 1500 /**
1327 * The meta object literal for the '<em><b>Width</b></em>' attribute feature. 1501 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
@@ -1560,14 +1734,24 @@ public interface CrossingScenarioPackage extends EPackage {
1560 EClass VEHICLE = eINSTANCE.getVehicle(); 1734 EClass VEHICLE = eINSTANCE.getVehicle();
1561 1735
1562 /** 1736 /**
1563 * The meta object literal for the '{@link crossingScenario.Orientation <em>Orientation</em>}' enum. 1737 * The meta object literal for the '{@link crossingScenario.impl.Lane_HorizontalImpl <em>Lane Horizontal</em>}' class.
1738 * <!-- begin-user-doc -->
1739 * <!-- end-user-doc -->
1740 * @see crossingScenario.impl.Lane_HorizontalImpl
1741 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane_Horizontal()
1742 * @generated
1743 */
1744 EClass LANE_HORIZONTAL = eINSTANCE.getLane_Horizontal();
1745
1746 /**
1747 * The meta object literal for the '{@link crossingScenario.impl.Lane_VerticalImpl <em>Lane Vertical</em>}' class.
1564 * <!-- begin-user-doc --> 1748 * <!-- begin-user-doc -->
1565 * <!-- end-user-doc --> 1749 * <!-- end-user-doc -->
1566 * @see crossingScenario.Orientation 1750 * @see crossingScenario.impl.Lane_VerticalImpl
1567 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getOrientation() 1751 * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane_Vertical()
1568 * @generated 1752 * @generated
1569 */ 1753 */
1570 EEnum ORIENTATION = eINSTANCE.getOrientation(); 1754 EClass LANE_VERTICAL = eINSTANCE.getLane_Vertical();
1571 1755
1572 /** 1756 /**
1573 * The meta object literal for the '{@link crossingScenario.Size <em>Size</em>}' enum. 1757 * The meta object literal for the '{@link crossingScenario.Size <em>Size</em>}' enum.
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java
index fd04b3c9..d27cf644 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane.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 crossingScenario.Lane#getOrientation <em>Orientation</em>}</li>
19 * <li>{@link crossingScenario.Lane#getWidth <em>Width</em>}</li> 18 * <li>{@link crossingScenario.Lane#getWidth <em>Width</em>}</li>
20 * <li>{@link crossingScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li> 19 * <li>{@link crossingScenario.Lane#getReferenceCoord <em>Reference Coord</em>}</li>
21 * <li>{@link crossingScenario.Lane#getPrevLane <em>Prev Lane</em>}</li> 20 * <li>{@link crossingScenario.Lane#getPrevLane <em>Prev Lane</em>}</li>
@@ -24,36 +23,11 @@ import org.eclipse.emf.ecore.EObject;
24 * </ul> 23 * </ul>
25 * 24 *
26 * @see crossingScenario.CrossingScenarioPackage#getLane() 25 * @see crossingScenario.CrossingScenarioPackage#getLane()
27 * @model 26 * @model abstract="true"
28 * @generated 27 * @generated
29 */ 28 */
30public interface Lane extends EObject { 29public interface Lane extends EObject {
31 /** 30 /**
32 * Returns the value of the '<em><b>Orientation</b></em>' attribute.
33 * The literals are from the enumeration {@link crossingScenario.Orientation}.
34 * <!-- begin-user-doc -->
35 * <!-- end-user-doc -->
36 * @return the value of the '<em>Orientation</em>' attribute.
37 * @see crossingScenario.Orientation
38 * @see #setOrientation(Orientation)
39 * @see crossingScenario.CrossingScenarioPackage#getLane_Orientation()
40 * @model required="true"
41 * @generated
42 */
43 Orientation getOrientation();
44
45 /**
46 * Sets the value of the '{@link crossingScenario.Lane#getOrientation <em>Orientation</em>}' attribute.
47 * <!-- begin-user-doc -->
48 * <!-- end-user-doc -->
49 * @param value the new value of the '<em>Orientation</em>' attribute.
50 * @see crossingScenario.Orientation
51 * @see #getOrientation()
52 * @generated
53 */
54 void setOrientation(Orientation value);
55
56 /**
57 * Returns the value of the '<em><b>Width</b></em>' attribute. 31 * Returns the value of the '<em><b>Width</b></em>' attribute.
58 * The literals are from the enumeration {@link crossingScenario.Size}. 32 * The literals are from the enumeration {@link crossingScenario.Size}.
59 * <!-- begin-user-doc --> 33 * <!-- begin-user-doc -->
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Lane_Horizontal.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane_Horizontal.java
new file mode 100644
index 00000000..aec6413e
--- /dev/null
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane_Horizontal.java
@@ -0,0 +1,17 @@
1/**
2 */
3package crossingScenario;
4
5
6/**
7 * <!-- begin-user-doc -->
8 * A representation of the model object '<em><b>Lane Horizontal</b></em>'.
9 * <!-- end-user-doc -->
10 *
11 *
12 * @see crossingScenario.CrossingScenarioPackage#getLane_Horizontal()
13 * @model
14 * @generated
15 */
16public interface Lane_Horizontal extends Lane {
17} // Lane_Horizontal
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/Lane_Vertical.java b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane_Vertical.java
new file mode 100644
index 00000000..cf818bc2
--- /dev/null
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/Lane_Vertical.java
@@ -0,0 +1,17 @@
1/**
2 */
3package crossingScenario;
4
5
6/**
7 * <!-- begin-user-doc -->
8 * A representation of the model object '<em><b>Lane Vertical</b></em>'.
9 * <!-- end-user-doc -->
10 *
11 *
12 * @see crossingScenario.CrossingScenarioPackage#getLane_Vertical()
13 * @model
14 * @generated
15 */
16public interface Lane_Vertical extends Lane {
17} // Lane_Vertical
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java
index 6e5bab16..ee407bc5 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioFactoryImpl.java
@@ -58,13 +58,14 @@ public class CrossingScenarioFactoryImpl extends EFactoryImpl implements Crossin
58 public EObject create(EClass eClass) { 58 public EObject create(EClass eClass) {
59 switch (eClass.getClassifierID()) { 59 switch (eClass.getClassifierID()) {
60 case CrossingScenarioPackage.CROSSING_SCENARIO: return createCrossingScenario(); 60 case CrossingScenarioPackage.CROSSING_SCENARIO: return createCrossingScenario();
61 case CrossingScenarioPackage.LANE: return createLane();
62 case CrossingScenarioPackage.VISION_BLOCKED: return createVisionBlocked(); 61 case CrossingScenarioPackage.VISION_BLOCKED: return createVisionBlocked();
63 case CrossingScenarioPackage.SEPARATION_DISTANCE: return createSeparationDistance(); 62 case CrossingScenarioPackage.SEPARATION_DISTANCE: return createSeparationDistance();
64 case CrossingScenarioPackage.COLLISION_EXISTS: return createCollisionExists(); 63 case CrossingScenarioPackage.COLLISION_EXISTS: return createCollisionExists();
65 case CrossingScenarioPackage.COLLISION_DOES_NOT_EXIST: return createCollisionDoesNotExist(); 64 case CrossingScenarioPackage.COLLISION_DOES_NOT_EXIST: return createCollisionDoesNotExist();
66 case CrossingScenarioPackage.PEDESTRIAN: return createPedestrian(); 65 case CrossingScenarioPackage.PEDESTRIAN: return createPedestrian();
67 case CrossingScenarioPackage.VEHICLE: return createVehicle(); 66 case CrossingScenarioPackage.VEHICLE: return createVehicle();
67 case CrossingScenarioPackage.LANE_HORIZONTAL: return createLane_Horizontal();
68 case CrossingScenarioPackage.LANE_VERTICAL: return createLane_Vertical();
68 default: 69 default:
69 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); 70 throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
70 } 71 }
@@ -78,8 +79,6 @@ public class CrossingScenarioFactoryImpl extends EFactoryImpl implements Crossin
78 @Override 79 @Override
79 public Object createFromString(EDataType eDataType, String initialValue) { 80 public Object createFromString(EDataType eDataType, String initialValue) {
80 switch (eDataType.getClassifierID()) { 81 switch (eDataType.getClassifierID()) {
81 case CrossingScenarioPackage.ORIENTATION:
82 return createOrientationFromString(eDataType, initialValue);
83 case CrossingScenarioPackage.SIZE: 82 case CrossingScenarioPackage.SIZE:
84 return createSizeFromString(eDataType, initialValue); 83 return createSizeFromString(eDataType, initialValue);
85 case CrossingScenarioPackage.DISTANCE: 84 case CrossingScenarioPackage.DISTANCE:
@@ -97,8 +96,6 @@ public class CrossingScenarioFactoryImpl extends EFactoryImpl implements Crossin
97 @Override 96 @Override
98 public String convertToString(EDataType eDataType, Object instanceValue) { 97 public String convertToString(EDataType eDataType, Object instanceValue) {
99 switch (eDataType.getClassifierID()) { 98 switch (eDataType.getClassifierID()) {
100 case CrossingScenarioPackage.ORIENTATION:
101 return convertOrientationToString(eDataType, instanceValue);
102 case CrossingScenarioPackage.SIZE: 99 case CrossingScenarioPackage.SIZE:
103 return convertSizeToString(eDataType, instanceValue); 100 return convertSizeToString(eDataType, instanceValue);
104 case CrossingScenarioPackage.DISTANCE: 101 case CrossingScenarioPackage.DISTANCE:
@@ -125,17 +122,6 @@ public class CrossingScenarioFactoryImpl extends EFactoryImpl implements Crossin
125 * @generated 122 * @generated
126 */ 123 */
127 @Override 124 @Override
128 public Lane createLane() {
129 LaneImpl lane = new LaneImpl();
130 return lane;
131 }
132
133 /**
134 * <!-- begin-user-doc -->
135 * <!-- end-user-doc -->
136 * @generated
137 */
138 @Override
139 public VisionBlocked createVisionBlocked() { 125 public VisionBlocked createVisionBlocked() {
140 VisionBlockedImpl visionBlocked = new VisionBlockedImpl(); 126 VisionBlockedImpl visionBlocked = new VisionBlockedImpl();
141 return visionBlocked; 127 return visionBlocked;
@@ -201,10 +187,10 @@ public class CrossingScenarioFactoryImpl extends EFactoryImpl implements Crossin
201 * <!-- end-user-doc --> 187 * <!-- end-user-doc -->
202 * @generated 188 * @generated
203 */ 189 */
204 public Orientation createOrientationFromString(EDataType eDataType, String initialValue) { 190 @Override
205 Orientation result = Orientation.get(initialValue); 191 public Lane_Horizontal createLane_Horizontal() {
206 if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); 192 Lane_HorizontalImpl lane_Horizontal = new Lane_HorizontalImpl();
207 return result; 193 return lane_Horizontal;
208 } 194 }
209 195
210 /** 196 /**
@@ -212,8 +198,10 @@ public class CrossingScenarioFactoryImpl extends EFactoryImpl implements Crossin
212 * <!-- end-user-doc --> 198 * <!-- end-user-doc -->
213 * @generated 199 * @generated
214 */ 200 */
215 public String convertOrientationToString(EDataType eDataType, Object instanceValue) { 201 @Override
216 return instanceValue == null ? null : instanceValue.toString(); 202 public Lane_Vertical createLane_Vertical() {
203 Lane_VerticalImpl lane_Vertical = new Lane_VerticalImpl();
204 return lane_Vertical;
217 } 205 }
218 206
219 /** 207 /**
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java
index ad8ee90d..5dd65a39 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java
@@ -7,6 +7,8 @@ import crossingScenario.CrossingScenario;
7import crossingScenario.CrossingScenarioPackage; 7import crossingScenario.CrossingScenarioPackage;
8import crossingScenario.Lane; 8import crossingScenario.Lane;
9 9
10import crossingScenario.Lane_Horizontal;
11import crossingScenario.Lane_Vertical;
10import java.util.Collection; 12import java.util.Collection;
11 13
12import org.eclipse.emf.common.notify.Notification; 14import org.eclipse.emf.common.notify.Notification;
@@ -36,6 +38,8 @@ import org.eclipse.emf.ecore.util.InternalEList;
36 * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getActors <em>Actors</em>}</li> 38 * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getActors <em>Actors</em>}</li>
37 * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getLanes <em>Lanes</em>}</li> 39 * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getLanes <em>Lanes</em>}</li>
38 * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getMaxTime <em>Max Time</em>}</li> 40 * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getMaxTime <em>Max Time</em>}</li>
41 * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getHorizontal_head <em>Horizontal head</em>}</li>
42 * <li>{@link crossingScenario.impl.CrossingScenarioImpl#getVertical_head <em>Vertical head</em>}</li>
39 * </ul> 43 * </ul>
40 * 44 *
41 * @generated 45 * @generated
@@ -122,6 +126,26 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
122 protected double maxTime = MAX_TIME_EDEFAULT; 126 protected double maxTime = MAX_TIME_EDEFAULT;
123 127
124 /** 128 /**
129 * The cached value of the '{@link #getHorizontal_head() <em>Horizontal head</em>}' reference.
130 * <!-- begin-user-doc -->
131 * <!-- end-user-doc -->
132 * @see #getHorizontal_head()
133 * @generated
134 * @ordered
135 */
136 protected Lane_Horizontal horizontal_head;
137
138 /**
139 * The cached value of the '{@link #getVertical_head() <em>Vertical head</em>}' reference.
140 * <!-- begin-user-doc -->
141 * <!-- end-user-doc -->
142 * @see #getVertical_head()
143 * @generated
144 * @ordered
145 */
146 protected Lane_Vertical vertical_head;
147
148 /**
125 * <!-- begin-user-doc --> 149 * <!-- begin-user-doc -->
126 * <!-- end-user-doc --> 150 * <!-- end-user-doc -->
127 * @generated 151 * @generated
@@ -241,6 +265,86 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
241 * @generated 265 * @generated
242 */ 266 */
243 @Override 267 @Override
268 public Lane_Horizontal getHorizontal_head() {
269 if (horizontal_head != null && horizontal_head.eIsProxy()) {
270 InternalEObject oldHorizontal_head = (InternalEObject)horizontal_head;
271 horizontal_head = (Lane_Horizontal)eResolveProxy(oldHorizontal_head);
272 if (horizontal_head != oldHorizontal_head) {
273 if (eNotificationRequired())
274 eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD, oldHorizontal_head, horizontal_head));
275 }
276 }
277 return horizontal_head;
278 }
279
280 /**
281 * <!-- begin-user-doc -->
282 * <!-- end-user-doc -->
283 * @generated
284 */
285 public Lane_Horizontal basicGetHorizontal_head() {
286 return horizontal_head;
287 }
288
289 /**
290 * <!-- begin-user-doc -->
291 * <!-- end-user-doc -->
292 * @generated
293 */
294 @Override
295 public void setHorizontal_head(Lane_Horizontal newHorizontal_head) {
296 Lane_Horizontal oldHorizontal_head = horizontal_head;
297 horizontal_head = newHorizontal_head;
298 if (eNotificationRequired())
299 eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD, oldHorizontal_head, horizontal_head));
300 }
301
302 /**
303 * <!-- begin-user-doc -->
304 * <!-- end-user-doc -->
305 * @generated
306 */
307 @Override
308 public Lane_Vertical getVertical_head() {
309 if (vertical_head != null && vertical_head.eIsProxy()) {
310 InternalEObject oldVertical_head = (InternalEObject)vertical_head;
311 vertical_head = (Lane_Vertical)eResolveProxy(oldVertical_head);
312 if (vertical_head != oldVertical_head) {
313 if (eNotificationRequired())
314 eNotify(new ENotificationImpl(this, Notification.RESOLVE, CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD, oldVertical_head, vertical_head));
315 }
316 }
317 return vertical_head;
318 }
319
320 /**
321 * <!-- begin-user-doc -->
322 * <!-- end-user-doc -->
323 * @generated
324 */
325 public Lane_Vertical basicGetVertical_head() {
326 return vertical_head;
327 }
328
329 /**
330 * <!-- begin-user-doc -->
331 * <!-- end-user-doc -->
332 * @generated
333 */
334 @Override
335 public void setVertical_head(Lane_Vertical newVertical_head) {
336 Lane_Vertical oldVertical_head = vertical_head;
337 vertical_head = newVertical_head;
338 if (eNotificationRequired())
339 eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD, oldVertical_head, vertical_head));
340 }
341
342 /**
343 * <!-- begin-user-doc -->
344 * <!-- end-user-doc -->
345 * @generated
346 */
347 @Override
244 public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) { 348 public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
245 switch (featureID) { 349 switch (featureID) {
246 case CrossingScenarioPackage.CROSSING_SCENARIO__ACTORS: 350 case CrossingScenarioPackage.CROSSING_SCENARIO__ACTORS:
@@ -269,6 +373,12 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
269 return getLanes(); 373 return getLanes();
270 case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: 374 case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME:
271 return getMaxTime(); 375 return getMaxTime();
376 case CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD:
377 if (resolve) return getHorizontal_head();
378 return basicGetHorizontal_head();
379 case CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD:
380 if (resolve) return getVertical_head();
381 return basicGetVertical_head();
272 } 382 }
273 return super.eGet(featureID, resolve, coreType); 383 return super.eGet(featureID, resolve, coreType);
274 } 384 }
@@ -299,6 +409,12 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
299 case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: 409 case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME:
300 setMaxTime((Double)newValue); 410 setMaxTime((Double)newValue);
301 return; 411 return;
412 case CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD:
413 setHorizontal_head((Lane_Horizontal)newValue);
414 return;
415 case CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD:
416 setVertical_head((Lane_Vertical)newValue);
417 return;
302 } 418 }
303 super.eSet(featureID, newValue); 419 super.eSet(featureID, newValue);
304 } 420 }
@@ -326,6 +442,12 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
326 case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: 442 case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME:
327 setMaxTime(MAX_TIME_EDEFAULT); 443 setMaxTime(MAX_TIME_EDEFAULT);
328 return; 444 return;
445 case CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD:
446 setHorizontal_head((Lane_Horizontal)null);
447 return;
448 case CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD:
449 setVertical_head((Lane_Vertical)null);
450 return;
329 } 451 }
330 super.eUnset(featureID); 452 super.eUnset(featureID);
331 } 453 }
@@ -348,6 +470,10 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
348 return lanes != null && !lanes.isEmpty(); 470 return lanes != null && !lanes.isEmpty();
349 case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME: 471 case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_TIME:
350 return maxTime != MAX_TIME_EDEFAULT; 472 return maxTime != MAX_TIME_EDEFAULT;
473 case CrossingScenarioPackage.CROSSING_SCENARIO__HORIZONTAL_HEAD:
474 return horizontal_head != null;
475 case CrossingScenarioPackage.CROSSING_SCENARIO__VERTICAL_HEAD:
476 return vertical_head != null;
351 } 477 }
352 return super.eIsSet(featureID); 478 return super.eIsSet(featureID);
353 } 479 }
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
index 3d2ccc0d..b87d2a4d 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
@@ -10,7 +10,8 @@ import crossingScenario.CrossingScenarioFactory;
10import crossingScenario.CrossingScenarioPackage; 10import crossingScenario.CrossingScenarioPackage;
11import crossingScenario.Distance; 11import crossingScenario.Distance;
12import crossingScenario.Lane; 12import crossingScenario.Lane;
13import crossingScenario.Orientation; 13import crossingScenario.Lane_Horizontal;
14import crossingScenario.Lane_Vertical;
14import crossingScenario.Pedestrian; 15import crossingScenario.Pedestrian;
15import crossingScenario.Relation; 16import crossingScenario.Relation;
16import crossingScenario.SeparationDistance; 17import crossingScenario.SeparationDistance;
@@ -124,7 +125,14 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
124 * <!-- end-user-doc --> 125 * <!-- end-user-doc -->
125 * @generated 126 * @generated
126 */ 127 */
127 private EEnum orientationEEnum = null; 128 private EClass lane_HorizontalEClass = null;
129
130 /**
131 * <!-- begin-user-doc -->
132 * <!-- end-user-doc -->
133 * @generated
134 */
135 private EClass lane_VerticalEClass = null;
128 136
129 /** 137 /**
130 * <!-- begin-user-doc --> 138 * <!-- begin-user-doc -->
@@ -267,8 +275,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
267 * @generated 275 * @generated
268 */ 276 */
269 @Override 277 @Override
270 public EClass getLane() { 278 public EReference getCrossingScenario_Horizontal_head() {
271 return laneEClass; 279 return (EReference)crossingScenarioEClass.getEStructuralFeatures().get(5);
272 } 280 }
273 281
274 /** 282 /**
@@ -277,8 +285,18 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
277 * @generated 285 * @generated
278 */ 286 */
279 @Override 287 @Override
280 public EAttribute getLane_Orientation() { 288 public EReference getCrossingScenario_Vertical_head() {
281 return (EAttribute)laneEClass.getEStructuralFeatures().get(0); 289 return (EReference)crossingScenarioEClass.getEStructuralFeatures().get(6);
290 }
291
292 /**
293 * <!-- begin-user-doc -->
294 * <!-- end-user-doc -->
295 * @generated
296 */
297 @Override
298 public EClass getLane() {
299 return laneEClass;
282 } 300 }
283 301
284 /** 302 /**
@@ -288,7 +306,7 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
288 */ 306 */
289 @Override 307 @Override
290 public EAttribute getLane_Width() { 308 public EAttribute getLane_Width() {
291 return (EAttribute)laneEClass.getEStructuralFeatures().get(1); 309 return (EAttribute)laneEClass.getEStructuralFeatures().get(0);
292 } 310 }
293 311
294 /** 312 /**
@@ -298,7 +316,7 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
298 */ 316 */
299 @Override 317 @Override
300 public EAttribute getLane_ReferenceCoord() { 318 public EAttribute getLane_ReferenceCoord() {
301 return (EAttribute)laneEClass.getEStructuralFeatures().get(2); 319 return (EAttribute)laneEClass.getEStructuralFeatures().get(1);
302 } 320 }
303 321
304 /** 322 /**
@@ -308,7 +326,7 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
308 */ 326 */
309 @Override 327 @Override
310 public EReference getLane_PrevLane() { 328 public EReference getLane_PrevLane() {
311 return (EReference)laneEClass.getEStructuralFeatures().get(3); 329 return (EReference)laneEClass.getEStructuralFeatures().get(2);
312 } 330 }
313 331
314 /** 332 /**
@@ -318,7 +336,7 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
318 */ 336 */
319 @Override 337 @Override
320 public EReference getLane_Actors() { 338 public EReference getLane_Actors() {
321 return (EReference)laneEClass.getEStructuralFeatures().get(4); 339 return (EReference)laneEClass.getEStructuralFeatures().get(3);
322 } 340 }
323 341
324 /** 342 /**
@@ -328,7 +346,7 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
328 */ 346 */
329 @Override 347 @Override
330 public EAttribute getLane_NumWidth() { 348 public EAttribute getLane_NumWidth() {
331 return (EAttribute)laneEClass.getEStructuralFeatures().get(5); 349 return (EAttribute)laneEClass.getEStructuralFeatures().get(4);
332 } 350 }
333 351
334 /** 352 /**
@@ -557,8 +575,18 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
557 * @generated 575 * @generated
558 */ 576 */
559 @Override 577 @Override
560 public EEnum getOrientation() { 578 public EClass getLane_Horizontal() {
561 return orientationEEnum; 579 return lane_HorizontalEClass;
580 }
581
582 /**
583 * <!-- begin-user-doc -->
584 * <!-- end-user-doc -->
585 * @generated
586 */
587 @Override
588 public EClass getLane_Vertical() {
589 return lane_VerticalEClass;
562 } 590 }
563 591
564 /** 592 /**
@@ -616,9 +644,10 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
616 createEReference(crossingScenarioEClass, CROSSING_SCENARIO__ACTORS); 644 createEReference(crossingScenarioEClass, CROSSING_SCENARIO__ACTORS);
617 createEReference(crossingScenarioEClass, CROSSING_SCENARIO__LANES); 645 createEReference(crossingScenarioEClass, CROSSING_SCENARIO__LANES);
618 createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__MAX_TIME); 646 createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__MAX_TIME);
647 createEReference(crossingScenarioEClass, CROSSING_SCENARIO__HORIZONTAL_HEAD);
648 createEReference(crossingScenarioEClass, CROSSING_SCENARIO__VERTICAL_HEAD);
619 649
620 laneEClass = createEClass(LANE); 650 laneEClass = createEClass(LANE);
621 createEAttribute(laneEClass, LANE__ORIENTATION);
622 createEAttribute(laneEClass, LANE__WIDTH); 651 createEAttribute(laneEClass, LANE__WIDTH);
623 createEAttribute(laneEClass, LANE__REFERENCE_COORD); 652 createEAttribute(laneEClass, LANE__REFERENCE_COORD);
624 createEReference(laneEClass, LANE__PREV_LANE); 653 createEReference(laneEClass, LANE__PREV_LANE);
@@ -657,8 +686,11 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
657 686
658 vehicleEClass = createEClass(VEHICLE); 687 vehicleEClass = createEClass(VEHICLE);
659 688
689 lane_HorizontalEClass = createEClass(LANE_HORIZONTAL);
690
691 lane_VerticalEClass = createEClass(LANE_VERTICAL);
692
660 // Create enums 693 // Create enums
661 orientationEEnum = createEEnum(ORIENTATION);
662 sizeEEnum = createEEnum(SIZE); 694 sizeEEnum = createEEnum(SIZE);
663 distanceEEnum = createEEnum(DISTANCE); 695 distanceEEnum = createEEnum(DISTANCE);
664 } 696 }
@@ -699,6 +731,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
699 collisionDoesNotExistEClass.getESuperTypes().add(this.getTemporalRelation()); 731 collisionDoesNotExistEClass.getESuperTypes().add(this.getTemporalRelation());
700 pedestrianEClass.getESuperTypes().add(this.getActor()); 732 pedestrianEClass.getESuperTypes().add(this.getActor());
701 vehicleEClass.getESuperTypes().add(this.getActor()); 733 vehicleEClass.getESuperTypes().add(this.getActor());
734 lane_HorizontalEClass.getESuperTypes().add(this.getLane());
735 lane_VerticalEClass.getESuperTypes().add(this.getLane());
702 736
703 // Initialize classes, features, and operations; add parameters 737 // Initialize classes, features, and operations; add parameters
704 initEClass(crossingScenarioEClass, CrossingScenario.class, "CrossingScenario", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 738 initEClass(crossingScenarioEClass, CrossingScenario.class, "CrossingScenario", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -707,9 +741,10 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
707 initEReference(getCrossingScenario_Actors(), this.getActor(), null, "actors", null, 0, -1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 741 initEReference(getCrossingScenario_Actors(), this.getActor(), null, "actors", null, 0, -1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
708 initEReference(getCrossingScenario_Lanes(), this.getLane(), null, "lanes", null, 0, -1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 742 initEReference(getCrossingScenario_Lanes(), this.getLane(), null, "lanes", null, 0, -1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
709 initEAttribute(getCrossingScenario_MaxTime(), ecorePackage.getEDouble(), "maxTime", null, 0, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 743 initEAttribute(getCrossingScenario_MaxTime(), ecorePackage.getEDouble(), "maxTime", null, 0, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
744 initEReference(getCrossingScenario_Horizontal_head(), this.getLane_Horizontal(), null, "horizontal_head", null, 1, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
745 initEReference(getCrossingScenario_Vertical_head(), this.getLane_Vertical(), null, "vertical_head", null, 1, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
710 746
711 initEClass(laneEClass, Lane.class, "Lane", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 747 initEClass(laneEClass, Lane.class, "Lane", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
712 initEAttribute(getLane_Orientation(), this.getOrientation(), "orientation", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
713 initEAttribute(getLane_Width(), this.getSize(), "width", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 748 initEAttribute(getLane_Width(), this.getSize(), "width", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
714 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); 749 initEAttribute(getLane_ReferenceCoord(), ecorePackage.getEDouble(), "referenceCoord", null, 1, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
715 initEReference(getLane_PrevLane(), this.getLane(), null, "prevLane", null, 0, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); 750 initEReference(getLane_PrevLane(), this.getLane(), null, "prevLane", null, 0, 1, Lane.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -748,11 +783,11 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
748 783
749 initEClass(vehicleEClass, Vehicle.class, "Vehicle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); 784 initEClass(vehicleEClass, Vehicle.class, "Vehicle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
750 785
751 // Initialize enums and add enum literals 786 initEClass(lane_HorizontalEClass, Lane_Horizontal.class, "Lane_Horizontal", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
752 initEEnum(orientationEEnum, Orientation.class, "Orientation");
753 addEEnumLiteral(orientationEEnum, Orientation.VERTICAL);
754 addEEnumLiteral(orientationEEnum, Orientation.HORIZONTAL);
755 787
788 initEClass(lane_VerticalEClass, Lane_Vertical.class, "Lane_Vertical", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
789
790 // Initialize enums and add enum literals
756 initEEnum(sizeEEnum, Size.class, "Size"); 791 initEEnum(sizeEEnum, Size.class, "Size");
757 addEEnumLiteral(sizeEEnum, Size.SSMALL); 792 addEEnumLiteral(sizeEEnum, Size.SSMALL);
758 addEEnumLiteral(sizeEEnum, Size.SMED); 793 addEEnumLiteral(sizeEEnum, Size.SMED);
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java
index 110f26c8..c0a25d6e 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/LaneImpl.java
@@ -5,7 +5,6 @@ package crossingScenario.impl;
5import crossingScenario.Actor; 5import crossingScenario.Actor;
6import crossingScenario.CrossingScenarioPackage; 6import crossingScenario.CrossingScenarioPackage;
7import crossingScenario.Lane; 7import crossingScenario.Lane;
8import crossingScenario.Orientation;
9import crossingScenario.Size; 8import crossingScenario.Size;
10 9
11import java.util.Collection; 10import java.util.Collection;
@@ -32,7 +31,6 @@ import org.eclipse.emf.ecore.util.InternalEList;
32 * The following features are implemented: 31 * The following features are implemented:
33 * </p> 32 * </p>
34 * <ul> 33 * <ul>
35 * <li>{@link crossingScenario.impl.LaneImpl#getOrientation <em>Orientation</em>}</li>
36 * <li>{@link crossingScenario.impl.LaneImpl#getWidth <em>Width</em>}</li> 34 * <li>{@link crossingScenario.impl.LaneImpl#getWidth <em>Width</em>}</li>
37 * <li>{@link crossingScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li> 35 * <li>{@link crossingScenario.impl.LaneImpl#getReferenceCoord <em>Reference Coord</em>}</li>
38 * <li>{@link crossingScenario.impl.LaneImpl#getPrevLane <em>Prev Lane</em>}</li> 36 * <li>{@link crossingScenario.impl.LaneImpl#getPrevLane <em>Prev Lane</em>}</li>
@@ -42,27 +40,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
42 * 40 *
43 * @generated 41 * @generated
44 */ 42 */
45public class LaneImpl extends MinimalEObjectImpl.Container implements Lane { 43public abstract class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
46 /**
47 * The default value of the '{@link #getOrientation() <em>Orientation</em>}' attribute.
48 * <!-- begin-user-doc -->
49 * <!-- end-user-doc -->
50 * @see #getOrientation()
51 * @generated
52 * @ordered
53 */
54 protected static final Orientation ORIENTATION_EDEFAULT = Orientation.VERTICAL;
55
56 /**
57 * The cached value of the '{@link #getOrientation() <em>Orientation</em>}' attribute.
58 * <!-- begin-user-doc -->
59 * <!-- end-user-doc -->
60 * @see #getOrientation()
61 * @generated
62 * @ordered
63 */
64 protected Orientation orientation = ORIENTATION_EDEFAULT;
65
66 /** 44 /**
67 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute. 45 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
68 * <!-- begin-user-doc --> 46 * <!-- begin-user-doc -->
@@ -168,29 +146,6 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
168 * @generated 146 * @generated
169 */ 147 */
170 @Override 148 @Override
171 public Orientation getOrientation() {
172 return orientation;
173 }
174
175 /**
176 * <!-- begin-user-doc -->
177 * <!-- end-user-doc -->
178 * @generated
179 */
180 @Override
181 public void setOrientation(Orientation newOrientation) {
182 Orientation oldOrientation = orientation;
183 orientation = newOrientation == null ? ORIENTATION_EDEFAULT : newOrientation;
184 if (eNotificationRequired())
185 eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.LANE__ORIENTATION, oldOrientation, orientation));
186 }
187
188 /**
189 * <!-- begin-user-doc -->
190 * <!-- end-user-doc -->
191 * @generated
192 */
193 @Override
194 public Size getWidth() { 149 public Size getWidth() {
195 return width; 150 return width;
196 } 151 }
@@ -344,8 +299,6 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
344 @Override 299 @Override
345 public Object eGet(int featureID, boolean resolve, boolean coreType) { 300 public Object eGet(int featureID, boolean resolve, boolean coreType) {
346 switch (featureID) { 301 switch (featureID) {
347 case CrossingScenarioPackage.LANE__ORIENTATION:
348 return getOrientation();
349 case CrossingScenarioPackage.LANE__WIDTH: 302 case CrossingScenarioPackage.LANE__WIDTH:
350 return getWidth(); 303 return getWidth();
351 case CrossingScenarioPackage.LANE__REFERENCE_COORD: 304 case CrossingScenarioPackage.LANE__REFERENCE_COORD:
@@ -370,9 +323,6 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
370 @Override 323 @Override
371 public void eSet(int featureID, Object newValue) { 324 public void eSet(int featureID, Object newValue) {
372 switch (featureID) { 325 switch (featureID) {
373 case CrossingScenarioPackage.LANE__ORIENTATION:
374 setOrientation((Orientation)newValue);
375 return;
376 case CrossingScenarioPackage.LANE__WIDTH: 326 case CrossingScenarioPackage.LANE__WIDTH:
377 setWidth((Size)newValue); 327 setWidth((Size)newValue);
378 return; 328 return;
@@ -401,9 +351,6 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
401 @Override 351 @Override
402 public void eUnset(int featureID) { 352 public void eUnset(int featureID) {
403 switch (featureID) { 353 switch (featureID) {
404 case CrossingScenarioPackage.LANE__ORIENTATION:
405 setOrientation(ORIENTATION_EDEFAULT);
406 return;
407 case CrossingScenarioPackage.LANE__WIDTH: 354 case CrossingScenarioPackage.LANE__WIDTH:
408 setWidth(WIDTH_EDEFAULT); 355 setWidth(WIDTH_EDEFAULT);
409 return; 356 return;
@@ -431,8 +378,6 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
431 @Override 378 @Override
432 public boolean eIsSet(int featureID) { 379 public boolean eIsSet(int featureID) {
433 switch (featureID) { 380 switch (featureID) {
434 case CrossingScenarioPackage.LANE__ORIENTATION:
435 return orientation != ORIENTATION_EDEFAULT;
436 case CrossingScenarioPackage.LANE__WIDTH: 381 case CrossingScenarioPackage.LANE__WIDTH:
437 return width != WIDTH_EDEFAULT; 382 return width != WIDTH_EDEFAULT;
438 case CrossingScenarioPackage.LANE__REFERENCE_COORD: 383 case CrossingScenarioPackage.LANE__REFERENCE_COORD:
@@ -457,9 +402,7 @@ public class LaneImpl extends MinimalEObjectImpl.Container implements Lane {
457 if (eIsProxy()) return super.toString(); 402 if (eIsProxy()) return super.toString();
458 403
459 StringBuilder result = new StringBuilder(super.toString()); 404 StringBuilder result = new StringBuilder(super.toString());
460 result.append(" (orientation: "); 405 result.append(" (width: ");
461 result.append(orientation);
462 result.append(", width: ");
463 result.append(width); 406 result.append(width);
464 result.append(", referenceCoord: "); 407 result.append(", referenceCoord: ");
465 result.append(referenceCoord); 408 result.append(referenceCoord);
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/Lane_HorizontalImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/Lane_HorizontalImpl.java
new file mode 100644
index 00000000..adf06602
--- /dev/null
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/Lane_HorizontalImpl.java
@@ -0,0 +1,37 @@
1/**
2 */
3package crossingScenario.impl;
4
5import crossingScenario.CrossingScenarioPackage;
6import crossingScenario.Lane_Horizontal;
7
8import org.eclipse.emf.ecore.EClass;
9
10/**
11 * <!-- begin-user-doc -->
12 * An implementation of the model object '<em><b>Lane Horizontal</b></em>'.
13 * <!-- end-user-doc -->
14 *
15 * @generated
16 */
17public class Lane_HorizontalImpl extends LaneImpl implements Lane_Horizontal {
18 /**
19 * <!-- begin-user-doc -->
20 * <!-- end-user-doc -->
21 * @generated
22 */
23 protected Lane_HorizontalImpl() {
24 super();
25 }
26
27 /**
28 * <!-- begin-user-doc -->
29 * <!-- end-user-doc -->
30 * @generated
31 */
32 @Override
33 protected EClass eStaticClass() {
34 return CrossingScenarioPackage.Literals.LANE_HORIZONTAL;
35 }
36
37} //Lane_HorizontalImpl
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/Lane_VerticalImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/Lane_VerticalImpl.java
new file mode 100644
index 00000000..cc1265e8
--- /dev/null
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/Lane_VerticalImpl.java
@@ -0,0 +1,37 @@
1/**
2 */
3package crossingScenario.impl;
4
5import crossingScenario.CrossingScenarioPackage;
6import crossingScenario.Lane_Vertical;
7
8import org.eclipse.emf.ecore.EClass;
9
10/**
11 * <!-- begin-user-doc -->
12 * An implementation of the model object '<em><b>Lane Vertical</b></em>'.
13 * <!-- end-user-doc -->
14 *
15 * @generated
16 */
17public class Lane_VerticalImpl extends LaneImpl implements Lane_Vertical {
18 /**
19 * <!-- begin-user-doc -->
20 * <!-- end-user-doc -->
21 * @generated
22 */
23 protected Lane_VerticalImpl() {
24 super();
25 }
26
27 /**
28 * <!-- begin-user-doc -->
29 * <!-- end-user-doc -->
30 * @generated
31 */
32 @Override
33 protected EClass eStaticClass() {
34 return CrossingScenarioPackage.Literals.LANE_VERTICAL;
35 }
36
37} //Lane_VerticalImpl
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java
index 0035a0ee..129432db 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java
@@ -116,6 +116,14 @@ public class CrossingScenarioAdapterFactory extends AdapterFactoryImpl {
116 return createVehicleAdapter(); 116 return createVehicleAdapter();
117 } 117 }
118 @Override 118 @Override
119 public Adapter caseLane_Horizontal(Lane_Horizontal object) {
120 return createLane_HorizontalAdapter();
121 }
122 @Override
123 public Adapter caseLane_Vertical(Lane_Vertical object) {
124 return createLane_VerticalAdapter();
125 }
126 @Override
119 public Adapter defaultCase(EObject object) { 127 public Adapter defaultCase(EObject object) {
120 return createEObjectAdapter(); 128 return createEObjectAdapter();
121 } 129 }
@@ -304,6 +312,34 @@ public class CrossingScenarioAdapterFactory extends AdapterFactoryImpl {
304 } 312 }
305 313
306 /** 314 /**
315 * Creates a new adapter for an object of class '{@link crossingScenario.Lane_Horizontal <em>Lane Horizontal</em>}'.
316 * <!-- begin-user-doc -->
317 * This default implementation returns null so that we can easily ignore cases;
318 * it's useful to ignore a case when inheritance will catch all the cases anyway.
319 * <!-- end-user-doc -->
320 * @return the new adapter.
321 * @see crossingScenario.Lane_Horizontal
322 * @generated
323 */
324 public Adapter createLane_HorizontalAdapter() {
325 return null;
326 }
327
328 /**
329 * Creates a new adapter for an object of class '{@link crossingScenario.Lane_Vertical <em>Lane Vertical</em>}'.
330 * <!-- begin-user-doc -->
331 * This default implementation returns null so that we can easily ignore cases;
332 * it's useful to ignore a case when inheritance will catch all the cases anyway.
333 * <!-- end-user-doc -->
334 * @return the new adapter.
335 * @see crossingScenario.Lane_Vertical
336 * @generated
337 */
338 public Adapter createLane_VerticalAdapter() {
339 return null;
340 }
341
342 /**
307 * Creates a new adapter for the default case. 343 * Creates a new adapter for the default case.
308 * <!-- begin-user-doc --> 344 * <!-- begin-user-doc -->
309 * This default implementation returns null. 345 * This default implementation returns null.
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java
index b14a5c24..e07b7693 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java
@@ -150,6 +150,20 @@ public class CrossingScenarioSwitch<T> extends Switch<T> {
150 if (result == null) result = defaultCase(theEObject); 150 if (result == null) result = defaultCase(theEObject);
151 return result; 151 return result;
152 } 152 }
153 case CrossingScenarioPackage.LANE_HORIZONTAL: {
154 Lane_Horizontal lane_Horizontal = (Lane_Horizontal)theEObject;
155 T result = caseLane_Horizontal(lane_Horizontal);
156 if (result == null) result = caseLane(lane_Horizontal);
157 if (result == null) result = defaultCase(theEObject);
158 return result;
159 }
160 case CrossingScenarioPackage.LANE_VERTICAL: {
161 Lane_Vertical lane_Vertical = (Lane_Vertical)theEObject;
162 T result = caseLane_Vertical(lane_Vertical);
163 if (result == null) result = caseLane(lane_Vertical);
164 if (result == null) result = defaultCase(theEObject);
165 return result;
166 }
153 default: return defaultCase(theEObject); 167 default: return defaultCase(theEObject);
154 } 168 }
155 } 169 }
@@ -335,6 +349,36 @@ public class CrossingScenarioSwitch<T> extends Switch<T> {
335 } 349 }
336 350
337 /** 351 /**
352 * Returns the result of interpreting the object as an instance of '<em>Lane Horizontal</em>'.
353 * <!-- begin-user-doc -->
354 * This implementation returns null;
355 * returning a non-null result will terminate the switch.
356 * <!-- end-user-doc -->
357 * @param object the target of the switch.
358 * @return the result of interpreting the object as an instance of '<em>Lane Horizontal</em>'.
359 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
360 * @generated
361 */
362 public T caseLane_Horizontal(Lane_Horizontal object) {
363 return null;
364 }
365
366 /**
367 * Returns the result of interpreting the object as an instance of '<em>Lane Vertical</em>'.
368 * <!-- begin-user-doc -->
369 * This implementation returns null;
370 * returning a non-null result will terminate the switch.
371 * <!-- end-user-doc -->
372 * @param object the target of the switch.
373 * @return the result of interpreting the object as an instance of '<em>Lane Vertical</em>'.
374 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
375 * @generated
376 */
377 public T caseLane_Vertical(Lane_Vertical object) {
378 return null;
379 }
380
381 /**
338 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'. 382 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
339 * <!-- begin-user-doc --> 383 * <!-- begin-user-doc -->
340 * This implementation returns null; 384 * This implementation returns null;
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-06-26 14:20:04 +0000