commented stuff
Chris Punches
parent
d62df8b076
commit
8a53aefd48
|
|
@ -15,18 +15,10 @@
|
|||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="50b7ab1f-b700-44ff-b78d-e32f34492ff2" name="Default" comment="">
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Units.cpp.o" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Units.cpp.o" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cmake-build-debug/ftests" afterPath="$PROJECT_DIR$/cmake-build-debug/ftests" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cmake-build-debug/conf/test.plan" afterPath="$PROJECT_DIR$/cmake-build-debug/conf/test.plan" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units" afterPath="$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/examplar.cpp" afterPath="$PROJECT_DIR$/examplar.cpp" />
|
||||
<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/Plan.h" afterPath="$PROJECT_DIR$/src/loaders/Plan.h" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/loaders/Units.cpp" afterPath="$PROJECT_DIR$/src/loaders/Units.cpp" />
|
||||
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/loaders/Units.h" afterPath="$PROJECT_DIR$/src/loaders/Units.h" />
|
||||
</list>
|
||||
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
||||
<option name="TRACKING_ENABLED" value="true" />
|
||||
|
|
@ -59,12 +51,11 @@
|
|||
<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="558">
|
||||
<caret line="31" column="0" lean-forward="true" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
|
||||
<state relative-caret-position="1242">
|
||||
<caret line="69" column="3" lean-forward="true" selection-start-line="69" selection-start-column="3" selection-end-line="69" selection-end-column="3" />
|
||||
<folding>
|
||||
<element signature="e#0#2#0" expanded="true" />
|
||||
<element signature="e#802#966#0" expanded="true" />
|
||||
<element signature="e#1632#1754#0" expanded="true" />
|
||||
<element signature="e#888#1052#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -109,8 +100,8 @@
|
|||
<file leaf-file-name="loaders.h" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/src/loaders/loaders.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="108">
|
||||
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
||||
<state relative-caret-position="144">
|
||||
<caret line="8" column="17" lean-forward="true" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
|
||||
<folding>
|
||||
<element signature="e#0#2#0" expanded="true" />
|
||||
</folding>
|
||||
|
|
@ -125,8 +116,8 @@
|
|||
<file leaf-file-name="examplar.cpp" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/examplar.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="432">
|
||||
<caret line="24" column="115" lean-forward="false" selection-start-line="24" selection-start-column="115" selection-end-line="24" selection-end-column="115" />
|
||||
<state relative-caret-position="540">
|
||||
<caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -172,10 +163,10 @@
|
|||
<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$/src/loaders/Plan.h" />
|
||||
<option value="$PROJECT_DIR$/src/loaders/Plan.cpp" />
|
||||
<option value="$PROJECT_DIR$/src/loaders/Units.h" />
|
||||
<option value="$PROJECT_DIR$/examplar.cpp" />
|
||||
<option value="$PROJECT_DIR$/src/loaders/Units.cpp" />
|
||||
<option value="$PROJECT_DIR$/src/loaders/Plan.cpp" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
|
|
@ -523,12 +514,12 @@
|
|||
<workItem from="1492298506932" duration="46583000" />
|
||||
<workItem from="1492752608203" duration="13980000" />
|
||||
<workItem from="1492984111087" duration="7006000" />
|
||||
<workItem from="1493165364496" duration="10384000" />
|
||||
<workItem from="1493165364496" duration="13516000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="96495000" />
|
||||
<option name="totallyTimeSpent" value="99627000" />
|
||||
</component>
|
||||
<component name="TodoView">
|
||||
<todo-panel id="selected-file">
|
||||
|
|
@ -612,8 +603,7 @@
|
|||
<caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="e#0#2#0" expanded="true" />
|
||||
<element signature="e#802#966#0" expanded="true" />
|
||||
<element signature="e#1632#1754#0" expanded="true" />
|
||||
<element signature="e#888#1052#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -744,8 +734,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" />
|
||||
<folding>
|
||||
<element signature="e#0#2#0" expanded="true" />
|
||||
<element signature="e#802#966#0" expanded="true" />
|
||||
<element signature="e#1632#1754#0" expanded="true" />
|
||||
<element signature="e#888#1052#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
|
|
@ -1022,16 +1011,6 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/loaders/loaders.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="108">
|
||||
<caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="e#0#2#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cmake-build-debug/conf/units/all_test.units">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="216">
|
||||
|
|
@ -1058,21 +1037,22 @@
|
|||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/src/loaders/Plan.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="558">
|
||||
<caret line="31" column="0" lean-forward="true" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
|
||||
<state relative-caret-position="1242">
|
||||
<caret line="69" column="3" lean-forward="true" selection-start-line="69" selection-start-column="3" selection-end-line="69" selection-end-column="3" />
|
||||
<folding>
|
||||
<element signature="e#0#2#0" expanded="true" />
|
||||
<element signature="e#802#966#0" expanded="true" />
|
||||
<element signature="e#1632#1754#0" expanded="true" />
|
||||
<element signature="e#888#1052#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/examplar.cpp">
|
||||
<entry file="file://$PROJECT_DIR$/src/loaders/loaders.h">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="432">
|
||||
<caret line="24" column="115" lean-forward="false" selection-start-line="24" selection-start-column="115" selection-end-line="24" selection-end-column="115" />
|
||||
<folding />
|
||||
<state relative-caret-position="144">
|
||||
<caret line="8" column="17" lean-forward="true" selection-start-line="8" selection-start-column="17" selection-end-line="8" selection-end-column="17" />
|
||||
<folding>
|
||||
<element signature="e#0#2#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
|
|
@ -1090,5 +1070,13 @@
|
|||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/examplar.cpp">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="540">
|
||||
<caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</component>
|
||||
</project>
|
||||
Binary file not shown.
Binary file not shown.
|
|
@ -26,17 +26,18 @@ Json::Value Task::set_dependencies()
|
|||
|
||||
|
||||
int Plan::num_tasks()
|
||||
// returns the number of tasks in a Plan
|
||||
{
|
||||
return (int)this->tasks.size();
|
||||
}
|
||||
|
||||
|
||||
Task Plan::select_task_index(int index) {
|
||||
Task Plan::select_task_index(int index)
|
||||
// returns a task from its parent Plan by index
|
||||
{
|
||||
return this->tasks[index];
|
||||
}
|
||||
|
||||
Task Plan::select_task( std::string provided_name )
|
||||
{
|
||||
/*
|
||||
* returns a task from a Plan object by name
|
||||
* this will need reworked. maybe should return int, populate a pointer.
|
||||
|
|
@ -64,13 +65,12 @@ Task Plan::select_task( std::string provided_name )
|
|||
|
||||
return * returnable;
|
||||
}
|
||||
}
|
||||
|
||||
Plan::Plan( std::string filename ): JLoader( filename )
|
||||
{
|
||||
/* Plan loads a file and deserializes the Unit JSON object to Task types as a vector member
|
||||
* Plan { vector<Task> }
|
||||
*/
|
||||
{
|
||||
Json::Value raw_tasks = this->get_root()["plan"];
|
||||
|
||||
for ( int index = 0; index < raw_tasks.size(); index++ )
|
||||
|
|
|
|||
Loading…
Reference in New Issue