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

impl all units loading in plan -- working

master
Chris Punches 2017-06-25 18:50:14 -04:00
parent 2724cf71a4
commit 27969c3c27
3 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
examplar.cpp
View File

@ -19,28 +19,7 @@ int main( )
Plan plan; Plan plan;
plan.load_plan_file( plan_file, verbose ); plan.load_plan_file( plan_file, verbose );
/* for ( int i = 0; i < plan.num_tasks(); ++i ) plan.load_definitions( available_definitions, verbose );
{
Task current_task = plan.get_task( i );
Unit current_unit = unit_definitions->get_unit( current_task.get_name() );
std::cout << "Found task name in \"" << configuration.get_plan_path() << "\":\t" << current_task.get_name() << std::endl << std::endl;
std::cout << "Associated Unit name:\t\t" << current_unit.get_name() << std::endl;
std::cout << "Associated Unit target:\t\t" << current_unit.get_target() << 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;
Json::Value deps = current_task.get_dependencies();
for ( int j = 0; j < deps.size(); ++j )
{
std::cout << "Associated Dependency:\t\t" << deps[j] << std::endl;
}
std::cout << std::endl;
}
*/
return 0; return 0;
} }

17
src/loaders/Plan.cpp
View File

@ -86,4 +86,21 @@ void Plan::get_task(Task & result, std::string provided_name, bool verbose)
std::cerr << "Task name \"" << provided_name << "\" was referenced but not defined!" << std::endl; std::cerr << "Task name \"" << provided_name << "\" was referenced but not defined!" << std::endl;
throw Plan_InvalidTaskName(); throw Plan_InvalidTaskName();
} }
}
/// Plan::load_definitions - Load the units corresponding to each task in plan from the given Suite.
void Plan::load_definitions( Suite unit_definitions, bool verbose )
{
// placeholder Unit
Unit tmp_U;
// for every task in the plan:
for (int i = 0; i < this->tasks.size(); i++ )
{
// load the tmp_U corresponding to that task name
unit_definitions.get_unit( tmp_U, this->tasks[i].get_name() );
// then have that task attach a copy of tmp_U
this->tasks[i].load_definition( tmp_U, verbose );
}
} }

2
src/loaders/Plan.h
View File

@ -25,7 +25,7 @@ class Plan: public JSON_Loader
void get_task( Task & result, int index, bool verbose ); void get_task( Task & result, int index, bool verbose );
// load unit definitions from a provided suite and import them into individual tasks // load unit definitions from a provided suite and import them into individual tasks
void load_definitions( Suite unit_definitions ); void load_definitions( Suite unit_definitions, bool verbose );
// fetch a corresponding Unit to a Task // fetch a corresponding Unit to a Task
void get_definition_from_task(Unit & result, Task input, bool verbose ); void get_definition_from_task(Unit & result, Task input, bool verbose );