From a4505df3fab5d1c5cf11840bc3ca9ca876423ece Mon Sep 17 00:00:00 2001 From: Aren Babikian Date: Mon, 1 Feb 2021 06:11:44 +0100 Subject: simplify MM + add aird --- .../crossingScenario/CollisionExists.java | 2 +- .../crossingScenario/CrossingScenarioPackage.java | 164 +--- .../crossingScenario/SpatialRelation.java | 17 - .../crossingScenario/TemporalRelation.java | 17 - .../ecore-gen/crossingScenario/VisionBlocked.java | 2 +- .../crossingScenario/impl/CollisionExistsImpl.java | 2 +- .../impl/CrossingScenarioPackageImpl.java | 50 +- .../crossingScenario/impl/SpatialRelationImpl.java | 37 - .../impl/TemporalRelationImpl.java | 37 - .../crossingScenario/impl/VisionBlockedImpl.java | 2 +- .../util/CrossingScenarioAdapterFactory.java | 36 - .../util/CrossingScenarioSwitch.java | 46 -- .../model/crossingScenario class diagram.png | Bin 0 -> 438633 bytes .../model/crossingScenario class diagram.svg | 549 +++++++++++++ .../crossingScenario/model/crossingScenario.aird | 230 ++---- .../crossingScenario/model/crossingScenario.ecore | 6 +- .../model/crossingScenario.genmodel | 2 - .../crossingScenario/model/crossingScenario2.aird | 874 +++++++++++++++++++++ 18 files changed, 1505 insertions(+), 568 deletions(-) delete mode 100644 Domains/crossingScenario/ecore-gen/crossingScenario/SpatialRelation.java delete mode 100644 Domains/crossingScenario/ecore-gen/crossingScenario/TemporalRelation.java delete mode 100644 Domains/crossingScenario/ecore-gen/crossingScenario/impl/SpatialRelationImpl.java delete mode 100644 Domains/crossingScenario/ecore-gen/crossingScenario/impl/TemporalRelationImpl.java create mode 100644 Domains/crossingScenario/model/crossingScenario class diagram.png create mode 100644 Domains/crossingScenario/model/crossingScenario class diagram.svg create mode 100644 Domains/crossingScenario/model/crossingScenario2.aird (limited to 'Domains') diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CollisionExists.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CollisionExists.java index 940cc305..b2080a1f 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/CollisionExists.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CollisionExists.java @@ -19,7 +19,7 @@ package crossingScenario; * @model * @generated */ -public interface CollisionExists extends TemporalRelation { +public interface CollisionExists extends Relation { /** * Returns the value of the 'Collision Time' attribute. * diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java index bdc531f6..9985f18a 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/CrossingScenarioPackage.java @@ -366,98 +366,6 @@ public interface CrossingScenarioPackage extends EPackage { */ int RELATION_OPERATION_COUNT = 0; - /** - * The meta object id for the '{@link crossingScenario.impl.SpatialRelationImpl Spatial Relation}' class. - * - * - * @see crossingScenario.impl.SpatialRelationImpl - * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSpatialRelation() - * @generated - */ - int SPATIAL_RELATION = 4; - - /** - * The feature id for the 'Target' reference. - * - * - * @generated - * @ordered - */ - int SPATIAL_RELATION__TARGET = RELATION__TARGET; - - /** - * The feature id for the 'Source' reference. - * - * - * @generated - * @ordered - */ - int SPATIAL_RELATION__SOURCE = RELATION__SOURCE; - - /** - * The number of structural features of the 'Spatial Relation' class. - * - * - * @generated - * @ordered - */ - int SPATIAL_RELATION_FEATURE_COUNT = RELATION_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Spatial Relation' class. - * - * - * @generated - * @ordered - */ - int SPATIAL_RELATION_OPERATION_COUNT = RELATION_OPERATION_COUNT + 0; - - /** - * The meta object id for the '{@link crossingScenario.impl.TemporalRelationImpl Temporal Relation}' class. - * - * - * @see crossingScenario.impl.TemporalRelationImpl - * @see crossingScenario.impl.CrossingScenarioPackageImpl#getTemporalRelation() - * @generated - */ - int TEMPORAL_RELATION = 5; - - /** - * The feature id for the 'Target' reference. - * - * - * @generated - * @ordered - */ - int TEMPORAL_RELATION__TARGET = RELATION__TARGET; - - /** - * The feature id for the 'Source' reference. - * - * - * @generated - * @ordered - */ - int TEMPORAL_RELATION__SOURCE = RELATION__SOURCE; - - /** - * The number of structural features of the 'Temporal Relation' class. - * - * - * @generated - * @ordered - */ - int TEMPORAL_RELATION_FEATURE_COUNT = RELATION_FEATURE_COUNT + 0; - - /** - * The number of operations of the 'Temporal Relation' class. - * - * - * @generated - * @ordered - */ - int TEMPORAL_RELATION_OPERATION_COUNT = RELATION_OPERATION_COUNT + 0; - /** * The meta object id for the '{@link crossingScenario.impl.VisionBlockedImpl Vision Blocked}' class. * @@ -466,7 +374,7 @@ public interface CrossingScenarioPackage extends EPackage { * @see crossingScenario.impl.CrossingScenarioPackageImpl#getVisionBlocked() * @generated */ - int VISION_BLOCKED = 6; + int VISION_BLOCKED = 4; /** * The feature id for the 'Target' reference. @@ -475,7 +383,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int VISION_BLOCKED__TARGET = SPATIAL_RELATION__TARGET; + int VISION_BLOCKED__TARGET = RELATION__TARGET; /** * The feature id for the 'Source' reference. @@ -484,7 +392,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int VISION_BLOCKED__SOURCE = SPATIAL_RELATION__SOURCE; + int VISION_BLOCKED__SOURCE = RELATION__SOURCE; /** * The feature id for the 'Blocked By' reference. @@ -493,7 +401,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int VISION_BLOCKED__BLOCKED_BY = SPATIAL_RELATION_FEATURE_COUNT + 0; + int VISION_BLOCKED__BLOCKED_BY = RELATION_FEATURE_COUNT + 0; /** * The number of structural features of the 'Vision Blocked' class. @@ -502,7 +410,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int VISION_BLOCKED_FEATURE_COUNT = SPATIAL_RELATION_FEATURE_COUNT + 1; + int VISION_BLOCKED_FEATURE_COUNT = RELATION_FEATURE_COUNT + 1; /** * The number of operations of the 'Vision Blocked' class. @@ -511,7 +419,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int VISION_BLOCKED_OPERATION_COUNT = SPATIAL_RELATION_OPERATION_COUNT + 0; + int VISION_BLOCKED_OPERATION_COUNT = RELATION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link crossingScenario.impl.CollisionExistsImpl Collision Exists}' class. @@ -521,7 +429,7 @@ public interface CrossingScenarioPackage extends EPackage { * @see crossingScenario.impl.CrossingScenarioPackageImpl#getCollisionExists() * @generated */ - int COLLISION_EXISTS = 7; + int COLLISION_EXISTS = 5; /** * The feature id for the 'Target' reference. @@ -530,7 +438,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int COLLISION_EXISTS__TARGET = TEMPORAL_RELATION__TARGET; + int COLLISION_EXISTS__TARGET = RELATION__TARGET; /** * The feature id for the 'Source' reference. @@ -539,7 +447,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int COLLISION_EXISTS__SOURCE = TEMPORAL_RELATION__SOURCE; + int COLLISION_EXISTS__SOURCE = RELATION__SOURCE; /** * The feature id for the 'Collision Time' attribute. @@ -548,7 +456,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int COLLISION_EXISTS__COLLISION_TIME = TEMPORAL_RELATION_FEATURE_COUNT + 0; + int COLLISION_EXISTS__COLLISION_TIME = RELATION_FEATURE_COUNT + 0; /** * The number of structural features of the 'Collision Exists' class. @@ -557,7 +465,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int COLLISION_EXISTS_FEATURE_COUNT = TEMPORAL_RELATION_FEATURE_COUNT + 1; + int COLLISION_EXISTS_FEATURE_COUNT = RELATION_FEATURE_COUNT + 1; /** * The number of operations of the 'Collision Exists' class. @@ -566,7 +474,7 @@ public interface CrossingScenarioPackage extends EPackage { * @generated * @ordered */ - int COLLISION_EXISTS_OPERATION_COUNT = TEMPORAL_RELATION_OPERATION_COUNT + 0; + int COLLISION_EXISTS_OPERATION_COUNT = RELATION_OPERATION_COUNT + 0; /** * The meta object id for the '{@link crossingScenario.impl.PedestrianImpl Pedestrian}' class. @@ -576,7 +484,7 @@ public interface CrossingScenarioPackage extends EPackage { * @see crossingScenario.impl.CrossingScenarioPackageImpl#getPedestrian() * @generated */ - int PEDESTRIAN = 8; + int PEDESTRIAN = 6; /** * The feature id for the 'XPos' attribute. @@ -694,7 +602,7 @@ public interface CrossingScenarioPackage extends EPackage { * @see crossingScenario.impl.CrossingScenarioPackageImpl#getVehicle() * @generated */ - int VEHICLE = 9; + int VEHICLE = 7; /** * The feature id for the 'XPos' attribute. @@ -812,7 +720,7 @@ public interface CrossingScenarioPackage extends EPackage { * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane_Horizontal() * @generated */ - int LANE_HORIZONTAL = 10; + int LANE_HORIZONTAL = 8; /** * The feature id for the 'Reference Coord' attribute. @@ -858,7 +766,7 @@ public interface CrossingScenarioPackage extends EPackage { * @see crossingScenario.impl.CrossingScenarioPackageImpl#getLane_Vertical() * @generated */ - int LANE_VERTICAL = 11; + int LANE_VERTICAL = 9; /** * The feature id for the 'Reference Coord' attribute. @@ -1179,26 +1087,6 @@ public interface CrossingScenarioPackage extends EPackage { */ EReference getRelation_Source(); - /** - * Returns the meta object for class '{@link crossingScenario.SpatialRelation Spatial Relation}'. - * - * - * @return the meta object for class 'Spatial Relation'. - * @see crossingScenario.SpatialRelation - * @generated - */ - EClass getSpatialRelation(); - - /** - * Returns the meta object for class '{@link crossingScenario.TemporalRelation Temporal Relation}'. - * - * - * @return the meta object for class 'Temporal Relation'. - * @see crossingScenario.TemporalRelation - * @generated - */ - EClass getTemporalRelation(); - /** * Returns the meta object for class '{@link crossingScenario.VisionBlocked Vision Blocked}'. * @@ -1520,26 +1408,6 @@ public interface CrossingScenarioPackage extends EPackage { */ EReference RELATION__SOURCE = eINSTANCE.getRelation_Source(); - /** - * The meta object literal for the '{@link crossingScenario.impl.SpatialRelationImpl Spatial Relation}' class. - * - * - * @see crossingScenario.impl.SpatialRelationImpl - * @see crossingScenario.impl.CrossingScenarioPackageImpl#getSpatialRelation() - * @generated - */ - EClass SPATIAL_RELATION = eINSTANCE.getSpatialRelation(); - - /** - * The meta object literal for the '{@link crossingScenario.impl.TemporalRelationImpl Temporal Relation}' class. - * - * - * @see crossingScenario.impl.TemporalRelationImpl - * @see crossingScenario.impl.CrossingScenarioPackageImpl#getTemporalRelation() - * @generated - */ - EClass TEMPORAL_RELATION = eINSTANCE.getTemporalRelation(); - /** * The meta object literal for the '{@link crossingScenario.impl.VisionBlockedImpl Vision Blocked}' class. * diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/SpatialRelation.java b/Domains/crossingScenario/ecore-gen/crossingScenario/SpatialRelation.java deleted file mode 100644 index fa13137d..00000000 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/SpatialRelation.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package crossingScenario; - - -/** - * - * A representation of the model object 'Spatial Relation'. - * - * - * - * @see crossingScenario.CrossingScenarioPackage#getSpatialRelation() - * @model abstract="true" - * @generated - */ -public interface SpatialRelation extends Relation { -} // SpatialRelation diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/TemporalRelation.java b/Domains/crossingScenario/ecore-gen/crossingScenario/TemporalRelation.java deleted file mode 100644 index 3a537975..00000000 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/TemporalRelation.java +++ /dev/null @@ -1,17 +0,0 @@ -/** - */ -package crossingScenario; - - -/** - * - * A representation of the model object 'Temporal Relation'. - * - * - * - * @see crossingScenario.CrossingScenarioPackage#getTemporalRelation() - * @model abstract="true" - * @generated - */ -public interface TemporalRelation extends Relation { -} // TemporalRelation diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/VisionBlocked.java b/Domains/crossingScenario/ecore-gen/crossingScenario/VisionBlocked.java index bacbf77f..7b9ba907 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/VisionBlocked.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/VisionBlocked.java @@ -19,7 +19,7 @@ package crossingScenario; * @model * @generated */ -public interface VisionBlocked extends SpatialRelation { +public interface VisionBlocked extends Relation { /** * Returns the value of the 'Blocked By' reference. * diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CollisionExistsImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CollisionExistsImpl.java index a643f25f..612b86dc 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CollisionExistsImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CollisionExistsImpl.java @@ -24,7 +24,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * * @generated */ -public class CollisionExistsImpl extends TemporalRelationImpl implements CollisionExists { +public class CollisionExistsImpl extends RelationImpl implements CollisionExists { /** * The default value of the '{@link #getCollisionTime() Collision Time}' attribute. * diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java index 24dfa5ef..7f8f7357 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/CrossingScenarioPackageImpl.java @@ -12,8 +12,6 @@ import crossingScenario.Lane_Horizontal; import crossingScenario.Lane_Vertical; import crossingScenario.Pedestrian; import crossingScenario.Relation; -import crossingScenario.SpatialRelation; -import crossingScenario.TemporalRelation; import crossingScenario.Vehicle; import crossingScenario.VisionBlocked; @@ -59,20 +57,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin */ private EClass relationEClass = null; - /** - * - * - * @generated - */ - private EClass spatialRelationEClass = null; - - /** - * - * - * @generated - */ - private EClass temporalRelationEClass = null; - /** * * @@ -436,26 +420,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin return (EReference)relationEClass.getEStructuralFeatures().get(1); } - /** - * - * - * @generated - */ - @Override - public EClass getSpatialRelation() { - return spatialRelationEClass; - } - - /** - * - * - * @generated - */ - @Override - public EClass getTemporalRelation() { - return temporalRelationEClass; - } - /** * * @@ -595,10 +559,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin createEReference(relationEClass, RELATION__TARGET); createEReference(relationEClass, RELATION__SOURCE); - spatialRelationEClass = createEClass(SPATIAL_RELATION); - - temporalRelationEClass = createEClass(TEMPORAL_RELATION); - visionBlockedEClass = createEClass(VISION_BLOCKED); createEReference(visionBlockedEClass, VISION_BLOCKED__BLOCKED_BY); @@ -642,10 +602,8 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin // Set bounds for type parameters // Add supertypes to classes - spatialRelationEClass.getESuperTypes().add(this.getRelation()); - temporalRelationEClass.getESuperTypes().add(this.getRelation()); - visionBlockedEClass.getESuperTypes().add(this.getSpatialRelation()); - collisionExistsEClass.getESuperTypes().add(this.getTemporalRelation()); + visionBlockedEClass.getESuperTypes().add(this.getRelation()); + collisionExistsEClass.getESuperTypes().add(this.getRelation()); pedestrianEClass.getESuperTypes().add(this.getActor()); vehicleEClass.getESuperTypes().add(this.getActor()); lane_HorizontalEClass.getESuperTypes().add(this.getLane()); @@ -682,10 +640,6 @@ public class CrossingScenarioPackageImpl extends EPackageImpl implements Crossin 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); initEReference(getRelation_Source(), this.getActor(), null, "source", null, 1, 1, Relation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); - initEClass(spatialRelationEClass, SpatialRelation.class, "SpatialRelation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - - initEClass(temporalRelationEClass, TemporalRelation.class, "TemporalRelation", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); - initEClass(visionBlockedEClass, VisionBlocked.class, "VisionBlocked", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); initEReference(getVisionBlocked_BlockedBy(), this.getActor(), null, "blockedBy", null, 1, 1, VisionBlocked.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SpatialRelationImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SpatialRelationImpl.java deleted file mode 100644 index b1cb271d..00000000 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/SpatialRelationImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package crossingScenario.impl; - -import crossingScenario.CrossingScenarioPackage; -import crossingScenario.SpatialRelation; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Spatial Relation'. - * - * - * @generated - */ -public abstract class SpatialRelationImpl extends RelationImpl implements SpatialRelation { - /** - * - * - * @generated - */ - protected SpatialRelationImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return CrossingScenarioPackage.Literals.SPATIAL_RELATION; - } - -} //SpatialRelationImpl diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/TemporalRelationImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/TemporalRelationImpl.java deleted file mode 100644 index c4366543..00000000 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/TemporalRelationImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -/** - */ -package crossingScenario.impl; - -import crossingScenario.CrossingScenarioPackage; -import crossingScenario.TemporalRelation; - -import org.eclipse.emf.ecore.EClass; - -/** - * - * An implementation of the model object 'Temporal Relation'. - * - * - * @generated - */ -public abstract class TemporalRelationImpl extends RelationImpl implements TemporalRelation { - /** - * - * - * @generated - */ - protected TemporalRelationImpl() { - super(); - } - - /** - * - * - * @generated - */ - @Override - protected EClass eStaticClass() { - return CrossingScenarioPackage.Literals.TEMPORAL_RELATION; - } - -} //TemporalRelationImpl diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/VisionBlockedImpl.java b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/VisionBlockedImpl.java index e5cb4004..0709cedc 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/impl/VisionBlockedImpl.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/impl/VisionBlockedImpl.java @@ -26,7 +26,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl; * * @generated */ -public class VisionBlockedImpl extends SpatialRelationImpl implements VisionBlocked { +public class VisionBlockedImpl extends RelationImpl implements VisionBlocked { /** * The cached value of the '{@link #getBlockedBy() Blocked By}' reference. * diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java index b46b9e98..e26eedc8 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioAdapterFactory.java @@ -84,14 +84,6 @@ public class CrossingScenarioAdapterFactory extends AdapterFactoryImpl { return createRelationAdapter(); } @Override - public Adapter caseSpatialRelation(SpatialRelation object) { - return createSpatialRelationAdapter(); - } - @Override - public Adapter caseTemporalRelation(TemporalRelation object) { - return createTemporalRelationAdapter(); - } - @Override public Adapter caseVisionBlocked(VisionBlocked object) { return createVisionBlockedAdapter(); } @@ -191,34 +183,6 @@ public class CrossingScenarioAdapterFactory extends AdapterFactoryImpl { return null; } - /** - * Creates a new adapter for an object of class '{@link crossingScenario.SpatialRelation Spatial Relation}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see crossingScenario.SpatialRelation - * @generated - */ - public Adapter createSpatialRelationAdapter() { - return null; - } - - /** - * Creates a new adapter for an object of class '{@link crossingScenario.TemporalRelation Temporal Relation}'. - * - * This default implementation returns null so that we can easily ignore cases; - * it's useful to ignore a case when inheritance will catch all the cases anyway. - * - * @return the new adapter. - * @see crossingScenario.TemporalRelation - * @generated - */ - public Adapter createTemporalRelationAdapter() { - return null; - } - /** * Creates a new adapter for an object of class '{@link crossingScenario.VisionBlocked Vision Blocked}'. * diff --git a/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java index 3340d7b1..7ed36be3 100644 --- a/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java +++ b/Domains/crossingScenario/ecore-gen/crossingScenario/util/CrossingScenarioSwitch.java @@ -90,24 +90,9 @@ public class CrossingScenarioSwitch extends Switch { if (result == null) result = defaultCase(theEObject); return result; } - case CrossingScenarioPackage.SPATIAL_RELATION: { - SpatialRelation spatialRelation = (SpatialRelation)theEObject; - T result = caseSpatialRelation(spatialRelation); - if (result == null) result = caseRelation(spatialRelation); - if (result == null) result = defaultCase(theEObject); - return result; - } - case CrossingScenarioPackage.TEMPORAL_RELATION: { - TemporalRelation temporalRelation = (TemporalRelation)theEObject; - T result = caseTemporalRelation(temporalRelation); - if (result == null) result = caseRelation(temporalRelation); - if (result == null) result = defaultCase(theEObject); - return result; - } case CrossingScenarioPackage.VISION_BLOCKED: { VisionBlocked visionBlocked = (VisionBlocked)theEObject; T result = caseVisionBlocked(visionBlocked); - if (result == null) result = caseSpatialRelation(visionBlocked); if (result == null) result = caseRelation(visionBlocked); if (result == null) result = defaultCase(theEObject); return result; @@ -115,7 +100,6 @@ public class CrossingScenarioSwitch extends Switch { case CrossingScenarioPackage.COLLISION_EXISTS: { CollisionExists collisionExists = (CollisionExists)theEObject; T result = caseCollisionExists(collisionExists); - if (result == null) result = caseTemporalRelation(collisionExists); if (result == null) result = caseRelation(collisionExists); if (result == null) result = defaultCase(theEObject); return result; @@ -212,36 +196,6 @@ public class CrossingScenarioSwitch extends Switch { return null; } - /** - * Returns the result of interpreting the object as an instance of 'Spatial Relation'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Spatial Relation'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseSpatialRelation(SpatialRelation object) { - return null; - } - - /** - * Returns the result of interpreting the object as an instance of 'Temporal Relation'. - * - * This implementation returns null; - * returning a non-null result will terminate the switch. - * - * @param object the target of the switch. - * @return the result of interpreting the object as an instance of 'Temporal Relation'. - * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject) - * @generated - */ - public T caseTemporalRelation(TemporalRelation object) { - return null; - } - /** * Returns the result of interpreting the object as an instance of 'Vision Blocked'. * diff --git a/Domains/crossingScenario/model/crossingScenario class diagram.png b/Domains/crossingScenario/model/crossingScenario class diagram.png new file mode 100644 index 00000000..02a05d1d Binary files /dev/null and b/Domains/crossingScenario/model/crossingScenario class diagram.png differ diff --git a/Domains/crossingScenario/model/crossingScenario class diagram.svg b/Domains/crossingScenario/model/crossingScenario class diagram.svg new file mode 100644 index 00000000..e63517ad --- /dev/null +++ b/Domains/crossingScenario/model/crossingScenario class diagram.svg @@ -0,0 +1,549 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CrossingScenario + + xSize : EDouble = 0.0 + + ySize : EDouble = 0.0 + + maxTime : EDouble = 0.0 + + maxXSpeed : EDouble = 0.0 + + maxYSpeed : EDouble = 0.0 + + + + + + + Lane + + referenceCoord : EDouble = 0.0 + + + + + + + Actor + + xPos : EDouble = 0.0 + + yPos : EDouble = 0.0 + + length : EDouble = 0.0 + + width : EDouble = 0.0 + + xSpeed : EDouble = 0.0 + + ySpeed : EDouble = 0.0 + + + + + + + Relation + + + + + + + VisionBlocked + + + + + + + CollisionExists + + collisionTime : EDouble = 0.0 + + + + + + + Pedestrian + + + + + + + Vehicle + + + + + + + Lane_Horizontal + + + + + + + Lane_Vertical + + + + [0..*] actors + + + + + + [0..*] lanes + + + + + + [1..1] target + + + + [1..1] blockedBy + + + + + + + + + + + + + + [1..1] placedOn + [0..*] actors + + + + + + + + + + + + + + + + [0..*] relations + + + + + + + + [0..*] /dist_near + + + + + + [0..*] /dist_med + + + + + + [0..*] /dist_far + + + + [1..1] source + + + + + + + + + + + + + + + diff --git a/Domains/crossingScenario/model/crossingScenario.aird b/Domains/crossingScenario/model/crossingScenario.aird index 9e8a8708..e97201b0 100644 --- a/Domains/crossingScenario/model/crossingScenario.aird +++ b/Domains/crossingScenario/model/crossingScenario.aird @@ -5,7 +5,7 @@ crossingScenario.genmodel - + @@ -145,24 +145,6 @@ - - - - - - - - - - - - - - - - - - @@ -451,70 +433,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -739,21 +657,37 @@ - - - - - - - + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + @@ -888,7 +822,7 @@ - + KEEP_LOCATION @@ -900,31 +834,7 @@ - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - italic - - - - - - - - KEEP_LOCATION - KEEP_SIZE - KEEP_RATIO - - italic - - - - - + KEEP_LOCATION @@ -935,7 +845,7 @@ - + KEEP_LOCATION @@ -1030,54 +940,6 @@ - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - - - italic - - - - - - - - - - - - italic - - - - - @@ -1206,6 +1068,30 @@ + + + + + + + italic + + + + + + + + + + + + italic + + + + + diff --git a/Domains/crossingScenario/model/crossingScenario.ecore b/Domains/crossingScenario/model/crossingScenario.ecore index 22a9714b..9f979b96 100644 --- a/Domains/crossingScenario/model/crossingScenario.ecore +++ b/Domains/crossingScenario/model/crossingScenario.ecore @@ -48,13 +48,11 @@ - - - + - + diff --git a/Domains/crossingScenario/model/crossingScenario.genmodel b/Domains/crossingScenario/model/crossingScenario.genmodel index e216652d..1f2368a9 100644 --- a/Domains/crossingScenario/model/crossingScenario.genmodel +++ b/Domains/crossingScenario/model/crossingScenario.genmodel @@ -36,8 +36,6 @@ - - diff --git a/Domains/crossingScenario/model/crossingScenario2.aird b/Domains/crossingScenario/model/crossingScenario2.aird new file mode 100644 index 00000000..f278e603 --- /dev/null +++ b/Domains/crossingScenario/model/crossingScenario2.aird @@ -0,0 +1,874 @@ + + + + crossingScenario.ecore + crossingScenario.genmodel + + + + + + + + + + + + + + + + + + + + + + + bold + + + + + + + + + + + + + + + + bold + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + bold + + + + + + + + bold + + + + + + + + bold + + + + + + + + bold + + + + + + + + bold + + + + + + + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + italic + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + bold + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + + + labelSize + + + + + + + + + + labelSize + bold + + + labelSize + + + + + + + + + + labelSize + bold + + + labelSize + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + KEEP_LOCATION + KEEP_SIZE + KEEP_RATIO + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bold + + + + + + + + + + + + italic + + + + + + + + + + + + italic + + + + + + + + + + + + + + -- cgit v1.2.3-70-g09d2