X-Git-Url: https://ruin.nu/git/?p=popboot.git;a=blobdiff_plain;f=planner.cpp;h=884567dea5c4329e43b6d0020bd05bd5c12af1fc;hp=e06489642ad8be00f1bd4bbff0ddde98e7e884b2;hb=85cd90baef74b1af28f9f287bf0dee583d10546d;hpb=417ea404303c365a53ab2e1db23925cb24b9b6ce diff --git a/planner.cpp b/planner.cpp index e064896..884567d 100644 --- a/planner.cpp +++ b/planner.cpp @@ -10,14 +10,16 @@ Planner::Planner(std::vector actions, Literals init, Literals goal){ _goal = goal; _start = new StartNode(_init); _finish = new EndNode(_goal); + addNode(_start); for(vector::iterator action = actions.begin(); action != actions.end(); ++action){ const Literals& effects = action->effects(0); for (Literals::const_iterator effect = effects.begin(); effect != effects.end(); ++effect){ - cerr << "Adding effect: " << *effect << endl; + cerr << "Adding effect: '" << *effect << "', action: " << action->name() << endl; _actions[*effect] = *action; } } + cout << "Number of actions: " << _actions.size() << endl; makePlan(_finish); } @@ -42,7 +44,7 @@ void Planner::makePlan(Node* node){ _start->addChild(node); }else{ for (Preconditions::const_iterator precond = preconds.begin(); precond != preconds.end(); ++precond){ - cerr << "Looking for: " << precond->first << endl; + cerr << "Looking for: '" << precond->first << "'" << endl; hash_map::iterator addedNode = _addedNodes.find(precond->first); if(addedNode != _addedNodes.end()){ cerr << "Using already added node" << endl; @@ -68,7 +70,9 @@ void Planner::makePlan(Node* node){ } void Planner::addNode(Node* node){ + cerr << "Adding node for action: " << node->action().name() << endl; const Literals& effects = node->action().effects(0); + cerr << "Number of effects: " << effects.size() << endl; for (Literals::const_iterator effect = effects.begin(); effect != effects.end(); ++effect){ cout << "Adding node for effect: " << *effect << endl;