]> ruin.nu Git - popboot.git/blobdiff - node.cpp
major bugfix
[popboot.git] / node.cpp
index b6793f6c73b804b78101eca68389e6d49db3e4e4..24da8b1dd60c36d9575151630ca3e990905b9ef2 100644 (file)
--- a/node.cpp
+++ b/node.cpp
@@ -42,17 +42,14 @@ bool Node::satisfyCondition(std::string effect){
 
 bool Node::satisfyConditions(const Literals& effects){
        for (Literals::const_iterator effect = effects.begin(); effect != effects.end(); ++effect){
-               cerr << "Satisfied effect: " << *effect << endl;
                _preconditions.erase(_preconditions.find(*effect));
        }
-       cerr << "Number of preconditions left: " << _preconditions.size() << endl;
        return _preconditions.size() == 0 && !_executed;
 }
 
 void Node::execute(){
-       cerr << "Executing: " << _action->name() << endl;
        if(_executed)
-               cerr << "Already executed" << endl;
+               cerr << "Already executed " << _action->name() << endl;
        if ((_preconditions.size() != 0) || _executed)
                return;
 
@@ -60,8 +57,6 @@ void Node::execute(){
        int value = _action->execute();
        _effects = _action->effects(value);
 
-       cerr << "Got returnvalue: " << value << ", number of effects: " << _effects.size() << endl;
-
 }
 
 const std::vector<Node*>& Node::children() const{
@@ -71,6 +66,12 @@ StartNode::StartNode(const Literals& init){
        EffectsMap initial;
        initial[0] = init;
        _action = new Action("start",Preconditions(),"", initial);
+       _executed = true;
+       _effects = init;
+}
+
+const Preconditions& Node::preconditions() const{
+       return _preconditions;
 }
 
 EndNode::EndNode(const Literals& goal){