Adding Simulated Annealing Tuner ...

[satune.git] / src / Tuner / randomtuner.cc

diff --git a/src/Tuner/randomtuner.cc b/src/Tuner/randomtuner.cc
index 1c1a0f3a4e2fc03f509e90a882df3f99423c9644..6fefc465fe1f0150618e3348b0d1779582f76359 100644 (file)
--- a/src/Tuner/randomtuner.cc
+++ b/src/Tuner/randomtuner.cc
@@ -1,7 +1,7 @@
 #include "randomtuner.h"
 #include "csolver.h"
 #include "searchtuner.h"
-#include "multituner.h"
+#include "comptuner.h"
 #include <math.h>
 #include <stdlib.h>
 #include <limits>
@@ -12,6 +12,10 @@ RandomTuner::RandomTuner(uint _budget, uint _timeout) :
        BasicTuner(_budget, _timeout) {
 }
 
+RandomTuner::~RandomTuner(){
+       
+}
+
 void RandomTuner::tune() {
        for (uint r = 0; r < budget; r++) {
                model_print("Round %u of %u\n", r, budget);
@@ -30,7 +34,7 @@ void RandomTuner::tune() {
                                                tuner->setTime(problem, metric);
                                        else
                                                tuner->setTime(problem, -2);
-                                       if(tunerExists(tuner->getTuner())){
+                                       if(tunerExists(tuner)){
                                                //Solving the problem and noticing the tuner
                                                //already exists
                                                isNew = false;
@@ -46,7 +50,7 @@ void RandomTuner::tune() {
                uint tSize = tuners.getSize();
                for (uint i = 0; i < tSize; i++) {
                        SearchTuner *tmpTuner = mutateTuner(tuners.get(i)->getTuner(), budget);
-                       while(subTunerExist(tmpTuner)){
+                       while(subTunerIndex(tmpTuner) != -1){
                                tmpTuner->randomMutate();
                        }
                        TunerRecord *tmp = new TunerRecord(tmpTuner);