Skip to content
Snippets Groups Projects
Commit f400c9bc authored by Justin's avatar Justin
Browse files

Merge branch 'master' of https://gitlab.cas.mcmaster.ca/kapinsje/pic-puzzle

parents 799120d9 991b30ee
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
GanttChart.png
+ 0
− 0
View replaced file @ 799120d9 View file @ f400c9bc
GanttChart.png

77 KiB | W: | H:

GanttChart.png

75.3 KiB | W: | H:

GanttChart.png
GanttChart.png
GanttChart.png
GanttChart.png
  • 2-up
  • Swipe
  • Onion skin
GanttProject.gan
+ 70
− 74
View file @ f400c9bc
<?xml version="1.0" encoding="UTF-8"?><project name="PCM" company="McMaster, CAS Department" webLink="" view-date="2015-11-01" view-index="0" gantt-divider-location="354" resource-divider-location="300" version="2.0" locale="en_US">
<?xml version="1.0" encoding="UTF-8"?><project name="PCM" company="McMaster, CAS Department" webLink="" view-date="2015-11-03" view-index="0" gantt-divider-location="302" resource-divider-location="300" version="2.7.1" locale="en_US">
<description><![CDATA[Simulation of temperature over time for a solar water heating tank incorporating phase change material (PCM).]]></description>
<view zooming-state="default:5" id="gantt-chart">
<field id="tpd3" name="Name" width="57" order="0"/>
<field id="tpd4" name="Begin date" width="21" order="1"/>
<view zooming-state="default:0" id="gantt-chart">
<field id="tpd3" name="Name" width="56" order="0"/>
<field id="tpd4" name="Begin date" width="22" order="1"/>
<field id="tpd5" name="End date" width="21" order="2"/>
</view>
<view id="resource-table">
<field id="0" name="Name" width="50" order="0"/>
<field id="1" name="Default role" width="49" order="1"/>
<field id="1" name="Default role" width="50" order="1"/>
</view>
<!-- -->
<calendars>
<day-types>
<day-type id="0"/>
<day-type id="1"/>
<calendar id="1" name="default">
<default-week sun="0" mon="0" tue="0" wed="0" thu="0" fri="0" sat="0"/>
<only-show-weekends value="false"/>
<overriden-day-types/>
<days/>
</calendar>
<default-week id="1" name="default" sun="0" mon="0" tue="0" wed="0" thu="0" fri="0" sat="0"/>
<only-show-weekends value="false"/>
<overriden-day-types/>
<days/>
</day-types>
</calendars>
<tasks empty-milestones="true">
......@@ -56,14 +54,14 @@
<task id="51" name="Output Format Module" color="#8cb6ce" meeting="false" start="2015-11-07" duration="5" complete="0" expand="true">
<depend id="64" type="2" difference="0" hardness="Strong"/>
</task>
<task id="57" name="Control Module" meeting="false" start="2015-11-07" duration="5" complete="0" expand="true"/>
<task id="57" name="Control Module" color="#8cb6ce" meeting="false" start="2015-11-07" duration="5" complete="0" expand="true"/>
</task>
<task id="61" name="Unit Testing" color="#8cb6ce" meeting="false" start="2015-11-12" duration="4" complete="0" expand="true">
<depend id="21" type="2" difference="0" hardness="Strong"/>
<depend id="68" type="2" difference="0" hardness="Strong"/>
<task id="62" name="Input Hiding Module" color="#8cb6ce" meeting="false" start="2015-11-12" duration="4" complete="0" expand="true"/>
<task id="63" name="Input Parameter Module" meeting="false" start="2015-11-12" duration="4" complete="0" expand="true"/>
<task id="64" name="Output Format Module" meeting="false" start="2015-11-12" duration="4" complete="0" expand="true"/>
<task id="63" name="Input Parameter Module" color="#8cb6ce" meeting="false" start="2015-11-12" duration="4" complete="0" expand="true"/>
<task id="64" name="Output Format Module" color="#8cb6ce" meeting="false" start="2015-11-12" duration="4" complete="0" expand="true"/>
</task>
<task id="68" name="System Testing" color="#8cb6ce" meeting="false" start="2015-11-16" duration="3" complete="0" expand="true">
<depend id="21" type="2" difference="0" hardness="Strong"/>
......@@ -107,77 +105,75 @@
<resource id="2" name="Yuchen" function="Default:0" contacts="" phone=""/>
</resources>
<allocations>
<allocation task-id="31" resource-id="0" function="Default:0" responsible="true" load="90.0"/>
<allocation task-id="32" resource-id="0" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="0" resource-id="0" function="Default:0" responsible="true" load="100.0"/>
<allocation task-id="68" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="21" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="69" resource-id="0" function="Default:0" responsible="true" load="100.0"/>
<allocation task-id="83" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="70" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="71" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="72" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="73" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="74" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="6" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="98" resource-id="0" function="Default:0" responsible="true" load="100.0"/>
<allocation task-id="8" resource-id="0" function="Default:0" responsible="true" load="100.0"/>
<allocation task-id="100" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="10" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="76" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="77" resource-id="0" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="31" resource-id="1" function="Default:0" responsible="false" load="50.0"/>
<allocation task-id="32" resource-id="1" function="Default:0" responsible="true" load="50.0"/>
<allocation task-id="0" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="68" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="21" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="69" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="83" resource-id="1" function="Default:0" responsible="true" load="100.0"/>
<allocation task-id="70" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="71" resource-id="1" function="Default:0" responsible="true" load="100.0"/>
<allocation task-id="72" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="73" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="74" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="6" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="98" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="8" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="100" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="10" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="76" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="77" resource-id="1" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="29" resource-id="2" function="Default:0" responsible="true" load="100.0"/>
<allocation task-id="0" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="68" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="21" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="69" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="83" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="70" resource-id="2" function="Default:0" responsible="true" load="100.0"/>
<allocation task-id="71" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="72" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="73" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="74" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="6" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="98" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="8" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="100" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="10" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="76" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="77" resource-id="2" function="Default:0" responsible="false" load="100.0"/>
<allocation task-id="31" resource-id="0" function="Default:0" responsible="true" load="50.0"/>
<allocation task-id="68" resource-id="0" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="21" resource-id="0" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="69" resource-id="0" function="Default:0" responsible="true" load="10.0"/>
<allocation task-id="83" resource-id="0" function="Default:0" responsible="true" load="10.0"/>
<allocation task-id="70" resource-id="0" function="Default:0" responsible="true" load="30.0"/>
<allocation task-id="71" resource-id="0" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="72" resource-id="0" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="73" resource-id="0" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="74" resource-id="0" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="98" resource-id="0" function="Default:0" responsible="true" load="30.0"/>
<allocation task-id="8" resource-id="0" function="Default:0" responsible="true" load="10.0"/>
<allocation task-id="100" resource-id="0" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="76" resource-id="0" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="77" resource-id="0" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="20" resource-id="0" function="Default:0" responsible="true" load="30.0"/>
<allocation task-id="57" resource-id="0" function="Default:0" responsible="true" load="10.0"/>
<allocation task-id="62" resource-id="0" function="Default:0" responsible="true" load="30.0"/>
<allocation task-id="32" resource-id="1" function="Default:0" responsible="true" load="30.0"/>
<allocation task-id="68" resource-id="1" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="21" resource-id="1" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="69" resource-id="1" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="83" resource-id="1" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="70" resource-id="1" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="71" resource-id="1" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="72" resource-id="1" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="73" resource-id="1" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="74" resource-id="1" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="98" resource-id="1" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="8" resource-id="1" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="100" resource-id="1" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="76" resource-id="1" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="77" resource-id="1" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="49" resource-id="1" function="Default:0" responsible="true" load="30.0"/>
<allocation task-id="63" resource-id="1" function="Default:0" responsible="true" load="30.0"/>
<allocation task-id="29" resource-id="2" function="Default:0" responsible="true" load="50.0"/>
<allocation task-id="68" resource-id="2" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="21" resource-id="2" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="69" resource-id="2" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="83" resource-id="2" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="70" resource-id="2" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="71" resource-id="2" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="72" resource-id="2" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="73" resource-id="2" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="74" resource-id="2" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="98" resource-id="2" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="8" resource-id="2" function="Default:0" responsible="false" load="10.0"/>
<allocation task-id="100" resource-id="2" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="76" resource-id="2" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="77" resource-id="2" function="Default:0" responsible="false" load="30.0"/>
<allocation task-id="51" resource-id="2" function="Default:0" responsible="true" load="30.0"/>
<allocation task-id="64" resource-id="2" function="Default:0" responsible="true" load="30.0"/>
</allocations>
<vacations/>
<taskdisplaycolumns>
<displaycolumn property-id="tpd2" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd6" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd3" order="0" width="158" visible="true"/>
<displaycolumn property-id="tpd4" order="1" width="62" visible="true"/>
<displaycolumn property-id="tpd7" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd8" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd6" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd12" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd5" order="2" width="61" visible="true"/>
<displaycolumn property-id="tpd10" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd11" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd9" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd1" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd13" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd0" order="-1" width="75" visible="false"/>
<displaycolumn property-id="tpd3" order="0" width="190" visible="true"/>
<displaycolumn property-id="tpd4" order="1" width="72" visible="true"/>
<displaycolumn property-id="tpd5" order="2" width="71" visible="true"/>
</taskdisplaycolumns>
<previous/>
<roles roleset-name="Default"/>
......
PertChart.png
+ 0
− 0
View replaced file @ 799120d9 View file @ f400c9bc
PertChart.png

50.2 KiB | W: | H:

PertChart.png

52.6 KiB | W: | H:

PertChart.png
PertChart.png
PertChart.png
PertChart.png
  • 2-up
  • Swipe
  • Onion skin
ResourcesChart.png
+ 0
− 0
View replaced file @ 799120d9 View file @ f400c9bc
ResourcesChart.png

22.1 KiB | W: | H:

ResourcesChart.png

20.8 KiB | W: | H:

ResourcesChart.png
ResourcesChart.png
ResourcesChart.png
ResourcesChart.png
  • 2-up
  • Swipe
  • Onion skin
designdoc.pdf
+ 0
− 0
View file @ f400c9bc
No preview for this file type
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