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

data structure seems to be fully implemented

master
Chris Punches 2017-04-19 23:11:44 -04:00
parent dd49cfe739
commit c0cd9f3549
5 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
.idea/workspace.xml
View File

@ -42,21 +42,21 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="all_test.units" pinned="false" current-in-tab="true"> <file leaf-file-name="all_test.units" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units"> <entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="378">
<caret line="21" column="1" lean-forward="true" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" /> <caret line="21" column="1" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="21" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="test.plan" pinned="false" current-in-tab="false"> <file leaf-file-name="test.plan" pinned="false" current-in-tab="true">
<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="54"> <state relative-caret-position="90">
<caret line="3" column="23" lean-forward="false" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" /> <caret line="5" column="1" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -123,11 +123,21 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="config.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cmake-build-debug/config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="4" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="examplar.cpp" pinned="false" current-in-tab="true"> <file leaf-file-name="examplar.cpp" pinned="false" current-in-tab="true">
<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="360"> <state relative-caret-position="432">
<caret line="20" column="80" lean-forward="false" selection-start-line="20" selection-start-column="80" selection-end-line="20" selection-end-column="80" /> <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 /> <folding />
</state> </state>
</provider> </provider>
@ -145,13 +155,13 @@
<option value="$PROJECT_DIR$/plan.conf" /> <option value="$PROJECT_DIR$/plan.conf" />
<option value="$PROJECT_DIR$/CMakeLists.txt" /> <option value="$PROJECT_DIR$/CMakeLists.txt" />
<option value="$PROJECT_DIR$/cmake-build-debug/config.json" /> <option value="$PROJECT_DIR$/cmake-build-debug/config.json" />
<option value="$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units" />
<option value="$PROJECT_DIR$/cmake-build-debug/conf/test.plan" /> <option value="$PROJECT_DIR$/cmake-build-debug/conf/test.plan" />
<option value="$PROJECT_DIR$/main.cpp" /> <option value="$PROJECT_DIR$/main.cpp" />
<option value="$PROJECT_DIR$/src/jsoncpp.cpp.cpp" /> <option value="$PROJECT_DIR$/src/jsoncpp.cpp.cpp" />
<option value="$PROJECT_DIR$/src/loaders.h" /> <option value="$PROJECT_DIR$/src/loaders.h" />
<option value="$PROJECT_DIR$/src/loaders.cpp" /> <option value="$PROJECT_DIR$/src/loaders.cpp" />
<option value="$PROJECT_DIR$/examplar.cpp" /> <option value="$PROJECT_DIR$/examplar.cpp" />
<option value="$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units" />
</list> </list>
</option> </option>
</component> </component>
@ -477,12 +487,12 @@
<updated>1491540343823</updated> <updated>1491540343823</updated>
<workItem from="1491540345736" duration="17928000" /> <workItem from="1491540345736" duration="17928000" />
<workItem from="1491759279673" duration="614000" /> <workItem from="1491759279673" duration="614000" />
<workItem from="1492298506932" duration="43757000" /> <workItem from="1492298506932" duration="45000000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="62299000" /> <option name="totallyTimeSpent" value="63542000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -583,14 +593,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cmake-build-debug/config.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="18">
<caret line="1" column="44" lean-forward="false" selection-start-line="1" selection-start-column="44" selection-end-line="1" selection-end-column="44" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/json/json.h"> <entry file="file://$PROJECT_DIR$/src/json/json.h">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="640"> <state relative-caret-position="640">
@ -657,11 +659,15 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/test.plan"> <entry file="file://$PROJECT_DIR$/src/loaders.cpp">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="54"> <state relative-caret-position="1111">
<caret line="3" column="23" lean-forward="false" selection-start-line="3" selection-start-column="23" selection-end-line="3" selection-end-column="23" /> <caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
<folding /> <folding>
<element signature="e#1910#2044#0" expanded="true" />
<element signature="e#2297#2358#0" expanded="true" />
<element signature="e#2991#3142#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -675,30 +681,34 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/loaders.cpp"> <entry file="file://$PROJECT_DIR$/cmake-build-debug/config.json">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1111"> <state relative-caret-position="72">
<caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" /> <caret line="4" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding> <folding />
<element signature="e#1910#2044#0" expanded="true" />
<element signature="e#2297#2358#0" expanded="true" />
<element signature="e#2991#3142#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units"> <entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="378">
<caret line="21" column="1" lean-forward="true" selection-start-line="21" selection-start-column="1" selection-end-line="21" selection-end-column="1" /> <caret line="21" column="1" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="21" selection-end-column="1" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/test.plan">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90">
<caret line="5" column="1" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="1" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </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="360"> <state relative-caret-position="432">
<caret line="20" column="80" lean-forward="false" selection-start-line="20" selection-start-column="80" selection-end-line="20" selection-end-column="80" /> <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 /> <folding />
</state> </state>
</provider> </provider>

BIN
cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o
View File

Binary file not shown.

8
cmake-build-debug/conf/units/all_test.units
View File

@ -4,8 +4,8 @@
"name": "gcc is present", "name": "gcc is present",
"target": "./ubuntu/xenial/check_gcc_present.run", "target": "./ubuntu/xenial/check_gcc_present.run",
"output": "present", "output": "present",
"rectifier": "./ubuntu/xenial/install_gcc", "rectifier": "./ubuntu/xenial/install_gcc",
"active": true, "active": true,
"required": true, "required": true,
"rectify": true "rectify": true
}, },
@ -13,8 +13,8 @@
"name": "gcc can compile", "name": "gcc can compile",
"target": "./ubuntu/xenial/check_gcc_compiles.run", "target": "./ubuntu/xenial/check_gcc_compiles.run",
"output": "can compile", "output": "can compile",
"rectifier": "", "rectifier": "echo pass",
"active": true, "active": true,
"required": true, "required": true,
"rectify": false "rectify": false
} }

BIN
cmake-build-debug/ftests
View File

Binary file not shown.

9
examplar.cpp
View File

@ -12,13 +12,14 @@ int main()
for ( int i = 0; i < plan.tasks.size(); ++i ) for ( int i = 0; i < plan.tasks.size(); ++i )
{ {
std::string current_task_name = plan.tasks[i].get_name(); std::string current_task_name = plan.tasks[i].get_name();
std::cout << "Found task name:\t" << current_task_name << std::endl << std::endl; std::cout << "Found task name in \"" << configuration.get_plan_path() << "\":\t" << current_task_name << std::endl << std::endl;
Unit current_unit = unitHolder.select_unit( current_task_name ); Unit current_unit = unitHolder.select_unit( current_task_name );
std::cout << "Associated Unit name:\t" << current_unit.get_name() << std::endl; std::cout << "Associated Unit name:\t\t" << current_unit.get_name() << std::endl;
std::cout << "Associated Unit target:\t" << current_unit.get_target() << std::endl; std::cout << "Associated Unit target:\t\t" << current_unit.get_target() << std::endl;
std::cout << "Associated Unit healer:\t" << current_unit.get_rectifier() << std::endl << std::endl; std::cout << "Associated Unit healer:\t\t" << current_unit.get_rectifier() << std::endl;
std::cout << "Associated Unit heals:\t\t" << current_unit.get_rectify() << std::endl << std::endl;
} }