Breaking Multituner into comptuner and kmeanstuner

[satune.git] / src / Test / runcomptuner.cc

diff --git a/src/Test/runcomptuner.cc b/src/Test/runcomptuner.cc
index dc3c035281d5e6870ad0825e18a0773cfe2da079..6d9b93f15767a2b77853807a48a240fb460dc737 100644 (file)
--- a/src/Test/runcomptuner.cc
+++ b/src/Test/runcomptuner.cc
@@ -1,5 +1,5 @@
 #include "csolver.h"
 #include "csolver.h"

-#include "multituner.h"
+#include "comptuner.h"

 #include "searchtuner.h"
 
 int main(int argc, char **argv) {
 #include "searchtuner.h"
 
 int main(int argc, char **argv) {


@@ -14,7 +14,7 @@ int main(int argc, char **argv) {
        sscanf(argv[2], "%u", &rounds);
        sscanf(argv[3], "%u", &timeout);
 
        sscanf(argv[2], "%u", &rounds);
        sscanf(argv[3], "%u", &timeout);
 

-       MultiTuner *multituner = new MultiTuner(budget, rounds, timeout);
+       CompTuner *multituner = new CompTuner(budget, timeout);

        bool tunerfiles = false;
        for (int i = 4; i < argc; i++) {
                if (!tunerfiles) {
        bool tunerfiles = false;
        for (int i = 4; i < argc; i++) {
                if (!tunerfiles) {


@@ -23,7 +23,7 @@ int main(int argc, char **argv) {
                        else
                                multituner->addProblem(argv[i]);
                } else
                        else
                                multituner->addProblem(argv[i]);
                } else

-                       multituner->addTuner(new SearchTuner(argv[i]));
+                       multituner->addTuner(new SearchTuner(argv[i], true )); //add settings to usedsettigs

        }
 
        if (!tunerfiles) {
        }
 
        if (!tunerfiles) {


@@ -31,7 +31,7 @@ int main(int argc, char **argv) {
                exit(-1);
        }
 
                exit(-1);
        }
 

-       multituner->tuneComp();
+       multituner->tune();

        delete multituner;
        return 0;
 }
        delete multituner;
        return 0;
 }