renamed worstfit algorithm

5 files changed, 34 insertions, 34 deletions

diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/DeCoRAM.mpc b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/DeCoRAM.mpc
index a45d036b5f5..3c4aef983ee 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/DeCoRAM.mpc
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/DeCoRAM.mpc
@@ -106,8 +106,8 @@ project (worstfit_ranked_ftrmff) {
     OptimizedWCRT.cpp
     RankedWCRT.cpp
     Simple_Ranking.cpp
-    FTRMFF_Bestfit.cpp
-    bestfit_ftrmff.cpp
+    FTRMFF_Worstfit.cpp
+    worstfit_ftrmff.cpp
   }
 }
 
@@ -128,7 +128,7 @@ project (binary_ranked_ftrmff) {
     OptimizedWCRT.cpp
     RankedWCRT.cpp
     Simple_Ranking.cpp
-    FTRMFF_Bestfit.cpp
+    FTRMFF_Worstfit.cpp
     FTRMFF_Binary_Search.cpp
     FTRMFF_Basic.cpp
     binary_ftrmff.cpp
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Binary_Search.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Binary_Search.cpp
index e4b7df6eac7..4c3cc5942de 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Binary_Search.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Binary_Search.cpp
@@ -12,7 +12,7 @@
 
 #include "FTRMFF_Binary_Search.h"
 #include "FTRMFF_Basic.h"
-#include "FTRMFF_Bestfit.h"
+#include "FTRMFF_Worstfit.h"
 #include "CTT_Enhanced.h"
 #include "CTT_Basic.h"
 
@@ -92,21 +92,21 @@ FTRMFF_Binary_Search_Algorithm::operator () (const TASK_LIST & tasks)
       TRACE ("Binary Search: max = " << max << " min = " << min);
 
       // schedule with the average value between minimum and maximum
-      FTRMFF_Bestfit_Algorithm bestfit_ftrmff (
+      FTRMFF_Worstfit_Algorithm worstfit_ftrmff (
         create_processors (min + ((max - min)/2)),
         consistency_level_);
      
-      bestfit_ftrmff (tasks);
+      worstfit_ftrmff (tasks);
 
       // determine number of used processors
-      processors = processor_usage (bestfit_ftrmff.schedule ());
+      processors = processor_usage (worstfit_ftrmff.schedule ());
 
       // if successful schedule
-      if (bestfit_ftrmff.get_unschedulable ().empty ())
+      if (worstfit_ftrmff.get_unschedulable ().empty ())
         {
           // store number of processors as new max
           max = processors;
-          schedule_ = bestfit_ftrmff.schedule ();
+          schedule_ = worstfit_ftrmff.schedule ();
         }
       else // not schedulable
         {
@@ -124,15 +124,15 @@ FTRMFF_Binary_Search_Algorithm::operator () (const TASK_LIST & tasks)
     {
       // in failure case try maximum number of processors and then
       // give up.
-      FTRMFF_Bestfit_Algorithm bestfit_ftrmff (
+      FTRMFF_Worstfit_Algorithm worstfit_ftrmff (
         create_processors (max),
         consistency_level_);
       
-      SCHEDULING_MAP result = bestfit_ftrmff (tasks);
+      SCHEDULING_MAP result = worstfit_ftrmff (tasks);
 
-      unschedulable_ = bestfit_ftrmff.get_unschedulable ();
+      unschedulable_ = worstfit_ftrmff.get_unschedulable ();
 
-      schedule_ = bestfit_ftrmff.schedule ();
+      schedule_ = worstfit_ftrmff.schedule ();
 
       return result;
     }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Bestfit.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.cpp
index 2a0666c8f16..db4d5d2b0ba 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Bestfit.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.cpp
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    FTRMFF_Bestfit.cpp
+ *  @file    FTRMFF_Worstfit.cpp
  *
  *  $Id$
  *
@@ -10,18 +10,18 @@
  */
 //=============================================================================
 
-#include "FTRMFF_Bestfit.h"
+#include "FTRMFF_Worstfit.h"
 #include "RankedWCRT.h"
 #include "Utilization_Ranking.h"
 
-FTRMFF_Bestfit::~FTRMFF_Bestfit ()
+FTRMFF_Worstfit::~FTRMFF_Worstfit ()
 {
 }
 
 FTRMFF_Output
-FTRMFF_Bestfit::operator () (const FTRMFF_Input & input)
+FTRMFF_Worstfit::operator () (const FTRMFF_Input & input)
 {
-  FTRMFF_Bestfit_Algorithm algorithm (input.processors,
+  FTRMFF_Worstfit_Algorithm algorithm (input.processors,
                                       input.backup_count);
 
   FTRMFF_Output output;
@@ -33,7 +33,7 @@ FTRMFF_Bestfit::operator () (const FTRMFF_Input & input)
   return output;
 }
 
-FTRMFF_Bestfit_Algorithm::FTRMFF_Bestfit_Algorithm (
+FTRMFF_Worstfit_Algorithm::FTRMFF_Worstfit_Algorithm (
   const PROCESSOR_LIST & processors,
   unsigned int consistency_level)
   : schedule_ (create_schedule (processors)),
@@ -41,12 +41,12 @@ FTRMFF_Bestfit_Algorithm::FTRMFF_Bestfit_Algorithm (
 {
 }
 
-FTRMFF_Bestfit_Algorithm::~FTRMFF_Bestfit_Algorithm ()
+FTRMFF_Worstfit_Algorithm::~FTRMFF_Worstfit_Algorithm ()
 {
 }
 
 SCHEDULING_MAP
-FTRMFF_Bestfit_Algorithm::operator () (const TASK_LIST & tasks)
+FTRMFF_Worstfit_Algorithm::operator () (const TASK_LIST & tasks)
 {
   // sort tasks according to their worst case response times
   TASK_LIST sorted_tasks = tasks;
@@ -133,13 +133,13 @@ FTRMFF_Bestfit_Algorithm::operator () (const TASK_LIST & tasks)
 }
 
 SCHEDULE_PROGRESS_LIST
-FTRMFF_Bestfit_Algorithm::get_unschedulable ()
+FTRMFF_Worstfit_Algorithm::get_unschedulable ()
 {
   return unschedulable_;
 }
 
 const SCHEDULE & 
-FTRMFF_Bestfit_Algorithm::schedule () const
+FTRMFF_Worstfit_Algorithm::schedule () const
 {
   return schedule_;
 }
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Bestfit.h b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.h
index 98cca0f995e..66d305f3201 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Bestfit.h
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/FTRMFF_Worstfit.h
@@ -2,7 +2,7 @@
 
 //=============================================================================
 /**
- *  @file    FTRMFF_Bestfit.h
+ *  @file    FTRMFF_Worstfit.h
  *
  *  $Id$
  *
@@ -10,28 +10,28 @@
  */
 //=============================================================================
 
-#ifndef FTRMFF_BESTFIT_ALGORITHM_H_
-#define FTRMFF_BESTFIT_ALGORITHM_H_
+#ifndef FTRMFF_WORSTFIT_ALGORITHM_H_
+#define FTRMFF_WORSTFIT_ALGORITHM_H_
 
 #include "Schedule.h"
 
-class FTRMFF_Bestfit : public FTRMFF_Algorithm
+class FTRMFF_Worstfit : public FTRMFF_Algorithm
 {
 public:
-  virtual ~FTRMFF_Bestfit ();
+  virtual ~FTRMFF_Worstfit ();
 
   virtual FTRMFF_Output operator () (const FTRMFF_Input & input);
 };
 
-class FTRMFF_Bestfit_Algorithm : 
+class FTRMFF_Worstfit_Algorithm : 
   public std::unary_function <TASK_LIST,
                               SCHEDULING_MAP>
 {
 public:
-  FTRMFF_Bestfit_Algorithm (const PROCESSOR_LIST & processors,
+  FTRMFF_Worstfit_Algorithm (const PROCESSOR_LIST & processors,
                             unsigned int consistency_level);
 
-  virtual ~FTRMFF_Bestfit_Algorithm ();
+  virtual ~FTRMFF_Worstfit_Algorithm ();
 
   virtual SCHEDULING_MAP operator () (const TASK_LIST & tasks);
 
@@ -45,4 +45,4 @@ private:
   unsigned int consistency_level_;
 };
 
-#endif /* FTRMFF_BESTFIT_ALGORITHM_H_ */
+#endif /* FTRMFF_WORSTFIT_ALGORITHM_H_ */
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/bestfit_ftrmff.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/worstfit_ftrmff.cpp
index 0ffa5684a6c..eea5b436123 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/bestfit_ftrmff.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/worstfit_ftrmff.cpp
@@ -14,7 +14,7 @@
 #include <sstream>
 #include <iostream>
 #include <ace/Get_Opt.h>
-#include "FTRMFF_Bestfit.h"
+#include "FTRMFF_Worstfit.h"
 
 std::string filename = "test.sd"; // filename of task list input
 unsigned int m = 4; // number of processors
@@ -57,7 +57,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
   
   ifile.close ();
 
-  FTRMFF_Bestfit ftrmff;
+  FTRMFF_Worstfit ftrmff;
 
   FTRMFF_Input input;
   input.tasks = tasks;