Commit fb9a7741 authored by Ådne Karstad's avatar Ådne Karstad

refactor(model): Add mandatory- and elective courses attribute in Specialization

parent 705d3c9c
# Project 2: M2T
## Changelog on model from project 1
- Added a bunch of new examples in the model.
- Added mandatory- and elective courses to specialization. Referencing Course and one specialization can reference many courses in both attributes.
## Simplifications
- Lektor i Realfag simplified by just modelling the Informatics and mathematics specialization with Informatics as main topic.
......
......@@ -6,30 +6,6 @@
xmlns:spp="platform:/plugin/tdt4250.spp.model/model/spp.ecore"
xsi:schemaLocation="platform:/plugin/tdt4250.spp.model/model/spp.ecore spp.ecore"
name="NTNU">
<programs
name="Bachelor in IT">
<semesters
selectedCourses="//@institutes.0/@courses.0 //@institutes.0/@courses.12"/>
<semesters
semester="2"
season="Spring"
selectedCourses="//@institutes.0/@courses.4 //@institutes.1/@courses.5"/>
<semesters
semester="3"
selectedCourses="//@institutes.0/@courses.5 //@institutes.1/@courses.2"/>
<semesters
semester="4"
season="Spring"/>
<semesters
semester="5"/>
<semesters
semester="6"
season="Spring"/>
<mandatoryCourses
courses="//@institutes.0/@courses.0 //@institutes.0/@courses.3 //@institutes.0/@courses.4 //@institutes.0/@courses.5 //@institutes.0/@courses.12"/>
<electiveCourses
courses="//@institutes.0/@courses.1 //@institutes.0/@courses.2 //@institutes.0/@courses.6 //@institutes.1/@courses.3 //@institutes.1/@courses.4 //@institutes.1/@courses.5"/>
</programs>
<programs
name="Lektor i Realfag"
duration="IntegratedMasters">
......@@ -67,13 +43,34 @@
semester="10"
season="Spring"
selectedCourses="//@institutes.0/@courses.26"/>
<specialisation
name="Matematikk og Informatikk"/>
<mandatoryCourses
courses="//@institutes.0/@courses.0 //@institutes.1/@courses.0 //@institutes.1/@courses.1 //@institutes.1/@courses.4 //@institutes.1/@courses.3 //@institutes.1/@courses.5 //@institutes.2/@courses.0 //@institutes.2/@courses.2 //@institutes.2/@courses.7 //@institutes.2/@courses.1 //@institutes.2/@courses.3 //@institutes.2/@courses.4 //@institutes.0/@courses.4 //@institutes.1/@courses.6 //@institutes.0/@courses.5 //@institutes.0/@courses.13 //@institutes.1/@courses.7 //@institutes.2/@courses.5 //@institutes.2/@courses.6 //@institutes.2/@courses.9 //@institutes.2/@courses.10 //@institutes.1/@courses.8 //@institutes.0/@courses.11 //@institutes.3/@courses.0 //@institutes.0/@courses.26 //@institutes.2/@courses.13"/>
<electiveCourses
courses="//@institutes.0/@courses.25 //@institutes.2/@courses.11 //@institutes.2/@courses.12 //@institutes.0/@courses.17 //@institutes.0/@courses.18 //@institutes.0/@courses.1 //@institutes.0/@courses.14 //@institutes.0/@courses.15 //@institutes.0/@courses.21 //@institutes.0/@courses.23 //@institutes.0/@courses.2 //@institutes.0/@courses.19 //@institutes.0/@courses.24 //@institutes.0/@courses.16"/>
</programs>
<programs
name="Master i informatikk"
duration="Master">
<semesters/>
<semesters
semester="2"
season="Spring"/>
<semesters
semester="3"/>
<semesters
semester="4"
season="Spring"/>
<specialisation
name="Software"
mandatoryCourses="//@institutes.0/@courses.2 //@institutes.0/@courses.27 //@institutes.0/@courses.14 //@institutes.0/@courses.28"/>
<specialisation
name="Interaction Design, Game and Learning Technology"
mandatoryCourses="//@institutes.0/@courses.31 //@institutes.0/@courses.27 //@institutes.0/@courses.24 //@institutes.0/@courses.29"/>
<specialisation
name="Databases and Search"/>
<specialisation
name="Artificial Intelligence"/>
</programs>
<institutes
name="Institutt for datateknologi og informatikk">
<courses
......@@ -210,6 +207,35 @@
credits="30.0"
level="SecoundDegreeCourse"
season="Both"/>
<courses
code="IT3010"
name="Metoder for forskningsbasert innovasjon i IT"
credits="7.5"
level="SecoundDegreeCourse"
season="Spring"/>
<courses
code="IT3901"
name="Masteroppgave i informatikk: Programvaresystemer"
credits="60.0"
level="SecoundDegreeCourse"
season="Both"/>
<courses
code="IT3402 "
name="Design av grafiske brukergrensesnitt"
credits="7.5"
level="SecoundDegreeCourse"/>
<courses
code="TDT4245 "
name="Samhandlingsteknologi og sosiale medier"
credits="7.5"
level="SecoundDegreeCourse"
season="Spring"/>
<courses
code="IT3906 "
name="Masteroppgave i informatikk: Interaksjonsdesign, spill- og læringsteknologi"
credits="60.0"
level="SecoundDegreeCourse"
season="Both"/>
</institutes>
<institutes
name="Institutt for matematiske fag">
......
......@@ -28,8 +28,8 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="duration" eType="#//LevelType"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="semesters" upperBound="-1"
eType="#//Semester" containment="true" eOpposite="#//Semester/program"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="specialisation" eType="#//Specialisation"
containment="true" eOpposite="#//Specialisation/program"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="specialisation" upperBound="20"
eType="#//Specialisation" containment="true" eOpposite="#//Specialisation/program"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mandatoryCourses" upperBound="-1"
eType="#//MandatoryCourses" containment="true" eOpposite="#//MandatoryCourses/program"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="electiveCourses" upperBound="-1"
......@@ -67,6 +67,10 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="program" eType="#//Program"
eOpposite="#//Program/specialisation"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="mandatoryCourses" upperBound="-1"
eType="#//Course"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="electiveCourses" upperBound="-1"
eType="#//Course"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="MandatoryCourses">
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment