all algorithm classes inherit from FTRMFF_Algorithm_Impl now

13 files changed, 25 insertions, 94 deletions

diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.cpp
index 6055bdac754..1d61baaecba 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.cpp
@@ -44,8 +44,8 @@ FTRMFF_Basic_Algorithm::FTRMFF_Basic_Algorithm (
   const PROCESSOR_LIST & processors,
   unsigned int consistency_level,
   CTT_Algorithm & ctt)
-  : schedule_ (create_schedule (processors)),
-    consistency_level_ (consistency_level),
+  : FTRMFF_Algorithm_Impl (consistency_level),
+    schedule_ (create_schedule (processors)),
     ctt_ (ctt),
     ranking_algorithm_ (new Simple_Ranking ())
 {
@@ -106,12 +106,6 @@ FTRMFF_Basic_Algorithm::operator () (const TASK_LIST & tasks)
   return transform_schedule (schedule_);
 }
 
-SCHEDULE_PROGRESS_LIST
-FTRMFF_Basic_Algorithm::get_unschedulable ()
-{
-  return unschedulable_;
-}
-
 const SCHEDULE & 
 FTRMFF_Basic_Algorithm::schedule () const
 {
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.h
index 4fb8a7747f7..ba0f2c410fa 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Basic.h
@@ -33,8 +33,7 @@ private:
 };
 
 class FTRMFF_Basic_Algorithm : 
-  public std::unary_function <TASK_LIST,
-                              SCHEDULING_MAP>
+  public FTRMFF_Algorithm_Impl
 {
 public:
   FTRMFF_Basic_Algorithm (const PROCESSOR_LIST & processors,
@@ -45,14 +44,10 @@ public:
 
   virtual SCHEDULING_MAP operator () (const TASK_LIST & tasks);
 
-  SCHEDULE_PROGRESS_LIST get_unschedulable ();
-
-  const SCHEDULE & schedule () const;
+  virtual const SCHEDULE & schedule () const;
 
 private:
   SCHEDULE schedule_;
-  SCHEDULE_PROGRESS_LIST unschedulable_;
-  unsigned int consistency_level_;
   CTT_Algorithm & ctt_;
   std::auto_ptr<Ranking_Algorithm> ranking_algorithm_;
 };
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.cpp
index d8f13adafca..c85caf216dd 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.cpp
@@ -38,8 +38,8 @@ FTRMFF_Enhanced::operator () (const FTRMFF_Input & input)
 FTRMFF_Enhanced_Algorithm::FTRMFF_Enhanced_Algorithm (
   const PROCESSOR_LIST & processors,
   unsigned int consistency_level)
-  : schedule_ (create_schedule (processors)),
-    consistency_level_ (consistency_level),
+  : FTRMFF_Algorithm_Impl (consistency_level),
+    schedule_ (create_schedule (processors)),
     ranking_algorithm_ (new Simple_Ranking ())
 {
 }
@@ -106,12 +106,6 @@ FTRMFF_Enhanced_Algorithm::operator () (const TASK_LIST & tasks)
   return transform_schedule (schedule_);
 }
 
-SCHEDULE_PROGRESS_LIST
-FTRMFF_Enhanced_Algorithm::get_unschedulable ()
-{
-  return unschedulable_;
-}
-
 const SCHEDULE &
 FTRMFF_Enhanced_Algorithm::schedule () const
 {
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.h
index 536fc95e001..432f835631d 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Enhanced.h
@@ -25,8 +25,7 @@ public:
 };
 
 class FTRMFF_Enhanced_Algorithm : 
-  public std::unary_function <TASK_LIST,
-                              SCHEDULING_MAP>
+  public FTRMFF_Algorithm_Impl
 {
 public:
   FTRMFF_Enhanced_Algorithm (const PROCESSOR_LIST & processors,
@@ -36,14 +35,10 @@ public:
 
   virtual SCHEDULING_MAP operator () (const TASK_LIST & tasks);
 
-  SCHEDULE_PROGRESS_LIST get_unschedulable ();
-
-  const SCHEDULE & schedule () const;
+  virtual const SCHEDULE & schedule () const;
 
 private:
   SCHEDULE schedule_;
-  SCHEDULE_PROGRESS_LIST unschedulable_;
-  unsigned int consistency_level_;
   std::auto_ptr<Ranking_Algorithm> ranking_algorithm_;
 };
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.cpp
index 2dbd873eeda..6aa5b09e2e7 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.cpp
@@ -45,7 +45,7 @@ FTRMFF_Forward_Packing_Algorithm::FTRMFF_Forward_Packing_Algorithm (
   const PROCESSOR_LIST & processors,
   unsigned int consistency_level,
   const std::string & scheduler)
-  : consistency_level_ (consistency_level)
+  : FTRMFF_Algorithm_Impl (consistency_level)
 {
   if (scheduler == "Forward_Ranking")
     {
@@ -106,13 +106,7 @@ FTRMFF_Forward_Packing_Algorithm::operator () (const TASK_LIST & tasks)
   return transform_schedule (scheduler_->schedule ());
 }
 
-SCHEDULE_PROGRESS_LIST
-FTRMFF_Forward_Packing_Algorithm::get_unschedulable ()
-{
-  return unschedulable_;
-}
-
-SCHEDULE
+const SCHEDULE &
 FTRMFF_Forward_Packing_Algorithm::schedule () const
 {
   return scheduler_->schedule ();
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.h
index 68b78154c44..1139f4df2d9 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Forward_Packing.h
@@ -29,8 +29,7 @@ private:
 };
 
 class FTRMFF_Forward_Packing_Algorithm : 
-  public std::unary_function <TASK_LIST,
-                              SCHEDULING_MAP>
+  public FTRMFF_Algorithm_Impl
 {
 public:
   FTRMFF_Forward_Packing_Algorithm (const PROCESSOR_LIST & processors,
@@ -41,13 +40,9 @@ public:
 
   virtual SCHEDULING_MAP operator () (const TASK_LIST & tasks);
 
-  SCHEDULE_PROGRESS_LIST get_unschedulable ();
-
-  SCHEDULE schedule () const;
+  virtual const SCHEDULE & schedule () const;
 
 private:
-  SCHEDULE_PROGRESS_LIST unschedulable_;
-  unsigned int consistency_level_;
   std::auto_ptr<Scheduler> scheduler_;
 };
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.cpp
index 018a011308a..778e156179e 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.cpp
@@ -38,8 +38,8 @@ FTRMFF_Packing::operator () (const FTRMFF_Input & input)
 FTRMFF_Packing_Algorithm::FTRMFF_Packing_Algorithm (
   const PROCESSOR_LIST & processors,
   unsigned int consistency_level)
-  : schedule_ (create_schedule (processors)),
-    consistency_level_ (consistency_level)
+  : FTRMFF_Algorithm_Impl (consistency_level),
+    schedule_ (create_schedule (processors))
 {
 }
 
@@ -290,12 +290,6 @@ FTRMFF_Packing_Algorithm::operator () (const TASK_LIST & tasks)
   return transform_schedule (schedule_);
 }
 
-SCHEDULE_PROGRESS_LIST
-FTRMFF_Packing_Algorithm::get_unschedulable ()
-{
-  return unschedulable_;
-}
-
 const SCHEDULE & 
 FTRMFF_Packing_Algorithm::schedule () const
 {
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.h
index 4d4b7d6d75c..e3c199037e3 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Packing.h
@@ -25,21 +25,17 @@ public:
 
 typedef std::vector<TASK_LIST> TASK_LISTS;
 
-class FTRMFF_Packing_Algorithm : 
-  public std::unary_function <TASK_LIST,
-                              SCHEDULING_MAP>
+class FTRMFF_Packing_Algorithm : public FTRMFF_Algorithm_Impl
 {
 public:
   FTRMFF_Packing_Algorithm (const PROCESSOR_LIST & processors,
-                                  unsigned int consistency_level);
+                            unsigned int consistency_level);
 
   virtual ~FTRMFF_Packing_Algorithm ();
 
   virtual SCHEDULING_MAP operator () (const TASK_LIST & tasks);
 
-  SCHEDULE_PROGRESS_LIST get_unschedulable ();
-
-  const SCHEDULE & schedule () const;
+  virtual const SCHEDULE & schedule () const;
 
 private:
   void copy_tasks (unsigned long primary_end,
@@ -53,8 +49,6 @@ private:
 
 private:
   SCHEDULE schedule_;
-  SCHEDULE_PROGRESS_LIST unschedulable_;
-  unsigned int consistency_level_;
 };
 
 #endif /* FTRMFF_PACKING_ALGORITHM_H_ */
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.cpp
index 78687088621..b0802ed6642 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.cpp
@@ -34,7 +34,8 @@ FTRMFF_Primary::operator () (const FTRMFF_Input & input)
 
 FTRMFF_Primary_Algorithm::FTRMFF_Primary_Algorithm (
   const PROCESSOR_LIST & processors)
-  : schedule_ (create_schedule (processors))
+  : FTRMFF_Algorithm_Impl (0),
+    schedule_ (create_schedule (processors))
 {
 }
 
@@ -87,12 +88,6 @@ FTRMFF_Primary_Algorithm::operator () (const TASK_LIST & tasks)
   return transform_schedule (schedule_);
 }
 
-SCHEDULE_PROGRESS_LIST
-FTRMFF_Primary_Algorithm::get_unschedulable ()
-{
-  return unschedulable_;
-}
-
 const SCHEDULE & 
 FTRMFF_Primary_Algorithm::schedule () const
 {
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.h
index 7969d231841..b3a3635f774 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Primary.h
@@ -24,9 +24,7 @@ public:
   virtual FTRMFF_Output operator () (const FTRMFF_Input & input);
 };
 
-class FTRMFF_Primary_Algorithm : 
-  public std::unary_function <TASK_LIST,
-                              SCHEDULING_MAP>
+class FTRMFF_Primary_Algorithm : public FTRMFF_Algorithm_Impl
 {
 public:
   FTRMFF_Primary_Algorithm (const PROCESSOR_LIST & processors);
@@ -35,13 +33,10 @@ public:
 
   virtual SCHEDULING_MAP operator () (const TASK_LIST & tasks);
 
-  SCHEDULE_PROGRESS_LIST get_unschedulable ();
-
-  const SCHEDULE & schedule () const;
+  virtual const SCHEDULE & schedule () const;
 
 private:
   SCHEDULE schedule_;
-  SCHEDULE_PROGRESS_LIST unschedulable_;
   CTT_Basic ctt_;
 };
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.cpp
index 2712c40ef4e..47612dc943e 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.cpp
@@ -41,8 +41,8 @@ FTRMFF_Ranked_Algorithm::FTRMFF_Ranked_Algorithm (
   const PROCESSOR_LIST & processors,
   unsigned int consistency_level,
   const std::string & ranking_type)
-  : schedule_ (create_schedule (processors)),
-    consistency_level_ (consistency_level)
+  : FTRMFF_Algorithm_Impl (consistency_level),
+    schedule_ (create_schedule (processors))
 {
   if (ranking_type.compare ("utilization") == 0)
     ranking_algorithm_.reset (new Utilization_Ranking ());
@@ -111,13 +111,6 @@ FTRMFF_Ranked_Algorithm::operator () (const TASK_LIST & tasks)
 
   return transform_schedule (schedule_);
 }
-
-SCHEDULE_PROGRESS_LIST
-FTRMFF_Ranked_Algorithm::get_unschedulable ()
-{
-  return unschedulable_;
-}
-
 const SCHEDULE & 
 FTRMFF_Ranked_Algorithm::schedule () const
 {
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.h
index a4d1ef56e0f..ddf2e3f9603 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Ranked.h
@@ -24,9 +24,7 @@ public:
   virtual FTRMFF_Output operator () (const FTRMFF_Input & input);
 };
 
-class FTRMFF_Ranked_Algorithm : 
-  public std::unary_function <TASK_LIST,
-                              SCHEDULING_MAP>
+class FTRMFF_Ranked_Algorithm : public FTRMFF_Algorithm_Impl
 {
 public:
   FTRMFF_Ranked_Algorithm (const PROCESSOR_LIST & processors,
@@ -37,14 +35,10 @@ public:
 
   virtual SCHEDULING_MAP operator () (const TASK_LIST & tasks);
 
-  SCHEDULE_PROGRESS_LIST get_unschedulable ();
-
-  const SCHEDULE & schedule () const;
+  virtual const SCHEDULE & schedule () const;
 
 private:
   SCHEDULE schedule_;
-  SCHEDULE_PROGRESS_LIST unschedulable_;
-  unsigned int consistency_level_;
   std::auto_ptr<Ranking_Algorithm> ranking_algorithm_;
 };
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.h
index 79fb183d02c..c93e24aaebe 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.h
@@ -38,7 +38,6 @@ public:
 
 private:
   SCHEDULE schedule_;
-  SCHEDULE_PROGRESS_LIST unschedulable_;
 };
 
 #endif /* FTRMFF_WORSTFIT_ALGORITHM_H_ */