diff options
| author | nshankar <nshankar@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-07 19:51:33 +0000 |
|---|---|---|
| committer | nshankar <nshankar@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-11-07 19:51:33 +0000 |
| commit | f4732a15372bbbe5d9e631a376daea97099fcfcd (patch) | |
| tree | 531de5a1ae7bad7c271750f317ebb5f137d7161e | |
| parent | cfbc34deb361e9d2cf2033178ee79a4919b0b305 (diff) | |
| download | ATCD-f4732a15372bbbe5d9e631a376daea97099fcfcd.tar.gz | |
Tue Nov 7 19:50:13 UTC 2006 Nishanth Shankaran <nshankar@nosmam.com>
| -rw-r--r-- | SA_POP/SA_POP.mpc | 2 | ||||
| -rw-r--r-- | SA_POP/SA_WorkingPlan.h | 15 | ||||
| -rw-r--r-- | SA_POP/server/Driver.cpp | 2 | ||||
| -rw-r--r-- | SA_POP/server/Driver.mpc | 2 |
4 files changed, 10 insertions, 11 deletions
diff --git a/SA_POP/SA_POP.mpc b/SA_POP/SA_POP.mpc index 9dddc41c5ea..7aa9ddf6972 100644 --- a/SA_POP/SA_POP.mpc +++ b/SA_POP/SA_POP.mpc @@ -1,4 +1,4 @@ -project(SA_POP) : ciao_config_handlers, xerces, taolib { +project(SA_POP) : ciao_config_handlers, ciao_deployment_stub, xerces { after += XSC_Config_Handlers sharedname = SA_POP diff --git a/SA_POP/SA_WorkingPlan.h b/SA_POP/SA_WorkingPlan.h index 0ecf1137b54..9b31018fd65 100644 --- a/SA_POP/SA_WorkingPlan.h +++ b/SA_POP/SA_WorkingPlan.h @@ -49,7 +49,7 @@ namespace SA_POP { virtual void set_commands (AddOpenThreatsCmd *add_threats_cmd); /// Set goal. - /** + /** * @param goal Goal of this working plan. */ virtual void set_goal (const SA_POP::Goal &goal); @@ -159,7 +159,7 @@ namespace SA_POP { * @param second_task_inst The task instance after the first one */ virtual void remove_sched_link(TaskInstID first_task_inst, TaskInstID second_task_inst); - + /// Get all the task instances virtual TaskInstSet get_all_insts(); @@ -356,34 +356,33 @@ namespace SA_POP { /// This is a particular Precedence set. Like Before, After etc. typedef std::map <TaskInstID, TaskInstSet> PrecedenceSet; - /// Type of a Precedence Relation mapped to a Precedence Set. + /// Type of a Precedence Relation mapped to a Precedence Set. /// This gives the whole Precedence Graph typedef std::map <PrecedenceRelation, PrecedenceSet> PrecedenceGraph; /// PrecedenceGraph PrecedenceGraph precedence_graph_; - + /// Type of an ordering imposed during Scheduling. /// First task instance is ordered before the second. typedef std::multimap <TaskInstID, TaskInstID> SchedulingLinks; - + /// Map of the imposed orderings SchedulingLinks sched_links_; /// Map from task instances to the time windows typedef std::map <TaskInstID, TimeWindow> InstToWinMap; - typedef std::map <TaskInstID, TimeWindow> InstToWinMap; /// InstToWinMap and InstToWinMap InstToWinMap start_window_map_; InstToWinMap end_window_map_; - + /// Type of a map of task instances and the durations typedef std::map <TaskInstID, TimeValue> DurationMap; DurationMap durations; - // The initial start and end windows. There has to be something + // The initial start and end windows. There has to be something // in this for every task instance be it {NULL_TIME,NULL_TIME} InstToWinMap init_start; InstToWinMap init_end; diff --git a/SA_POP/server/Driver.cpp b/SA_POP/server/Driver.cpp index 6b0919e65fe..dabe111ed33 100644 --- a/SA_POP/server/Driver.cpp +++ b/SA_POP/server/Driver.cpp @@ -227,7 +227,7 @@ namespace CIAO // Map from instance IDs to instance index. - typedef std::map <::SA_POP::TaskInstID, CORBA::ULong> InstToIndexMap; + typedef std::map < ::SA_POP::TaskInstID, CORBA::ULong> InstToIndexMap; InstToIndexMap inst_to_index; inst_to_index.clear (); diff --git a/SA_POP/server/Driver.mpc b/SA_POP/server/Driver.mpc index caffb8a574f..5273401c44b 100644 --- a/SA_POP/server/Driver.mpc +++ b/SA_POP/server/Driver.mpc @@ -1,4 +1,4 @@ -project(Driver_stub): ciao_client_dnc, ciao_race_component { +project(Driver_stub): ciao_deployment_stub, ciao_race_component{ sharedname = Driver_stub idlflags += -Wb,stub_export_macro=DRIVER_STUB_Export \ -Wb,stub_export_include=Driver_stub_export.h \ |