[Rmol-svn-commit] SF.net SVN: rmol:[158] trunk/rmol/rmol

[<ben...@us...>]

Revision: 158
          http://rmol.svn.sourceforge.net/rmol/?rev=158&view=rev
Author:   benlardeux
Date:     2008-08-27 08:40:35 +0000 (Wed, 27 Aug 2008)

Log Message:
-----------
Add services that trigger optimization algorithms. 

Modified Paths:
--------------
    trunk/rmol/rmol/RMOL.cpp
    trunk/rmol/rmol/RMOL.hpp

Modified: trunk/rmol/rmol/RMOL.cpp
===================================================================
--- trunk/rmol/rmol/RMOL.cpp	2008-08-25 12:08:51 UTC (rev 157)
+++ trunk/rmol/rmol/RMOL.cpp	2008-08-27 08:40:35 UTC (rev 158)
@@ -74,6 +74,23 @@
 
   // //////////////////////////////////////////////////////////////////////
   void RMOL::
+  optimalOptimisationByMCIntegration (const int K,
+                                      BookingLimitVector_T& ioBookingLimitVector) {
+    
+    assert (_context != NULL);
+    const double iCapacity = _context->getCapacity();
+    BucketHolder* ioBucketHolder_ptr = _context->getBucketHolder();
+    assert (ioBucketHolder_ptr != NULL);
+
+    Optimiser::optimalOptimisationByMCIntegration (K, iCapacity, 
+                                                   *ioBucketHolder_ptr);
+
+    // Fill up booking vector
+    ioBucketHolder_ptr->fillup(ioBookingLimitVector);
+  }
+
+  // //////////////////////////////////////////////////////////////////////
+  void RMOL::
   optimalOptimisationByDP () {
     
     assert (_context != NULL);
@@ -86,6 +103,21 @@
     // Display
     ioBucketHolder_ptr->display();
   }
+
+  // //////////////////////////////////////////////////////////////////////
+  void RMOL::
+  optimalOptimisationByDP (BookingLimitVector_T& ioBookingLimitVector) {
+    
+    assert (_context != NULL);
+    const double iCapacity = _context->getCapacity();
+    BucketHolder* ioBucketHolder_ptr = _context->getBucketHolder();
+    assert (ioBucketHolder_ptr != NULL);
+
+    Optimiser::optimalOptimisationByDP (iCapacity, *ioBucketHolder_ptr);
+
+    // Fill up booking vector
+    ioBucketHolder_ptr->fillup(ioBookingLimitVector);
+  }
   
   // //////////////////////////////////////////////////////////////////////
   void RMOL::heuristicOptimisationByEmsr () {
@@ -101,6 +133,19 @@
   }
 
   // //////////////////////////////////////////////////////////////////////
+  void RMOL::heuristicOptimisationByEmsr (BookingLimitVector_T& ioBookingLimitVector) {
+    assert (_context != NULL);
+    const double iCapacity = _context->getCapacity();
+    BucketHolder* ioBucketHolder_ptr = _context->getBucketHolder();
+    assert (ioBucketHolder_ptr != NULL);
+
+    Optimiser::heuristicOptimisationByEmsr (iCapacity, *ioBucketHolder_ptr);
+
+    // Fill up booking vector
+    ioBucketHolder_ptr->fillup(ioBookingLimitVector);
+  }
+
+  // //////////////////////////////////////////////////////////////////////
   void RMOL::heuristicOptimisationByEmsrA () {
     assert (_context != NULL);
     const double iCapacity = _context->getCapacity();
@@ -112,6 +157,19 @@
     // Display
     ioBucketHolder_ptr->display();
   }
+
+  // //////////////////////////////////////////////////////////////////////
+  void RMOL::heuristicOptimisationByEmsrA (BookingLimitVector_T& ioBookingLimitVector) {
+    assert (_context != NULL);
+    const double iCapacity = _context->getCapacity();
+    BucketHolder* ioBucketHolder_ptr = _context->getBucketHolder();
+    assert (ioBucketHolder_ptr != NULL);
+
+    Optimiser::heuristicOptimisationByEmsrA (iCapacity, *ioBucketHolder_ptr);
+
+    // Fill up booking vector
+    ioBucketHolder_ptr->fillup(ioBookingLimitVector);
+  }
   
   // //////////////////////////////////////////////////////////////////////
   void RMOL::heuristicOptimisationByEmsrB () {

Modified: trunk/rmol/rmol/RMOL.hpp
===================================================================
--- trunk/rmol/rmol/RMOL.hpp	2008-08-25 12:08:51 UTC (rev 157)
+++ trunk/rmol/rmol/RMOL.hpp	2008-08-27 08:40:35 UTC (rev 158)
@@ -29,22 +29,40 @@
     /** Read the input data from a file. */
     void readFromInputFile (const std::string& iInputFileName);
 
-    /** */
+    /** Single resource optimization using the Monte Carlo algorithm. */
     void optimalOptimisationByMCIntegration (const int K);
 
-    /** */
+    /** Single resource optimization that uses Monte-Carlo algorithm and
+        returns a vector of cumulated booking limits. */
+    void optimalOptimisationByMCIntegration (const int K,
+                                               BookingLimitVector_T&);
+
+    /** Single resource optimization using dynamic programming. */
     void optimalOptimisationByDP ();
 
-    /** */
+    /** Single resource optimization that uses dynamic programming and
+        returns a vector of cumulated booking limits. */
+    void optimalOptimisationByDP (BookingLimitVector_T&);
+
+    /** Single resource optimization using EMSR heuristic. */
     void heuristicOptimisationByEmsr ();
+
+    /** Single resource optimization that uses EMSR heuristic and
+        returns a vector of cumulated booking limits. */
+    void heuristicOptimisationByEmsr (BookingLimitVector_T&);
     
-    /** */
+    /** Single resource optimization using EMSR-a heuristic. */
     void heuristicOptimisationByEmsrA ();
+
+    /** Single resource optimization that uses EMSR-a heuristic and
+        returns a vector of cumulated booking limits. */
+    void heuristicOptimisationByEmsrA (BookingLimitVector_T&);
     
-    /** */
+    /** Single resource optimization using EMSR-b heuristic. */
     void heuristicOptimisationByEmsrB ();
 
-    /** */
+    /** Single resource optimization that uses EMSR-b heuristic and
+        returns a vector of cumulated booking limits. */
     void heuristicOptimisationByEmsrB (BookingLimitVector_T&);
 
   private:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.