Changeset 958:75f749682240 in lemon-0.x for src/work/akos

Timestamp:

11/04/04 19:52:31 (20 years ago)

Author:

Akos Ladanyi

Branch:

default

Phase:

public

Convert:

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

Message:

Updated because of the recent changes in simann.h.

File:

• src/work/akos/simann_test.cc (modified) (1 diff)

src/work/akos/simann_test.cc

@@ -1 @@
-#include "simann.h"
 #include <cstdlib>
 #include <cmath>
-#include <iostream>
+#include "simann.h"
 
 using namespace lemon;
-
-class MyController : public SimAnnBase::Controller {
-public:
-  long iter, last_impr, max_iter, max_no_impr;
-  double temp, annealing_factor;
-  MyController() {
-    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() {
-    temp *= annealing_factor;
-    bool quit = (iter > max_iter) || (iter - last_impr > max_no_impr);
-    return !quit;
-  }
-  bool accept(double cost_diff) {
-    return (drand48() <= exp(cost_diff / temp));
-  }
-};
 
 class MyEntity {
 public:
   double mutate() { return 10.0; }
+  void revert() {}
 };
 
 int main() {
   SimAnn<MyEntity> simann;
-  MyController ctrl;
+  SimpleController ctrl;
   simann.setController(ctrl);
   MyEntity ent;