diff options
author | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-01-21 06:47:08 +0100 |
---|---|---|
committer | Aren Babikian <aren.babikian@mail.mcgill.ca> | 2021-01-21 06:47:08 +0100 |
commit | 278ad1aa5f8cff85604f98c2a2e7269753cdbd47 (patch) | |
tree | 0d5d4dafd94d3deec4d845ffb7fcfeebb9aad8ac /Domains/crossingScenario/model/crossingScenario.ecore | |
parent | Add drawing of generated scenarios (diff) | |
download | VIATRA-Generator-278ad1aa5f8cff85604f98c2a2e7269753cdbd47.tar.gz VIATRA-Generator-278ad1aa5f8cff85604f98c2a2e7269753cdbd47.tar.zst VIATRA-Generator-278ad1aa5f8cff85604f98c2a2e7269753cdbd47.zip |
Major MM update + Refactor VQL + post-meeting approach change
Diffstat (limited to 'Domains/crossingScenario/model/crossingScenario.ecore')
-rw-r--r-- | Domains/crossingScenario/model/crossingScenario.ecore | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/Domains/crossingScenario/model/crossingScenario.ecore b/Domains/crossingScenario/model/crossingScenario.ecore index b023a2fa..c1aab2b8 100644 --- a/Domains/crossingScenario/model/crossingScenario.ecore +++ b/Domains/crossingScenario/model/crossingScenario.ecore | |||
@@ -10,25 +10,14 @@ | |||
10 | <eStructuralFeatures xsi:type="ecore:EReference" name="lanes" upperBound="-1" | 10 | <eStructuralFeatures xsi:type="ecore:EReference" name="lanes" upperBound="-1" |
11 | eType="#//Lane" containment="true"/> | 11 | eType="#//Lane" containment="true"/> |
12 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> | 12 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> |
13 | <eStructuralFeatures xsi:type="ecore:EReference" name="horizontal_head" lowerBound="1" | 13 | <eStructuralFeatures xsi:type="ecore:EReference" name="relations" upperBound="-1" |
14 | eType="#//Lane_Horizontal"/> | 14 | eType="#//Relation" containment="true"/> |
15 | <eStructuralFeatures xsi:type="ecore:EReference" name="vertical_head" lowerBound="1" | ||
16 | eType="#//Lane_Vertical"/> | ||
17 | </eClassifiers> | 15 | </eClassifiers> |
18 | <eClassifiers xsi:type="ecore:EClass" name="Lane" abstract="true"> | 16 | <eClassifiers xsi:type="ecore:EClass" name="Lane" abstract="true"> |
19 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" lowerBound="1" eType="#//Size"/> | ||
20 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceCoord" lowerBound="1" | 17 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceCoord" lowerBound="1" |
21 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> | 18 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> |
22 | <eStructuralFeatures xsi:type="ecore:EReference" name="prevLane" eType="#//Lane"/> | ||
23 | <eStructuralFeatures xsi:type="ecore:EReference" name="actors" upperBound="-1" | 19 | <eStructuralFeatures xsi:type="ecore:EReference" name="actors" upperBound="-1" |
24 | eType="#//Actor" eOpposite="#//Actor/placedOn"/> | 20 | eType="#//Actor" eOpposite="#//Actor/placedOn"/> |
25 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="numWidth" lowerBound="1" | ||
26 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="0.0"/> | ||
27 | </eClassifiers> | ||
28 | <eClassifiers xsi:type="ecore:EEnum" name="Size"> | ||
29 | <eLiterals name="S_Small"/> | ||
30 | <eLiterals name="S_Med" value="1"/> | ||
31 | <eLiterals name="S_Large" value="2"/> | ||
32 | </eClassifiers> | 21 | </eClassifiers> |
33 | <eClassifiers xsi:type="ecore:EClass" name="Actor" abstract="true"> | 22 | <eClassifiers xsi:type="ecore:EClass" name="Actor" abstract="true"> |
34 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="xPos" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> | 23 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="xPos" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> |
@@ -38,16 +27,22 @@ | |||
38 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> | 27 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> |
39 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="xSpeed" lowerBound="1" | 28 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="xSpeed" lowerBound="1" |
40 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="0.0"/> | 29 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="0.0"/> |
41 | <eStructuralFeatures xsi:type="ecore:EReference" name="relations" upperBound="-1" | ||
42 | eType="#//Relation" containment="true"/> | ||
43 | <eStructuralFeatures xsi:type="ecore:EReference" name="placedOn" lowerBound="1" | 30 | <eStructuralFeatures xsi:type="ecore:EReference" name="placedOn" lowerBound="1" |
44 | eType="#//Lane" eOpposite="#//Lane/actors"/> | 31 | eType="#//Lane" eOpposite="#//Lane/actors"/> |
45 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="ySpeed" lowerBound="1" | 32 | <eStructuralFeatures xsi:type="ecore:EAttribute" name="ySpeed" lowerBound="1" |
46 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> | 33 | eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/> |
34 | <eStructuralFeatures xsi:type="ecore:EReference" name="dist_near" upperBound="-1" | ||
35 | eType="#//Actor" volatile="true" transient="true" derived="true"/> | ||
36 | <eStructuralFeatures xsi:type="ecore:EReference" name="dist_med" upperBound="-1" | ||
37 | eType="#//Actor" volatile="true" transient="true" derived="true"/> | ||
38 | <eStructuralFeatures xsi:type="ecore:EReference" name="dist_far" upperBound="-1" | ||
39 | eType="#//Actor" volatile="true" transient="true" derived="true"/> | ||
47 | </eClassifiers> | 40 | </eClassifiers> |
48 | <eClassifiers xsi:type="ecore:EClass" name="Relation" abstract="true"> | 41 | <eClassifiers xsi:type="ecore:EClass" name="Relation" abstract="true"> |
49 | <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1" | 42 | <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1" |
50 | eType="#//Actor"/> | 43 | eType="#//Actor"/> |
44 | <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1" | ||
45 | eType="#//Actor"/> | ||
51 | </eClassifiers> | 46 | </eClassifiers> |
52 | <eClassifiers xsi:type="ecore:EClass" name="SpatialRelation" abstract="true" eSuperTypes="#//Relation"/> | 47 | <eClassifiers xsi:type="ecore:EClass" name="SpatialRelation" abstract="true" eSuperTypes="#//Relation"/> |
53 | <eClassifiers xsi:type="ecore:EClass" name="TemporalRelation" abstract="true" eSuperTypes="#//Relation"/> | 48 | <eClassifiers xsi:type="ecore:EClass" name="TemporalRelation" abstract="true" eSuperTypes="#//Relation"/> |