Changeset 99

Timestamp:

02/06/09 00:14:35 (3 years ago)

Author:

mirko

Message:

Fixed rng duplication in knapsack sample. More iterations for QAP.

Location:

trunk/samples

Files:

• knapsack/src/main.cc (modified) (9 diffs)
• qap/src/main.cc (modified) (1 diff)

trunk/samples/knapsack/src/main.cc

@@ -324 +324 @@
 {
 public:  
-  knapsack_moves(int maxmoves, int maxswaps, int doubleswaps) 
+  knapsack_moves(mt19937& r, int maxmoves, int maxswaps, int doubleswaps) 
     : mets::move_manager(), 
-      rng(), // use predefined seed for results replication
+      rng(r), // use predefined seed for results replication
       int_range(0), 
       mm(maxmoves), 
@@ -383 +383 @@
   size() const {return moves_m.size(); } 
 protected:
-  mt19937 rng;
+  mt19937& rng;
   uniform_int<> int_range;
   int mm;
@@ -394 +394 @@
 {
 public:  
-  knapsack_all_moves() 
-    : mets::move_manager(), rng() {}
+  knapsack_all_moves(mt19937& r) 
+    : mets::move_manager(), rng(r) {}
 
   ~knapsack_all_moves()
@@ -432 +432 @@
   size() const {return moves_m.size(); } 
 protected:
-  mt19937 rng;
+  mt19937& rng;
 };
 
@@ -538 +538 @@
   knapsack best(start);
 
+#if 0
   stupid_listener printer(optimal, graph);
 
   // 500 set moves max, 1000 swaps and 0 double swaps 
-  knapsack_moves km1(min(ks.size(), 500), 1000, 0);
+  knapsack_moves km1(rng, min(ks.size(), 500), 1000, 0);
 
   // a simple tabu list 
@@ -576 +577 @@
     }
 
-  knapsack_moves km2(min(ks.size(), 1500), 3000, 500);
+  knapsack_moves km2(rng, min(ks.size(), 1500), 3000, 500);
   noimprove_termination_criteria nitc2(min(ks.size(), 2000));
   // resize and keep the same tabu list
@@ -587 +588 @@
   cout << "end of TS phase 2: " << -ts2.best().cost_function() << '\n';
   
-  knapsack_moves km3(min(ks.size(), 4000), 7500, 2500);
+  knapsack_moves km3(rng, min(ks.size(), 4000), 7500, 2500);
   // resize and keep the same tabu list
   tabus.tenure(7);
@@ -601 +602 @@
   solution << dynamic_cast<const knapsack&>(ts3.best()) << endl;
 
+#endif
   ////////////////////////////////////////////////////////////////////////
   // SIMULATED ANNEALING
@@ -612 +614 @@
 
   // NOTE: SA should use all the neighborhood i.e. knapsack_all_moves
-  knapsack_moves kam(min(ks.size(), 5000), 20000, 10000);
-
-  exponential_cooling scs(0.9992);
+  knapsack_moves kam(rng, min(ks.size(), 5000), 20000, 10000);
+
+  exponential_cooling scs(0.98);
 
   // This is not strictly SA:
-  // TODO: add a termination criteria based on temperature
-  noimprove_termination_criteria saitc(5000);
-
-  mets::simulated_annealing sa(saks, sabest, kam, saitc, scs, 
-                               1800*ks.size(), 1e-10);
+  // noimprove_termination_criteria saitc(5000);
+  sa_cooled satc(/*&saitc,*/ 1e-12);
+  mets::simulated_annealing sa(saks, sabest, kam, satc, scs, 
+                               1800*ks.size(), 1e-23, rng);
   sa.attach(saprinter);
   sa.search();

trunk/samples/qap/src/main.cc

@@ -46 +46 @@
   mets::best_ever_criteria aspiration_criteria;
   mets::noimprove_termination_criteria termination_criteria
-    (std::min(N*N*10, 7500));
+    (std::min(N*N*10, 15000));
 
   // the search algorithm