Tue Jun 30 20:10:07 UTC 2009 Daniel L.C. Mack <daniel.l.mack@vanderbilt.edu>

3 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 5cb142de6da..b4932e9a125 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
+Tue Jun 30 20:10:07 UTC 2009  Daniel L.C. Mack  <daniel.l.mack@vanderbilt.edu>
+
+        * SA_PlanStrategy.cpp:
+        * SA_SchedStrategy.cpp:
+	Modified undo for removing open conds to match the breadth first search.
+	Indented some of ankits code for readability.
+
 Mon Jun 29 21:52:33 UTC 2009  Ben Podgursky  <bpodgursky@gmail.com>
 
         * SA_PlanCommands.cpp:
         * SA_WorkingPlan.cpp:
 
-	Added ability to use 20 again if it is undone once.
+        Added ability to use 20 again if it is undone once.
 
 Mon Jun 29 21:02:05 UTC 2009  Ben Podgursky  <bpodgursky@gmail.com>
 
diff --git a/SA_PlanStrategy.cpp b/SA_PlanStrategy.cpp
index ffbfab467f7..899b9ba47d6 100644
--- a/SA_PlanStrategy.cpp
+++ b/SA_PlanStrategy.cpp
@@ -451,7 +451,7 @@ void SA_PlanStrategy::undo (SA_RemoveOpenCondsCmd *cmd)
       open_iter != cmd->removed_.end (); open_iter++)
   {
 	  std::cout<<"in planstrat undo adding "<<open_iter->first.id<<" to "<<open_iter->second<<std::endl;
-	  this->open_conds_.insert (std::make_pair
+	  this->open_conds_.push_front (std::make_pair
       (open_iter->first, open_iter->second));
   }
 };
diff --git a/SA_SchedStrategy.cpp b/SA_SchedStrategy.cpp
index 8567ecae208..7e95f7718c4 100644
--- a/SA_SchedStrategy.cpp
+++ b/SA_SchedStrategy.cpp
@@ -150,10 +150,10 @@ bool SA_SchedStrategy::satisfy_sched (TaskInstID task_inst)
 	
 
   if(!this->planner_->recurse_plan ()){
-	this->planner_->undo_through(cur_cmd_id);
-	return false;
+	  this->planner_->undo_through(cur_cmd_id);
+	  return false;
   }else{
-	return true;
+	  return true;
   }
 };