SILO-GROUP
/
rex
1
0
Fork 0
Code Issues 2 Pull Requests Releases 4 Activity

suite reimpl started, good stopping point

master
Chris Punches 2017-06-09 00:49:56 -04:00
parent 7db682e503
commit eef2dd2173
13 changed files with 228 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

209
.idea/workspace.xml
View File

@ -15,8 +15,10 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="50b7ab1f-b700-44ff-b78d-e32f34492ff2" name="Default" comment=""> <list default="true" id="50b7ab1f-b700-44ff-b78d-e32f34492ff2" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/loaders/Conf.cpp" afterPath="$PROJECT_DIR$/src/loaders/Conf.cpp" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/loaders/JSON_Loader.h" afterPath="$PROJECT_DIR$/src/loaders/JSON_Loader.h" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/loaders/Conf.h" afterPath="$PROJECT_DIR$/src/loaders/Conf.h" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/loaders/Plan.cpp" afterPath="$PROJECT_DIR$/src/loaders/Plan.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/loaders/Suite.cpp" afterPath="$PROJECT_DIR$/src/loaders/Suite.cpp" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/loaders/Suite.h" afterPath="$PROJECT_DIR$/src/loaders/Suite.h" />
</list> </list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" /> <ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -37,26 +39,48 @@
<splitter split-orientation="horizontal" split-proportion="0.4956027"> <splitter split-orientation="horizontal" split-proportion="0.4956027">
<split-first> <split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Suite.h" pinned="false" current-in-tab="false"> <file leaf-file-name="Suite.h" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/loaders/Suite.h"> <entry file="file://$PROJECT_DIR$/src/loaders/Suite.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432"> <state relative-caret-position="288">
<caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" /> <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="JSON_Loader.h" pinned="false" current-in-tab="true"> <file leaf-file-name="Plan.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loaders/Plan.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="JSON_Loader.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loaders/JSON_Loader.h"> <entry file="file://$PROJECT_DIR$/src/loaders/JSON_Loader.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558"> <state relative-caret-position="558">
<caret line="33" column="94" lean-forward="false" selection-start-line="33" selection-start-column="94" selection-end-line="33" selection-end-column="94" /> <caret line="33" column="8" lean-forward="false" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="8" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Plan.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loaders/Plan.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
<folding>
<element signature="e#1097#1219#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</split-first> </split-first>
<split-second> <split-second>
@ -74,14 +98,14 @@
<file leaf-file-name="Conf.cpp" pinned="false" current-in-tab="false"> <file leaf-file-name="Conf.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loaders/Conf.cpp"> <entry file="file://$PROJECT_DIR$/src/loaders/Conf.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="414">
<caret line="10" column="58" lean-forward="true" selection-start-line="10" selection-start-column="58" selection-end-line="10" selection-end-column="58" /> <caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Conf.h" pinned="false" current-in-tab="true"> <file leaf-file-name="Conf.h" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loaders/Conf.h"> <entry file="file://$PROJECT_DIR$/src/loaders/Conf.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="180">
@ -94,7 +118,7 @@
<file leaf-file-name="JSON_Loader.cpp" pinned="false" current-in-tab="false"> <file leaf-file-name="JSON_Loader.cpp" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/loaders/JSON_Loader.cpp"> <entry file="file://$PROJECT_DIR$/src/loaders/JSON_Loader.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="777"> <state relative-caret-position="831">
<caret line="97" column="37" lean-forward="false" selection-start-line="97" selection-start-column="37" selection-end-line="97" selection-end-column="37" /> <caret line="97" column="37" lean-forward="false" selection-start-line="97" selection-start-column="37" selection-end-line="97" selection-end-column="37" />
<folding> <folding>
<element signature="e#0#2#0" expanded="true" /> <element signature="e#0#2#0" expanded="true" />
@ -103,14 +127,14 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Suite.cpp" pinned="false" current-in-tab="false"> <file leaf-file-name="Suite.cpp" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/loaders/Suite.cpp"> <entry file="file://$PROJECT_DIR$/src/loaders/Suite.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360"> <state relative-caret-position="144">
<caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" /> <caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
<folding> <folding>
<element signature="e#115#239#0" expanded="true" /> <element signature="e#105#229#0" expanded="true" />
<element signature="e#657#827#0" expanded="true" /> <element signature="e#647#817#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -143,21 +167,21 @@
<option value="$PROJECT_DIR$/cmake-build-debug/conf/test.plan" /> <option value="$PROJECT_DIR$/cmake-build-debug/conf/test.plan" />
<option value="$PROJECT_DIR$/src/loaders/Units.h" /> <option value="$PROJECT_DIR$/src/loaders/Units.h" />
<option value="$PROJECT_DIR$/src/loaders/Units.cpp" /> <option value="$PROJECT_DIR$/src/loaders/Units.cpp" />
<option value="$PROJECT_DIR$/src/loaders/Plan.cpp" />
<option value="$PROJECT_DIR$/src/loaders/Plan.h" /> <option value="$PROJECT_DIR$/src/loaders/Plan.h" />
<option value="$PROJECT_DIR$/src/loaders/Unit.cpp" /> <option value="$PROJECT_DIR$/src/loaders/Unit.cpp" />
<option value="$PROJECT_DIR$/src/loaders/Unit.h" /> <option value="$PROJECT_DIR$/src/loaders/Unit.h" />
<option value="$PROJECT_DIR$/src/loaders/Suite.h" />
<option value="$PROJECT_DIR$/src/loaders/Task.h" /> <option value="$PROJECT_DIR$/src/loaders/Task.h" />
<option value="$PROJECT_DIR$/src/loaders/Task.cpp" /> <option value="$PROJECT_DIR$/src/loaders/Task.cpp" />
<option value="$PROJECT_DIR$/src/loaders/Suite.cpp" />
<option value="$PROJECT_DIR$/examplar.cpp" /> <option value="$PROJECT_DIR$/examplar.cpp" />
<option value="$PROJECT_DIR$/src/loaders/JLoader.h" /> <option value="$PROJECT_DIR$/src/loaders/JLoader.h" />
<option value="$PROJECT_DIR$/src/loaders/JLoader.cpp" /> <option value="$PROJECT_DIR$/src/loaders/JLoader.cpp" />
<option value="$PROJECT_DIR$/src/loaders/JSON_Loader.cpp" /> <option value="$PROJECT_DIR$/src/loaders/JSON_Loader.cpp" />
<option value="$PROJECT_DIR$/src/loaders/JSON_Loader.h" />
<option value="$PROJECT_DIR$/src/loaders/Conf.cpp" /> <option value="$PROJECT_DIR$/src/loaders/Conf.cpp" />
<option value="$PROJECT_DIR$/src/loaders/Conf.h" /> <option value="$PROJECT_DIR$/src/loaders/Conf.h" />
<option value="$PROJECT_DIR$/src/loaders/JSON_Loader.h" />
<option value="$PROJECT_DIR$/src/loaders/Plan.cpp" />
<option value="$PROJECT_DIR$/src/loaders/Suite.h" />
<option value="$PROJECT_DIR$/src/loaders/Suite.cpp" />
</list> </list>
</option> </option>
</component> </component>
@ -556,12 +580,12 @@
<workItem from="1493165364496" duration="28418000" /> <workItem from="1493165364496" duration="28418000" />
<workItem from="1493849367458" duration="10819000" /> <workItem from="1493849367458" duration="10819000" />
<workItem from="1496894298085" duration="4924000" /> <workItem from="1496894298085" duration="4924000" />
<workItem from="1496974639358" duration="8801000" /> <workItem from="1496974639358" duration="9048000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="139073000" /> <option name="totallyTimeSpent" value="139320000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -578,17 +602,17 @@
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.08821293" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.08821293" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295342" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3295342" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.328706" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329907" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329907" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24571708" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24571708" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17680608" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17680608" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29152206" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.29152206" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39941263" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39941263" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.328706" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@ -644,8 +668,8 @@
<state relative-caret-position="360"> <state relative-caret-position="360">
<caret line="20" column="2" lean-forward="false" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" /> <caret line="20" column="2" lean-forward="false" selection-start-line="20" selection-start-column="2" selection-end-line="20" selection-end-column="2" />
<folding> <folding>
<element signature="e#115#239#0" expanded="true" /> <element signature="e#105#229#0" expanded="true" />
<element signature="e#657#827#0" expanded="true" /> <element signature="e#647#817#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -703,8 +727,8 @@
<state relative-caret-position="1296"> <state relative-caret-position="1296">
<caret line="72" column="0" lean-forward="true" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" /> <caret line="72" column="0" lean-forward="true" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
<folding> <folding>
<element signature="e#115#239#0" expanded="true" /> <element signature="e#105#229#0" expanded="true" />
<element signature="e#657#827#0" expanded="true" /> <element signature="e#647#817#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -749,7 +773,7 @@
<caret line="19" column="3" lean-forward="true" selection-start-line="19" selection-start-column="3" selection-end-line="19" selection-end-column="3" /> <caret line="19" column="3" lean-forward="true" selection-start-line="19" selection-start-column="3" selection-end-line="19" selection-end-column="3" />
<folding> <folding>
<element signature="e#285#449#0" expanded="false" /> <element signature="e#285#449#0" expanded="false" />
<element signature="e#1107#1229#0" expanded="false" /> <element signature="e#1097#1219#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -895,17 +919,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Plan.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#285#449#0" expanded="false" />
<element signature="e#1107#1229#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/test.plan"> <entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/test.plan">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="36"> <state relative-caret-position="36">
@ -913,14 +926,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Plan.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/loaders.h"> <entry file="file://$PROJECT_DIR$/src/loaders/loaders.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216"> <state relative-caret-position="216">
@ -972,14 +977,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Suite.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="24" column="0" lean-forward="true" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file:///usr/include/c++/5/fstream"> <entry file="file:///usr/include/c++/5/fstream">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="663"> <state relative-caret-position="663">
@ -1050,17 +1047,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Suite.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="20" column="24" lean-forward="true" selection-start-line="20" selection-start-column="24" selection-end-line="20" selection-end-column="24" />
<folding>
<element signature="e#115#239#0" expanded="true" />
<element signature="e#657#827#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/examplar.cpp"> <entry file="file://$PROJECT_DIR$/examplar.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540"> <state relative-caret-position="540">
@ -1069,32 +1055,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/loaders/JSON_Loader.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="777">
<caret line="97" column="37" lean-forward="false" selection-start-line="97" selection-start-column="37" selection-end-line="97" selection-end-column="37" />
<folding>
<element signature="e#0#2#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/JSON_Loader.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="33" column="94" lean-forward="false" selection-start-line="33" selection-start-column="94" selection-end-line="33" selection-end-column="94" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Conf.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="10" column="58" lean-forward="true" selection-start-line="10" selection-start-column="58" selection-end-line="10" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Conf.h"> <entry file="file://$PROJECT_DIR$/src/loaders/Conf.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180"> <state relative-caret-position="180">
@ -1103,5 +1063,68 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/loaders/JSON_Loader.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="831">
<caret line="97" column="37" lean-forward="false" selection-start-line="97" selection-start-column="37" selection-end-line="97" selection-end-column="37" />
<folding>
<element signature="e#0#2#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/JSON_Loader.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="33" column="8" lean-forward="false" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="8" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Conf.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="414">
<caret line="23" column="0" lean-forward="false" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Plan.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="792">
<caret line="48" column="34" lean-forward="false" selection-start-line="48" selection-start-column="34" selection-end-line="48" selection-end-column="34" />
<folding>
<element signature="e#1097#1219#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Plan.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="16" column="13" lean-forward="false" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Suite.h">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="288">
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/loaders/Suite.cpp">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="144">
<caret line="8" column="13" lean-forward="false" selection-start-line="8" selection-start-column="4" selection-end-line="8" selection-end-column="13" />
<folding>
<element signature="e#105#229#0" expanded="true" />
<element signature="e#647#817#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>

70
cmake-build-debug/CMakeFiles/Makefile.cmake
View File

@ -11,83 +11,18 @@ set(CMAKE_MAKEFILE_DEPENDS
"CMakeFiles/3.5.1/CMakeCCompiler.cmake" "CMakeFiles/3.5.1/CMakeCCompiler.cmake"
"CMakeFiles/3.5.1/CMakeCXXCompiler.cmake" "CMakeFiles/3.5.1/CMakeCXXCompiler.cmake"
"CMakeFiles/3.5.1/CMakeSystem.cmake" "CMakeFiles/3.5.1/CMakeSystem.cmake"
"CMakeFiles/feature_tests.c"
"CMakeFiles/feature_tests.cxx"
"/usr/share/cmake-3.5/Modules/CMakeCCompiler.cmake.in"
"/usr/share/cmake-3.5/Modules/CMakeCCompilerABI.c"
"/usr/share/cmake-3.5/Modules/CMakeCInformation.cmake" "/usr/share/cmake-3.5/Modules/CMakeCInformation.cmake"
"/usr/share/cmake-3.5/Modules/CMakeCXXCompiler.cmake.in"
"/usr/share/cmake-3.5/Modules/CMakeCXXCompilerABI.cpp"
"/usr/share/cmake-3.5/Modules/CMakeCXXInformation.cmake" "/usr/share/cmake-3.5/Modules/CMakeCXXInformation.cmake"
"/usr/share/cmake-3.5/Modules/CMakeCommonLanguageInclude.cmake" "/usr/share/cmake-3.5/Modules/CMakeCommonLanguageInclude.cmake"
"/usr/share/cmake-3.5/Modules/CMakeCompilerIdDetection.cmake"
"/usr/share/cmake-3.5/Modules/CMakeDetermineCCompiler.cmake"
"/usr/share/cmake-3.5/Modules/CMakeDetermineCXXCompiler.cmake"
"/usr/share/cmake-3.5/Modules/CMakeDetermineCompileFeatures.cmake"
"/usr/share/cmake-3.5/Modules/CMakeDetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/CMakeDetermineCompilerABI.cmake"
"/usr/share/cmake-3.5/Modules/CMakeDetermineCompilerId.cmake"
"/usr/share/cmake-3.5/Modules/CMakeDetermineSystem.cmake"
"/usr/share/cmake-3.5/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake" "/usr/share/cmake-3.5/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake"
"/usr/share/cmake-3.5/Modules/CMakeFindBinUtils.cmake"
"/usr/share/cmake-3.5/Modules/CMakeFindCodeBlocks.cmake" "/usr/share/cmake-3.5/Modules/CMakeFindCodeBlocks.cmake"
"/usr/share/cmake-3.5/Modules/CMakeGenericSystem.cmake" "/usr/share/cmake-3.5/Modules/CMakeGenericSystem.cmake"
"/usr/share/cmake-3.5/Modules/CMakeLanguageInformation.cmake" "/usr/share/cmake-3.5/Modules/CMakeLanguageInformation.cmake"
"/usr/share/cmake-3.5/Modules/CMakeParseArguments.cmake"
"/usr/share/cmake-3.5/Modules/CMakeParseImplicitLinkInfo.cmake"
"/usr/share/cmake-3.5/Modules/CMakeSystem.cmake.in"
"/usr/share/cmake-3.5/Modules/CMakeSystemSpecificInformation.cmake" "/usr/share/cmake-3.5/Modules/CMakeSystemSpecificInformation.cmake"
"/usr/share/cmake-3.5/Modules/CMakeSystemSpecificInitialize.cmake" "/usr/share/cmake-3.5/Modules/CMakeSystemSpecificInitialize.cmake"
"/usr/share/cmake-3.5/Modules/CMakeTestCCompiler.cmake"
"/usr/share/cmake-3.5/Modules/CMakeTestCXXCompiler.cmake"
"/usr/share/cmake-3.5/Modules/CMakeTestCompilerCommon.cmake"
"/usr/share/cmake-3.5/Modules/CMakeUnixFindMake.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/ADSP-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/ARMCC-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/AppleClang-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Borland-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Clang-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Clang-DetermineCompilerInternal.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Comeau-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Compaq-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Compaq-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Cray-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Embarcadero-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Fujitsu-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/GHS-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/GNU-C-FeatureTests.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/GNU-C.cmake" "/usr/share/cmake-3.5/Modules/Compiler/GNU-C.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/GNU-CXX-FeatureTests.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/GNU-CXX.cmake" "/usr/share/cmake-3.5/Modules/Compiler/GNU-CXX.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/GNU-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/GNU.cmake" "/usr/share/cmake-3.5/Modules/Compiler/GNU.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/HP-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/HP-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/IAR-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/IBMCPP-C-DetermineVersionInternal.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/IBMCPP-CXX-DetermineVersionInternal.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Intel-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/MIPSpro-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/MSVC-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/OpenWatcom-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/PGI-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/PathScale-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/SCO-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/SDCC-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/SunPro-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/SunPro-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/TI-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/TinyCC-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/VisualAge-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/VisualAge-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/Watcom-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/XL-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/XL-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/zOS-C-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Compiler/zOS-CXX-DetermineCompiler.cmake"
"/usr/share/cmake-3.5/Modules/Internal/FeatureTesting.cmake"
"/usr/share/cmake-3.5/Modules/MultiArchCross.cmake"
"/usr/share/cmake-3.5/Modules/Platform/Linux-CXX.cmake"
"/usr/share/cmake-3.5/Modules/Platform/Linux-GNU-C.cmake" "/usr/share/cmake-3.5/Modules/Platform/Linux-GNU-C.cmake"
"/usr/share/cmake-3.5/Modules/Platform/Linux-GNU-CXX.cmake" "/usr/share/cmake-3.5/Modules/Platform/Linux-GNU-CXX.cmake"
"/usr/share/cmake-3.5/Modules/Platform/Linux-GNU.cmake" "/usr/share/cmake-3.5/Modules/Platform/Linux-GNU.cmake"
@ -103,11 +38,6 @@ set(CMAKE_MAKEFILE_OUTPUTS
# Byproducts of CMake generate step: # Byproducts of CMake generate step:
set(CMAKE_MAKEFILE_PRODUCTS set(CMAKE_MAKEFILE_PRODUCTS
"CMakeFiles/3.5.1/CMakeSystem.cmake"
"CMakeFiles/3.5.1/CMakeCCompiler.cmake"
"CMakeFiles/3.5.1/CMakeCXXCompiler.cmake"
"CMakeFiles/3.5.1/CMakeCCompiler.cmake"
"CMakeFiles/3.5.1/CMakeCXXCompiler.cmake"
"CMakeFiles/CMakeDirectoryInformation.cmake" "CMakeFiles/CMakeDirectoryInformation.cmake"
) )

2
cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake
View File

@ -7,7 +7,7 @@ set(CMAKE_DEPENDS_CHECK_CXX
"/home/phanes/Development/internal/ftests/examplar.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o" "/home/phanes/Development/internal/ftests/examplar.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o"
"/home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o" "/home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o"
"/home/phanes/Development/internal/ftests/src/loaders/Conf.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders/Conf.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o"
"/home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o"
"/home/phanes/Development/internal/ftests/src/loaders/Plan.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders/Plan.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o"
"/home/phanes/Development/internal/ftests/src/loaders/Suite.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders/Suite.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o"
"/home/phanes/Development/internal/ftests/src/loaders/Task.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Task.cpp.o" "/home/phanes/Development/internal/ftests/src/loaders/Task.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Task.cpp.o"

38
cmake-build-debug/CMakeFiles/ftests.dir/build.make
View File

@ -129,28 +129,28 @@ CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides: CMakeFiles/ftests.dir/src
CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides.build: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides.build: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o
CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: CMakeFiles/ftests.dir/flags.make CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: CMakeFiles/ftests.dir/flags.make
CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: ../src/loaders/JLoader.cpp CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/loaders/JSON_Loader.cpp
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o" @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o"
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.cpp
CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i: cmake_force CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.i: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i" @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.i"
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp > CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.cpp > CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.i
CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s: cmake_force CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.s: cmake_force
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s" @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.s"
/usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp -o CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.cpp -o CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.s
CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires: CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.requires:
.PHONY : CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires .PHONY : CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.requires
CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.requires
$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides.build $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.provides.build
.PHONY : CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides .PHONY : CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.provides
CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o
CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: CMakeFiles/ftests.dir/flags.make CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: CMakeFiles/ftests.dir/flags.make
@ -302,7 +302,7 @@ ftests_OBJECTS = \
"CMakeFiles/ftests.dir/examplar.cpp.o" \ "CMakeFiles/ftests.dir/examplar.cpp.o" \
"CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o" \
"CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o" \ "CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o" \
"CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o" \
"CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o" \
"CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o" \
"CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" \ "CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" \
@ -316,7 +316,7 @@ ftests_EXTERNAL_OBJECTS =
ftests: CMakeFiles/ftests.dir/examplar.cpp.o ftests: CMakeFiles/ftests.dir/examplar.cpp.o
ftests: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o
ftests: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o ftests: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o
ftests: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o
ftests: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o
ftests: CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o
ftests: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o ftests: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o
@ -336,7 +336,7 @@ CMakeFiles/ftests.dir/build: ftests
CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/examplar.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/examplar.cpp.o.requires
CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.requires
CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.requires
CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o.requires
CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.requires
CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o.requires
CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.requires CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.requires

2
cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake
View File

@ -2,7 +2,7 @@ file(REMOVE_RECURSE
"CMakeFiles/ftests.dir/examplar.cpp.o" "CMakeFiles/ftests.dir/examplar.cpp.o"
"CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o" "CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o"
"CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o" "CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o"
"CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o" "CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o"
"CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o" "CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o"
"CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o" "CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o"
"CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" "CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o"

66
cmake-build-debug/CMakeFiles/ftests.dir/depend.make
View File

@ -1,2 +1,64 @@
# Empty dependencies file for ftests. # CMAKE generated file: DO NOT EDIT!
# This may be replaced when dependencies are built. # Generated by "Unix Makefiles" Generator, CMake Version 3.5
CMakeFiles/ftests.dir/examplar.cpp.o: ../examplar.cpp
CMakeFiles/ftests.dir/examplar.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Conf.h
CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/JSON_Loader.h
CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Plan.h
CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Suite.h
CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Task.h
CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Unit.h
CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/loaders.h
CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: ../src/json/jsoncpp.cpp
CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/Conf.cpp
CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/Conf.h
CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/JSON_Loader.h
CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/loaders/JSON_Loader.cpp
CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/loaders/JSON_Loader.h
CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o: ../src/loaders/helpers.h
CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/JSON_Loader.h
CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Plan.cpp
CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Plan.h
CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Suite.h
CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Task.h
CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Unit.h
CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/loaders/JSON_Loader.h
CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/loaders/Suite.cpp
CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/loaders/Suite.h
CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o: ../src/loaders/Unit.h
CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/JSON_Loader.h
CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/Suite.h
CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/Task.cpp
CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/Task.h
CMakeFiles/ftests.dir/src/loaders/Task.cpp.o: ../src/loaders/Unit.h
CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o: ../src/loaders/Unit.cpp
CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o: ../src/loaders/Unit.h
CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: ../src/loaders/helpers.cpp
CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: ../src/loaders/helpers.h
CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Conf.h
CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/JSON_Loader.h
CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Plan.h
CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Suite.h
CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Task.h
CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Unit.h
CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/loaders.cpp
CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/loaders.h

2
cmake-build-debug/CMakeFiles/ftests.dir/link.txt
View File

@ -1 +1 @@
/usr/bin/c++ -g CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o CMakeFiles/ftests.dir/src/loaders/Task.cpp.o -o ftests /usr/bin/c++ -g CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o CMakeFiles/ftests.dir/src/loaders/Suite.cpp.o CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o CMakeFiles/ftests.dir/src/loaders/Unit.cpp.o CMakeFiles/ftests.dir/src/loaders/Task.cpp.o -o ftests

36
cmake-build-debug/Makefile
View File

@ -204,32 +204,32 @@ src/loaders/Conf.cpp.s:
$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Conf.cpp.s $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Conf.cpp.s
.PHONY : src/loaders/Conf.cpp.s .PHONY : src/loaders/Conf.cpp.s
src/loaders/JLoader.o: src/loaders/JLoader.cpp.o src/loaders/JSON_Loader.o: src/loaders/JSON_Loader.cpp.o
.PHONY : src/loaders/JLoader.o .PHONY : src/loaders/JSON_Loader.o
# target to build an object file # target to build an object file
src/loaders/JLoader.cpp.o: src/loaders/JSON_Loader.cpp.o:
$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.o
.PHONY : src/loaders/JLoader.cpp.o .PHONY : src/loaders/JSON_Loader.cpp.o
src/loaders/JLoader.i: src/loaders/JLoader.cpp.i src/loaders/JSON_Loader.i: src/loaders/JSON_Loader.cpp.i
.PHONY : src/loaders/JLoader.i .PHONY : src/loaders/JSON_Loader.i
# target to preprocess a source file # target to preprocess a source file
src/loaders/JLoader.cpp.i: src/loaders/JSON_Loader.cpp.i:
$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.i
.PHONY : src/loaders/JLoader.cpp.i .PHONY : src/loaders/JSON_Loader.cpp.i
src/loaders/JLoader.s: src/loaders/JLoader.cpp.s src/loaders/JSON_Loader.s: src/loaders/JSON_Loader.cpp.s
.PHONY : src/loaders/JLoader.s .PHONY : src/loaders/JSON_Loader.s
# target to generate assembly for a file # target to generate assembly for a file
src/loaders/JLoader.cpp.s: src/loaders/JSON_Loader.cpp.s:
$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JSON_Loader.cpp.s
.PHONY : src/loaders/JLoader.cpp.s .PHONY : src/loaders/JSON_Loader.cpp.s
src/loaders/Plan.o: src/loaders/Plan.cpp.o src/loaders/Plan.o: src/loaders/Plan.cpp.o
@ -411,9 +411,9 @@ help:
@echo "... src/loaders/Conf.o" @echo "... src/loaders/Conf.o"
@echo "... src/loaders/Conf.i" @echo "... src/loaders/Conf.i"
@echo "... src/loaders/Conf.s" @echo "... src/loaders/Conf.s"
@echo "... src/loaders/JLoader.o" @echo "... src/loaders/JSON_Loader.o"
@echo "... src/loaders/JLoader.i" @echo "... src/loaders/JSON_Loader.i"
@echo "... src/loaders/JLoader.s" @echo "... src/loaders/JSON_Loader.s"
@echo "... src/loaders/Plan.o" @echo "... src/loaders/Plan.o"
@echo "... src/loaders/Plan.i" @echo "... src/loaders/Plan.i"
@echo "... src/loaders/Plan.s" @echo "... src/loaders/Plan.s"

4
cmake-build-debug/ftests.cbp
View File

@ -96,10 +96,10 @@
<Unit filename="/home/phanes/Development/internal/ftests/src/loaders/Conf.h"> <Unit filename="/home/phanes/Development/internal/ftests/src/loaders/Conf.h">
<Option target="ftests"/> <Option target="ftests"/>
</Unit> </Unit>
<Unit filename="/home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp"> <Unit filename="/home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.cpp">
<Option target="ftests"/> <Option target="ftests"/>
</Unit> </Unit>
<Unit filename="/home/phanes/Development/internal/ftests/src/loaders/JLoader.h"> <Unit filename="/home/phanes/Development/internal/ftests/src/loaders/JSON_Loader.h">
<Option target="ftests"/> <Option target="ftests"/>
</Unit> </Unit>
<Unit filename="/home/phanes/Development/internal/ftests/src/loaders/Plan.cpp"> <Unit filename="/home/phanes/Development/internal/ftests/src/loaders/Plan.cpp">

2
src/loaders/JSON_Loader.h
View File

@ -31,6 +31,6 @@ public:
// safely handle key retrieval (if we want it to be safe) // safely handle key retrieval (if we want it to be safe)
// next iter should be: // next iter should be:
int JSON_Loader::get_key( Json::Value &input, std::string key, bool verbose, bool safety); int get_key( Json::Value &input, std::string key, bool verbose, bool safety);
}; };
#endif //FTESTS_JLOADER_H #endif //FTESTS_JLOADER_H

5
src/loaders/Plan.cpp
View File

@ -41,11 +41,14 @@ Task Plan::get_task(std::string provided_name)
return * returnable; return * returnable;
} }
Plan::Plan( std::string filename ): JSON_Loader( filename ) Plan::Plan( std::string filename ): JSON_Loader()
/* Plan loads a file and deserializes the Unit JSON object to Task types as a vector member /* Plan loads a file and deserializes the Unit JSON object to Task types as a vector member
* Plan { vector<Task> } * Plan { vector<Task> }
*/ */
{ {
// plan always loads from file
this->load_json_file( filename );
Json::Value raw_tasks = this->as_serialized()["plan"]; Json::Value raw_tasks = this->as_serialized()["plan"];
for ( int index = 0; index < raw_tasks.size(); index++ ) for ( int index = 0; index < raw_tasks.size(); index++ )

2
src/loaders/Suite.cpp
View File

@ -1,7 +1,7 @@
#include "Suite.h" #include "Suite.h"
Suite::Suite(): JSON_Loader() {} Suite::Suite(): JSON_Loader() {}
Suite::Suite( std::string filename ): JSON_Loader( filename ) Suite::Suite( std::string filename ): JSON_Loader()
/* Suite loads a file and deserializes the Unit JSON object to Unit types as a vector member /* Suite loads a file and deserializes the Unit JSON object to Unit types as a vector member
* Suite { vector<Unit> } * Suite { vector<Unit> }
*/ */

1
src/loaders/Suite.h
View File

@ -14,7 +14,6 @@ class Suite: public JSON_Loader
public: public:
// constructor // constructor
Suite( std::string filename ); Suite( std::string filename );
Suite();
int load_file( std::string filename ); int load_file( std::string filename );
// returns the unit type identified by name or null // returns the unit type identified by name or null