2 files changed, 0 insertions, 120 deletions

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java
index 52d251e0..9ef288f0 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/ActorImpl.java
@@ -5,14 +5,8 @@ package crossingScenario.impl;
 import crossingScenario.Actor;
 import crossingScenario.CrossingScenarioPackage;
 import crossingScenario.Lane;
-
-import java.util.Collection;
-
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
@@ -34,9 +28,6 @@ import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
  *   <li>{@link crossingScenario.impl.ActorImpl#getXSpeed <em>XSpeed</em>}</li>
  *   <li>{@link crossingScenario.impl.ActorImpl#getPlacedOn <em>Placed On</em>}</li>
  *   <li>{@link crossingScenario.impl.ActorImpl#getYSpeed <em>YSpeed</em>}</li>
- *   <li>{@link crossingScenario.impl.ActorImpl#getDist_near <em>Dist near</em>}</li>
- *   <li>{@link crossingScenario.impl.ActorImpl#getDist_med <em>Dist med</em>}</li>
- *   <li>{@link crossingScenario.impl.ActorImpl#getDist_far <em>Dist far</em>}</li>
  * </ul>
  *
  * @generated
@@ -397,48 +388,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
          * @generated
          */
         @Override
-        public EList<Actor> getDist_near() {
-                // TODO: implement this method to return the 'Dist near' reference list
-                // Ensure that you remove @generated or mark it @generated NOT
-                // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
-                // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used.
-                throw new UnsupportedOperationException();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EList<Actor> getDist_med() {
-                // TODO: implement this method to return the 'Dist med' reference list
-                // Ensure that you remove @generated or mark it @generated NOT
-                // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
-                // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used.
-                throw new UnsupportedOperationException();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EList<Actor> getDist_far() {
-                // TODO: implement this method to return the 'Dist far' reference list
-                // Ensure that you remove @generated or mark it @generated NOT
-                // The list is expected to implement org.eclipse.emf.ecore.util.InternalEList and org.eclipse.emf.ecore.EStructuralFeature.Setting
-                // so it's likely that an appropriate subclass of org.eclipse.emf.ecore.util.EcoreEList should be used.
-                throw new UnsupportedOperationException();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                 switch (featureID) {
                         case CrossingScenarioPackage.ACTOR__PLACED_ON:
@@ -486,12 +435,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                                 return basicGetPlacedOn();
                         case CrossingScenarioPackage.ACTOR__YSPEED:
                                 return getYSpeed();
-                        case CrossingScenarioPackage.ACTOR__DIST_NEAR:
-                                return getDist_near();
-                        case CrossingScenarioPackage.ACTOR__DIST_MED:
-                                return getDist_med();
-                        case CrossingScenarioPackage.ACTOR__DIST_FAR:
-                                return getDist_far();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -526,18 +469,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                         case CrossingScenarioPackage.ACTOR__YSPEED:
                                 setYSpeed((Double)newValue);
                                 return;
-                        case CrossingScenarioPackage.ACTOR__DIST_NEAR:
-                                getDist_near().clear();
-                                getDist_near().addAll((Collection<? extends Actor>)newValue);
-                                return;
-                        case CrossingScenarioPackage.ACTOR__DIST_MED:
-                                getDist_med().clear();
-                                getDist_med().addAll((Collection<? extends Actor>)newValue);
-                                return;
-                        case CrossingScenarioPackage.ACTOR__DIST_FAR:
-                                getDist_far().clear();
-                                getDist_far().addAll((Collection<? extends Actor>)newValue);
-                                return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -571,15 +502,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                         case CrossingScenarioPackage.ACTOR__YSPEED:
                                 setYSpeed(YSPEED_EDEFAULT);
                                 return;
-                        case CrossingScenarioPackage.ACTOR__DIST_NEAR:
-                                getDist_near().clear();
-                                return;
-                        case CrossingScenarioPackage.ACTOR__DIST_MED:
-                                getDist_med().clear();
-                                return;
-                        case CrossingScenarioPackage.ACTOR__DIST_FAR:
-                                getDist_far().clear();
-                                return;
                 }
                 super.eUnset(featureID);
         }
@@ -606,12 +528,6 @@ public abstract class ActorImpl extends MinimalEObjectImpl.Container implements
                                 return placedOn != null;
                         case CrossingScenarioPackage.ACTOR__YSPEED:
                                 return ySpeed != YSPEED_EDEFAULT;
-                        case CrossingScenarioPackage.ACTOR__DIST_NEAR:
-                                return !getDist_near().isEmpty();
-                        case CrossingScenarioPackage.ACTOR__DIST_MED:
-                                return !getDist_med().isEmpty();
-                        case CrossingScenarioPackage.ACTOR__DIST_FAR:
-                                return !getDist_far().isEmpty();
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
index 7f8f7357..887e02fe 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
@@ -366,36 +366,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
          * @generated
          */
         @Override
-        public EReference getActor_Dist_near() {
-                return (EReference)actorEClass.getEStructuralFeatures().get(7);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EReference getActor_Dist_med() {
-                return (EReference)actorEClass.getEStructuralFeatures().get(8);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EReference getActor_Dist_far() {
-                return (EReference)actorEClass.getEStructuralFeatures().get(9);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EClass getRelation() {
                 return relationEClass;
         }
@@ -551,9 +521,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
                 createEAttribute(actorEClass, ACTOR__XSPEED);
                 createEReference(actorEClass, ACTOR__PLACED_ON);
                 createEAttribute(actorEClass, ACTOR__YSPEED);
-                createEReference(actorEClass, ACTOR__DIST_NEAR);
-                createEReference(actorEClass, ACTOR__DIST_MED);
-                createEReference(actorEClass, ACTOR__DIST_FAR);
 
                 relationEClass = createEClass(RELATION);
                 createEReference(relationEClass, RELATION__TARGET);
@@ -632,9 +599,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
                 initEAttribute(getActor_XSpeed(), ecorePackage.getEDouble(), "xSpeed", "0.0", 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEReference(getActor_PlacedOn(), this.getLane(), this.getLane_Actors(), "placedOn", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
                 initEAttribute(getActor_YSpeed(), ecorePackage.getEDouble(), "ySpeed", null, 1, 1, Actor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getActor_Dist_near(), this.getActor(), null, "dist_near", null, 0, -1, Actor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-                initEReference(getActor_Dist_med(), this.getActor(), null, "dist_med", null, 0, -1, Actor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-                initEReference(getActor_Dist_far(), this.getActor(), null, "dist_far", null, 0, -1, Actor.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
                 initEClass(relationEClass, Relation.class, "Relation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
                 initEReference(getRelation_Target(), this.getActor(), null, "target", null, 1, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);