1 files changed, 1 insertions, 139 deletions
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
index 9985f18a..b39553f9 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
@@ -276,40 +276,13 @@ public interface CrossingScenarioPackage extends EPackage {
        int ACTOR__YSPEED = 6;
        /**
-         * The feature id for the '<em><b>Dist near</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int ACTOR__DIST_NEAR = 7;
-        /**
-         * The feature id for the '<em><b>Dist med</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int ACTOR__DIST_MED = 8;
-        /**
-         * The feature id for the '<em><b>Dist far</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int ACTOR__DIST_FAR = 9;
-        /**
         * The number of structural features of the '<em>Actor</em>' class.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
         * @generated
         * @ordered
         */
-        int ACTOR_FEATURE_COUNT = 10;
+        int ACTOR_FEATURE_COUNT = 7;
        /**
         * The number of operations of the '<em>Actor</em>' class.
@@ -550,33 +523,6 @@ public interface CrossingScenarioPackage extends EPackage {
        int PEDESTRIAN__YSPEED = ACTOR__YSPEED;
        /**
-         * The feature id for the '<em><b>Dist near</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int PEDESTRIAN__DIST_NEAR = ACTOR__DIST_NEAR;
-        /**
-         * The feature id for the '<em><b>Dist med</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int PEDESTRIAN__DIST_MED = ACTOR__DIST_MED;
-        /**
-         * The feature id for the '<em><b>Dist far</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int PEDESTRIAN__DIST_FAR = ACTOR__DIST_FAR;
-        /**
         * The number of structural features of the '<em>Pedestrian</em>' class.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
@@ -668,33 +614,6 @@ public interface CrossingScenarioPackage extends EPackage {
        int VEHICLE__YSPEED = ACTOR__YSPEED;
        /**
-         * The feature id for the '<em><b>Dist near</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int VEHICLE__DIST_NEAR = ACTOR__DIST_NEAR;
-        /**
-         * The feature id for the '<em><b>Dist med</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int VEHICLE__DIST_MED = ACTOR__DIST_MED;
-        /**
-         * The feature id for the '<em><b>Dist far</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int VEHICLE__DIST_FAR = ACTOR__DIST_FAR;
-        /**
         * The number of structural features of the '<em>Vehicle</em>' class.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
@@ -1023,39 +942,6 @@ public interface CrossingScenarioPackage extends EPackage {
        EAttribute getActor_YSpeed();
        /**
-         * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_near <em>Dist near</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the reference list '<em>Dist near</em>'.
-         * @see crossingScenario.Actor#getDist_near()
-         * @see #getActor()
-         * @generated
-         */
-        EReference getActor_Dist_near();
-        /**
-         * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_med <em>Dist med</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the reference list '<em>Dist med</em>'.
-         * @see crossingScenario.Actor#getDist_med()
-         * @see #getActor()
-         * @generated
-         */
-        EReference getActor_Dist_med();
-        /**
-         * Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_far <em>Dist far</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the reference list '<em>Dist far</em>'.
-         * @see crossingScenario.Actor#getDist_far()
-         * @see #getActor()
-         * @generated
-         */
-        EReference getActor_Dist_far();
-        /**
         * Returns the meta object for class '{@link crossingScenario.Relation <em>Relation</em>}'.
         * <!-- begin-user-doc -->
         * <!-- end-user-doc -->
@@ -1359,30 +1245,6 @@ public interface CrossingScenarioPackage extends EPackage {
                EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed();
                /**
-                 * The meta object literal for the '<em><b>Dist near</b></em>' reference list feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference ACTOR__DIST_NEAR = eINSTANCE.getActor_Dist_near();
-                /**
-                 * The meta object literal for the '<em><b>Dist med</b></em>' reference list feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference ACTOR__DIST_MED = eINSTANCE.getActor_Dist_med();
-                /**
-                 * The meta object literal for the '<em><b>Dist far</b></em>' reference list feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference ACTOR__DIST_FAR = eINSTANCE.getActor_Dist_far();
-                /**
                 * The meta object literal for the '{@link crossingScenario.impl.RelationImpl <em>Relation</em>}' class.
                 * <!-- begin-user-doc -->
                 * <!-- end-user-doc -->

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java index 9985f18a..b39553f9 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
@@ -276,40 +276,13 @@ public interface CrossingScenarioPackage extends EPackage {
276	int ACTOR__YSPEED = 6;	276	int ACTOR__YSPEED = 6;
277		277
278	/**	278	/**
279	* The feature id for the '<em><b>Dist near</b></em>' reference list.
280	* <!-- begin-user-doc -->
281	* <!-- end-user-doc -->
282	* @generated
283	* @ordered
284	*/
285	int ACTOR__DIST_NEAR = 7;
286
287	/**
288	* The feature id for the '<em><b>Dist med</b></em>' reference list.
289	* <!-- begin-user-doc -->
290	* <!-- end-user-doc -->
291	* @generated
292	* @ordered
293	*/
294	int ACTOR__DIST_MED = 8;
295
296	/**
297	* The feature id for the '<em><b>Dist far</b></em>' reference list.
298	* <!-- begin-user-doc -->
299	* <!-- end-user-doc -->
300	* @generated
301	* @ordered
302	*/
303	int ACTOR__DIST_FAR = 9;
304
305	/**
306	* The number of structural features of the '<em>Actor</em>' class.	279	* The number of structural features of the '<em>Actor</em>' class.
307	* <!-- begin-user-doc -->	280	* <!-- begin-user-doc -->
308	* <!-- end-user-doc -->	281	* <!-- end-user-doc -->
309	* @generated	282	* @generated
310	* @ordered	283	* @ordered
311	*/	284	*/
312	int ACTOR_FEATURE_COUNT = 10;	285	int ACTOR_FEATURE_COUNT = 7;
313		286
314	/**	287	/**
315	* The number of operations of the '<em>Actor</em>' class.	288	* The number of operations of the '<em>Actor</em>' class.
@@ -550,33 +523,6 @@ public interface CrossingScenarioPackage extends EPackage {
550	int PEDESTRIAN__YSPEED = ACTOR__YSPEED;	523	int PEDESTRIAN__YSPEED = ACTOR__YSPEED;
551		524
552	/**	525	/**
553	* The feature id for the '<em><b>Dist near</b></em>' reference list.
554	* <!-- begin-user-doc -->
555	* <!-- end-user-doc -->
556	* @generated
557	* @ordered
558	*/
559	int PEDESTRIAN__DIST_NEAR = ACTOR__DIST_NEAR;
560
561	/**
562	* The feature id for the '<em><b>Dist med</b></em>' reference list.
563	* <!-- begin-user-doc -->
564	* <!-- end-user-doc -->
565	* @generated
566	* @ordered
567	*/
568	int PEDESTRIAN__DIST_MED = ACTOR__DIST_MED;
569
570	/**
571	* The feature id for the '<em><b>Dist far</b></em>' reference list.
572	* <!-- begin-user-doc -->
573	* <!-- end-user-doc -->
574	* @generated
575	* @ordered
576	*/
577	int PEDESTRIAN__DIST_FAR = ACTOR__DIST_FAR;
578
579	/**
580	* The number of structural features of the '<em>Pedestrian</em>' class.	526	* The number of structural features of the '<em>Pedestrian</em>' class.
581	* <!-- begin-user-doc -->	527	* <!-- begin-user-doc -->
582	* <!-- end-user-doc -->	528	* <!-- end-user-doc -->
@@ -668,33 +614,6 @@ public interface CrossingScenarioPackage extends EPackage {
668	int VEHICLE__YSPEED = ACTOR__YSPEED;	614	int VEHICLE__YSPEED = ACTOR__YSPEED;
669		615
670	/**	616	/**
671	* The feature id for the '<em><b>Dist near</b></em>' reference list.
672	* <!-- begin-user-doc -->
673	* <!-- end-user-doc -->
674	* @generated
675	* @ordered
676	*/
677	int VEHICLE__DIST_NEAR = ACTOR__DIST_NEAR;
678
679	/**
680	* The feature id for the '<em><b>Dist med</b></em>' reference list.
681	* <!-- begin-user-doc -->
682	* <!-- end-user-doc -->
683	* @generated
684	* @ordered
685	*/
686	int VEHICLE__DIST_MED = ACTOR__DIST_MED;
687
688	/**
689	* The feature id for the '<em><b>Dist far</b></em>' reference list.
690	* <!-- begin-user-doc -->
691	* <!-- end-user-doc -->
692	* @generated
693	* @ordered
694	*/
695	int VEHICLE__DIST_FAR = ACTOR__DIST_FAR;
696
697	/**
698	* The number of structural features of the '<em>Vehicle</em>' class.	617	* The number of structural features of the '<em>Vehicle</em>' class.
699	* <!-- begin-user-doc -->	618	* <!-- begin-user-doc -->
700	* <!-- end-user-doc -->	619	* <!-- end-user-doc -->
@@ -1023,39 +942,6 @@ public interface CrossingScenarioPackage extends EPackage {
1023	EAttribute getActor_YSpeed();	942	EAttribute getActor_YSpeed();
1024		943
1025	/**	944	/**
1026	* Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_near <em>Dist near</em>}'.
1027	* <!-- begin-user-doc -->
1028	* <!-- end-user-doc -->
1029	* @return the meta object for the reference list '<em>Dist near</em>'.
1030	* @see crossingScenario.Actor#getDist_near()
1031	* @see #getActor()
1032	* @generated
1033	*/
1034	EReference getActor_Dist_near();
1035
1036	/**
1037	* Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_med <em>Dist med</em>}'.
1038	* <!-- begin-user-doc -->
1039	* <!-- end-user-doc -->
1040	* @return the meta object for the reference list '<em>Dist med</em>'.
1041	* @see crossingScenario.Actor#getDist_med()
1042	* @see #getActor()
1043	* @generated
1044	*/
1045	EReference getActor_Dist_med();
1046
1047	/**
1048	* Returns the meta object for the reference list '{@link crossingScenario.Actor#getDist_far <em>Dist far</em>}'.
1049	* <!-- begin-user-doc -->
1050	* <!-- end-user-doc -->
1051	* @return the meta object for the reference list '<em>Dist far</em>'.
1052	* @see crossingScenario.Actor#getDist_far()
1053	* @see #getActor()
1054	* @generated
1055	*/
1056	EReference getActor_Dist_far();
1057
1058	/**
1059	* Returns the meta object for class '{@link crossingScenario.Relation <em>Relation</em>}'.	945	* Returns the meta object for class '{@link crossingScenario.Relation <em>Relation</em>}'.
1060	* <!-- begin-user-doc -->	946	* <!-- begin-user-doc -->
1061	* <!-- end-user-doc -->	947	* <!-- end-user-doc -->
@@ -1359,30 +1245,6 @@ public interface CrossingScenarioPackage extends EPackage {
1359	EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed();	1245	EAttribute ACTOR__YSPEED = eINSTANCE.getActor_YSpeed();
1360		1246
1361	/**	1247	/**
1362	* The meta object literal for the '<em><b>Dist near</b></em>' reference list feature.
1363	* <!-- begin-user-doc -->
1364	* <!-- end-user-doc -->
1365	* @generated
1366	*/
1367	EReference ACTOR__DIST_NEAR = eINSTANCE.getActor_Dist_near();
1368
1369	/**
1370	* The meta object literal for the '<em><b>Dist med</b></em>' reference list feature.
1371	* <!-- begin-user-doc -->
1372	* <!-- end-user-doc -->
1373	* @generated
1374	*/
1375	EReference ACTOR__DIST_MED = eINSTANCE.getActor_Dist_med();
1376
1377	/**
1378	* The meta object literal for the '<em><b>Dist far</b></em>' reference list feature.
1379	* <!-- begin-user-doc -->
1380	* <!-- end-user-doc -->
1381	* @generated
1382	*/
1383	EReference ACTOR__DIST_FAR = eINSTANCE.getActor_Dist_far();
1384
1385	/**
1386	* The meta object literal for the '{@link crossingScenario.impl.RelationImpl <em>Relation</em>}' class.	1248	* The meta object literal for the '{@link crossingScenario.impl.RelationImpl <em>Relation</em>}' class.
1387	* <!-- begin-user-doc -->	1249	* <!-- begin-user-doc -->
1388	* <!-- end-user-doc -->	1250	* <!-- end-user-doc -->