Changeset 942:75fdd0c6866d in lemon-0.x for src/work/akos/simann_test.cc

Timestamp:

10/11/04 20:02:48 (20 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1285

Message:

Naming and coding style fixes and various other changes.

File:

• src/work/akos/simann_test.cc (modified) (2 diffs)

src/work/akos/simann_test.cc

@@ -1 @@
-#include "SimAnn.h"
+#include "simann.h"
 #include <cstdlib>
 #include <cmath>
 #include <iostream>
 
+using namespace lemon;
+
 class MyController : public SimAnnBase::Controller {
 public:
-  long MaxIter, MaxNoImpr;
-  double af;
+  long iter, last_impr, max_iter, max_no_impr;
+  double temp, annealing_factor;
   MyController() {
-    MaxIter = 500000;
-    MaxNoImpr = 20000;
-    af = 0.9999;
-    T = 1000;
+    iter = last_impr = 0;
+    max_iter = 500000;
+    max_no_impr = 20000;
+    annealing_factor = 0.9999;
+    temp = 1000;
+  }
+  void acceptEvent() {
+    iter++;
+  }
+  void improveEvent() {
+    last_impr = iter;
+  }
+  void rejectEvent() {
+    iter++;
   }
   bool next() {
-    T *= af;
-    std::cout << T << std::endl;
-    return !((sab->getIter() > MaxIter) || (sab->getIter() - sab->getLastImpr() > MaxNoImpr));
+    temp *= annealing_factor;
+    bool quit = (iter > max_iter) || (iter - last_impr > max_no_impr);
+    return !quit;
   }
-  bool accept(double cost) {
-    return (drand48() <= exp(cost / T));
+  bool accept(double cost_diff) {
+    return (drand48() <= exp(cost_diff / temp));
   }
 };
@@ -26 +38 @@
 class MyEntity {
 public:
-  void init() {}
   double mutate() { return 10.0; }
 };
 
 int main() {
-  SimAnn<MyEntity> sa;
-  MyController c;
-  sa.setController(c);
+  SimAnn<MyEntity> simann;
+  MyController ctrl;
+  simann.setController(ctrl);
   MyEntity ent;
-  sa.setEnt(ent);
-  sa.run();
+  simann.setEntity(ent);
+  simann.run();
 }