From 86518413bed5988092b30d1139bb72ef302ae09c Mon Sep 17 00:00:00 2001
From: Aren Babikian <aren.babikian@mail.mcgill.ca>
Date: Sun, 17 Jan 2021 01:16:26 -0500
Subject: complete queries for lane structure

---
 Domains/crossingScenario/model/crossingScenario.ecore | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'Domains/crossingScenario/model/crossingScenario.ecore')

diff --git a/Domains/crossingScenario/model/crossingScenario.ecore b/Domains/crossingScenario/model/crossingScenario.ecore
index d9d97470..f651db9f 100644
--- a/Domains/crossingScenario/model/crossingScenario.ecore
+++ b/Domains/crossingScenario/model/crossingScenario.ecore
@@ -10,10 +10,12 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="lanes" upperBound="-1"
         eType="#//Lane" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="maxTime" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="horizontal_head" lowerBound="1"
+        eType="#//Lane_Horizontal"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="vertical_head" lowerBound="1"
+        eType="#//Lane_Vertical"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Lane">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="orientation" lowerBound="1"
-        eType="#//Orientation"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Lane" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" lowerBound="1" eType="#//Size"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="referenceCoord" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
@@ -23,10 +25,6 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="numWidth" lowerBound="1"
         eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble" defaultValueLiteral="0.0"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Orientation">
-    <eLiterals name="Vertical"/>
-    <eLiterals name="Horizontal" value="1"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="Size">
     <eLiterals name="S_Small"/>
     <eLiterals name="S_Med" value="1"/>
@@ -75,4 +73,6 @@
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Pedestrian" eSuperTypes="#//Actor"/>
   <eClassifiers xsi:type="ecore:EClass" name="Vehicle" eSuperTypes="#//Actor"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Lane_Horizontal" eSuperTypes="#//Lane"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Lane_Vertical" eSuperTypes="#//Lane"/>
 </ecore:EPackage>
-- 
cgit v1.2.3-70-g09d2