diff options
| author | bpodgursky <bpodgursky@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-01 21:35:06 +0000 |
|---|---|---|
| committer | bpodgursky <bpodgursky@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-01 21:35:06 +0000 |
| commit | a65ff7adf82fe9bef4f74abf9b43dda4d60ce7d8 (patch) | |
| tree | ba9fe9ab9f2953b9a558dd029aa35c28c702b68b | |
| parent | f67fd045446205f489273f4977799e399b41b07a (diff) | |
| download | ATCD-a65ff7adf82fe9bef4f74abf9b43dda4d60ce7d8.tar.gz | |
Thu Oct 1 21:33:24 UTC 2009 unknown <unknown@vanderbilt.edu>
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | SA_POP_Types.h | 2 | ||||
| -rw-r--r-- | SA_PlanStrategy.cpp | 5 | ||||
| -rw-r--r-- | SA_SchedStrategy.cpp | 4 |
4 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog index 85bf55f1213..aa7a4092e2f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,18 +1,26 @@ +Thu Oct 1 21:33:24 UTC 2009 unknown <unknown@vanderbilt.edu> + + * SA_POP_Types.h: + * SA_PlanStrategy.cpp: + * SA_SchedStrategy.cpp: + + Various cleanup + Thu Oct 1 20:10:38 UTC 2009 Daniel L.C. Mack <daniel.l.mack@vanderbilt.edu> * C2W/C2W_Demo.cpp: - Modified the graph_out adapter call to take advantage of the new function call. + Modified the graph_out adapter call to take advantage of the new function call. * LogGraphOut.h: * LogGraphOut.cpp: - Refactored some of the code that draws the graph, improved visualization of non-stepping graph + Refactored some of the code that draws the graph, improved visualization of non-stepping graph * SANet/SANet.h: * SANet/SANet.cpp: - Simplified the print_graphviz function to remove outside logging code. Takes a default color. + Simplified the print_graphviz function to remove outside logging code. Takes a default color. * SA_PlanStrategy.cpp: - Resolved conflict about the task restrictor. + Resolved conflict about the task restrictor. Thu Oct 1 17:25:36 UTC 2009 Ben Podgursky <bpodgursky@gmail.com> diff --git a/SA_POP_Types.h b/SA_POP_Types.h index 10a6a16c509..9efffe81c9c 100644 --- a/SA_POP_Types.h +++ b/SA_POP_Types.h @@ -29,7 +29,7 @@ #include "ace/Log_Priority.h" #endif /* SA_POP_HAS_ACE */ - +#define MAX_TASK_INSTS 8 #define ANKET 1 #define SA_POP_DEBUG_NORMAL 5 #define SPARTAN 9 diff --git a/SA_PlanStrategy.cpp b/SA_PlanStrategy.cpp index 9b6b2192dd6..a75d0ea189d 100644 --- a/SA_PlanStrategy.cpp +++ b/SA_PlanStrategy.cpp @@ -146,9 +146,8 @@ bool SA_PlanStrategy::satisfy_open_conds (void) if (this->open_conds_.empty ()) return this->planner_->full_sched(); - //Note: change this number to limit the size of the final plan. Set true for unlimited - //!(this->planner_->get_working_plan()->get_all_insts().size() > 12) - if(!(this->planner_->get_working_plan()->get_all_insts().size() > 8)){ + if( MAX_TASK_INSTS == -1 || + !(this->planner_->get_working_plan()->get_all_insts().size() > MAX_TASK_INSTS)){ // Increment step counter. this->cur_step_++; diff --git a/SA_SchedStrategy.cpp b/SA_SchedStrategy.cpp index d482b76f7a8..065e9098cea 100644 --- a/SA_SchedStrategy.cpp +++ b/SA_SchedStrategy.cpp @@ -97,8 +97,6 @@ bool SA_SchedStrategy::satisfy_sched (TaskInstID task_inst) CommandID cur_cmd_id = this->planner_->cur_command_id(); this->cur_seq_num_=1; - /* - // Do the energy propogation for this task instance // This function automatically does this for the task instances before and after it. @@ -157,7 +155,7 @@ bool SA_SchedStrategy::satisfy_sched (TaskInstID task_inst) return false; } - */ + if(!this->planner_->recurse_plan ()){ this->planner_->undo_through(cur_cmd_id); |