Issue where blocker is not between source and target

4 files changed, 241 insertions, 1 deletions

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java
index 0e9f4981..0f8eb79b 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenario.java
@@ -21,6 +21,8 @@ import org.eclipse.emf.ecore.EObject;
  *   <li>{@link crossingScenario.CrossingScenario#getLanes <em>Lanes</em>}</li>

  *   <li>{@link crossingScenario.CrossingScenario#getMaxTime <em>Max Time</em>}</li>

  *   <li>{@link crossingScenario.CrossingScenario#getRelations <em>Relations</em>}</li>

+ *   <li>{@link crossingScenario.CrossingScenario#getMaxXSpeed <em>Max XSpeed</em>}</li>

+ *   <li>{@link crossingScenario.CrossingScenario#getMaxYSpeed <em>Max YSpeed</em>}</li>

  * </ul>

  *

  * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario()

@@ -130,4 +132,50 @@ public interface CrossingScenario extends EObject {
          */

         EList<Relation> getRelations();

 

+        /**

+         * Returns the value of the '<em><b>Max XSpeed</b></em>' attribute.

+         * The default value is <code>"0.0"</code>.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the value of the '<em>Max XSpeed</em>' attribute.

+         * @see #setMaxXSpeed(double)

+         * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_MaxXSpeed()

+         * @model default="0.0"

+         * @generated

+         */

+        double getMaxXSpeed();

+

+        /**

+         * Sets the value of the '{@link crossingScenario.CrossingScenario#getMaxXSpeed <em>Max XSpeed</em>}' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @param value the new value of the '<em>Max XSpeed</em>' attribute.

+         * @see #getMaxXSpeed()

+         * @generated

+         */

+        void setMaxXSpeed(double value);

+

+        /**

+         * Returns the value of the '<em><b>Max YSpeed</b></em>' attribute.

+         * The default value is <code>"0.0"</code>.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the value of the '<em>Max YSpeed</em>' attribute.

+         * @see #setMaxYSpeed(double)

+         * @see crossingScenario.CrossingScenarioPackage#getCrossingScenario_MaxYSpeed()

+         * @model default="0.0"

+         * @generated

+         */

+        double getMaxYSpeed();

+

+        /**

+         * Sets the value of the '{@link crossingScenario.CrossingScenario#getMaxYSpeed <em>Max YSpeed</em>}' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @param value the new value of the '<em>Max YSpeed</em>' attribute.

+         * @see #getMaxYSpeed()

+         * @generated

+         */

+        void setMaxYSpeed(double value);

+

 } // CrossingScenario

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
index 45443103..bafc5e69 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java
@@ -122,13 +122,31 @@ public interface CrossingScenarioPackage extends EPackage {
         int CROSSING_SCENARIO__RELATIONS = 5;

 

         /**

+         * The feature id for the '<em><b>Max XSpeed</b></em>' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int CROSSING_SCENARIO__MAX_XSPEED = 6;

+

+        /**

+         * The feature id for the '<em><b>Max YSpeed</b></em>' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         * @ordered

+         */

+        int CROSSING_SCENARIO__MAX_YSPEED = 7;

+

+        /**

          * The number of structural features of the '<em>Crossing Scenario</em>' class.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

          * @ordered

          */

-        int CROSSING_SCENARIO_FEATURE_COUNT = 6;

+        int CROSSING_SCENARIO_FEATURE_COUNT = 8;

 

         /**

          * The number of operations of the '<em>Crossing Scenario</em>' class.

@@ -1068,6 +1086,28 @@ public interface CrossingScenarioPackage extends EPackage {
         EReference getCrossingScenario_Relations();

 

         /**

+         * Returns the meta object for the attribute '{@link crossingScenario.CrossingScenario#getMaxXSpeed <em>Max XSpeed</em>}'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the meta object for the attribute '<em>Max XSpeed</em>'.

+         * @see crossingScenario.CrossingScenario#getMaxXSpeed()

+         * @see #getCrossingScenario()

+         * @generated

+         */

+        EAttribute getCrossingScenario_MaxXSpeed();

+

+        /**

+         * Returns the meta object for the attribute '{@link crossingScenario.CrossingScenario#getMaxYSpeed <em>Max YSpeed</em>}'.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @return the meta object for the attribute '<em>Max YSpeed</em>'.

+         * @see crossingScenario.CrossingScenario#getMaxYSpeed()

+         * @see #getCrossingScenario()

+         * @generated

+         */

+        EAttribute getCrossingScenario_MaxYSpeed();

+

+        /**

          * Returns the meta object for class '{@link crossingScenario.Lane <em>Lane</em>}'.

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

@@ -1476,6 +1516,22 @@ public interface CrossingScenarioPackage extends EPackage {
                 EReference CROSSING_SCENARIO__RELATIONS = eINSTANCE.getCrossingScenario_Relations();

 

                 /**

+                 * The meta object literal for the '<em><b>Max XSpeed</b></em>' attribute feature.

+                 * <!-- begin-user-doc -->

+                 * <!-- end-user-doc -->

+                 * @generated

+                 */

+                EAttribute CROSSING_SCENARIO__MAX_XSPEED = eINSTANCE.getCrossingScenario_MaxXSpeed();

+

+                /**

+                 * The meta object literal for the '<em><b>Max YSpeed</b></em>' attribute feature.

+                 * <!-- begin-user-doc -->

+                 * <!-- end-user-doc -->

+                 * @generated

+                 */

+                EAttribute CROSSING_SCENARIO__MAX_YSPEED = eINSTANCE.getCrossingScenario_MaxYSpeed();

+

+                /**

                  * The meta object literal for the '{@link crossingScenario.impl.LaneImpl <em>Lane</em>}' class.

                  * <!-- begin-user-doc -->

                  * <!-- end-user-doc -->

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java
index b2b0d579..28667b0c 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioImpl.java
@@ -37,6 +37,8 @@ import org.eclipse.emf.ecore.util.InternalEList;
  *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getLanes <em>Lanes</em>}</li>

  *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getMaxTime <em>Max Time</em>}</li>

  *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getRelations <em>Relations</em>}</li>

+ *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getMaxXSpeed <em>Max XSpeed</em>}</li>

+ *   <li>{@link crossingScenario.impl.CrossingScenarioImpl#getMaxYSpeed <em>Max YSpeed</em>}</li>

  * </ul>

  *

  * @generated

@@ -133,6 +135,46 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
         protected EList<Relation> relations;

 

         /**

+         * The default value of the '{@link #getMaxXSpeed() <em>Max XSpeed</em>}' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @see #getMaxXSpeed()

+         * @generated

+         * @ordered

+         */

+        protected static final double MAX_XSPEED_EDEFAULT = 0.0;

+

+        /**

+         * The cached value of the '{@link #getMaxXSpeed() <em>Max XSpeed</em>}' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @see #getMaxXSpeed()

+         * @generated

+         * @ordered

+         */

+        protected double maxXSpeed = MAX_XSPEED_EDEFAULT;

+

+        /**

+         * The default value of the '{@link #getMaxYSpeed() <em>Max YSpeed</em>}' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @see #getMaxYSpeed()

+         * @generated

+         * @ordered

+         */

+        protected static final double MAX_YSPEED_EDEFAULT = 0.0;

+

+        /**

+         * The cached value of the '{@link #getMaxYSpeed() <em>Max YSpeed</em>}' attribute.

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @see #getMaxYSpeed()

+         * @generated

+         * @ordered

+         */

+        protected double maxYSpeed = MAX_YSPEED_EDEFAULT;

+

+        /**

          * <!-- begin-user-doc -->

          * <!-- end-user-doc -->

          * @generated

@@ -265,6 +307,52 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
          * @generated

          */

         @Override

+        public double getMaxXSpeed() {

+                return maxXSpeed;

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        @Override

+        public void setMaxXSpeed(double newMaxXSpeed) {

+                double oldMaxXSpeed = maxXSpeed;

+                maxXSpeed = newMaxXSpeed;

+                if (eNotificationRequired())

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.CROSSING_SCENARIO__MAX_XSPEED, oldMaxXSpeed, maxXSpeed));

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        @Override

+        public double getMaxYSpeed() {

+                return maxYSpeed;

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        @Override

+        public void setMaxYSpeed(double newMaxYSpeed) {

+                double oldMaxYSpeed = maxYSpeed;

+                maxYSpeed = newMaxYSpeed;

+                if (eNotificationRequired())

+                        eNotify(new ENotificationImpl(this, Notification.SET, CrossingScenarioPackage.CROSSING_SCENARIO__MAX_YSPEED, oldMaxYSpeed, maxYSpeed));

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        @Override

         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

                 switch (featureID) {

                         case CrossingScenarioPackage.CROSSING_SCENARIO__ACTORS:

@@ -297,6 +385,10 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
                                 return getMaxTime();

                         case CrossingScenarioPackage.CROSSING_SCENARIO__RELATIONS:

                                 return getRelations();

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_XSPEED:

+                                return getMaxXSpeed();

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_YSPEED:

+                                return getMaxYSpeed();

                 }

                 return super.eGet(featureID, resolve, coreType);

         }

@@ -331,6 +423,12 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
                                 getRelations().clear();

                                 getRelations().addAll((Collection<? extends Relation>)newValue);

                                 return;

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_XSPEED:

+                                setMaxXSpeed((Double)newValue);

+                                return;

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_YSPEED:

+                                setMaxYSpeed((Double)newValue);

+                                return;

                 }

                 super.eSet(featureID, newValue);

         }

@@ -361,6 +459,12 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
                         case CrossingScenarioPackage.CROSSING_SCENARIO__RELATIONS:

                                 getRelations().clear();

                                 return;

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_XSPEED:

+                                setMaxXSpeed(MAX_XSPEED_EDEFAULT);

+                                return;

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_YSPEED:

+                                setMaxYSpeed(MAX_YSPEED_EDEFAULT);

+                                return;

                 }

                 super.eUnset(featureID);

         }

@@ -385,6 +489,10 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
                                 return maxTime != MAX_TIME_EDEFAULT;

                         case CrossingScenarioPackage.CROSSING_SCENARIO__RELATIONS:

                                 return relations != null && !relations.isEmpty();

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_XSPEED:

+                                return maxXSpeed != MAX_XSPEED_EDEFAULT;

+                        case CrossingScenarioPackage.CROSSING_SCENARIO__MAX_YSPEED:

+                                return maxYSpeed != MAX_YSPEED_EDEFAULT;

                 }

                 return super.eIsSet(featureID);

         }

@@ -405,6 +513,10 @@ public class CrossingScenarioImpl extends MinimalEObjectImpl.Container implement
                 result.append(ySize);

                 result.append(", maxTime: ");

                 result.append(maxTime);

+                result.append(", maxXSpeed: ");

+                result.append(maxXSpeed);

+                result.append(", maxYSpeed: ");

+                result.append(maxYSpeed);

                 result.append(')');

                 return result.toString();

         }

diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
index b8261c86..292fcb9c 100644
--- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
+++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java
@@ -277,6 +277,26 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
          * @generated

          */

         @Override

+        public EAttribute getCrossingScenario_MaxXSpeed() {

+                return (EAttribute)crossingScenarioEClass.getEStructuralFeatures().get(6);

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        @Override

+        public EAttribute getCrossingScenario_MaxYSpeed() {

+                return (EAttribute)crossingScenarioEClass.getEStructuralFeatures().get(7);

+        }

+

+        /**

+         * <!-- begin-user-doc -->

+         * <!-- end-user-doc -->

+         * @generated

+         */

+        @Override

         public EClass getLane() {

                 return laneEClass;

         }

@@ -617,6 +637,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
                 createEReference(crossingScenarioEClass, CROSSING_SCENARIO__LANES);

                 createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__MAX_TIME);

                 createEReference(crossingScenarioEClass, CROSSING_SCENARIO__RELATIONS);

+                createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__MAX_XSPEED);

+                createEAttribute(crossingScenarioEClass, CROSSING_SCENARIO__MAX_YSPEED);

 

                 laneEClass = createEClass(LANE);

                 createEAttribute(laneEClass, LANE__REFERENCE_COORD);

@@ -712,6 +734,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin
                 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);

                 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);

                 initEReference(getCrossingScenario_Relations(), this.getRelation(), null, "relations", null, 0, -1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEAttribute(getCrossingScenario_MaxXSpeed(), ecorePackage.getEDouble(), "maxXSpeed", "0.0", 0, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

+                initEAttribute(getCrossingScenario_MaxYSpeed(), ecorePackage.getEDouble(), "maxYSpeed", "0.0", 0, 1, CrossingScenario.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

 

                 initEClass(laneEClass, Lane.class, "Lane", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);

                 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);