Changing the design by adding basic tuner

[satune.git] / src / Tuner / multituner.h

diff --git a/src/Tuner/multituner.h b/src/Tuner/multituner.h
index 1c654eb3cf7c1ea748eb73ca0be129b5283bc7ae..cf42d9fd07b5843f319050aac3af36433d269881 100644 (file)
--- a/src/Tuner/multituner.h
+++ b/src/Tuner/multituner.h
@@ -2,64 +2,27 @@
 #define MULTITUNER_H
 #include "classlist.h"
 #include "structs.h"
+#include "basictuner.h"
 
-#define AUTOTUNERFACTOR 0.3
 
-class Problem {
-public:
-       Problem(const char *problem);
-       char *getProblem() {return problem;}
-       ~Problem();
-       CMEMALLOC;
-private:
-       int problemnumber;
-       int result;
-       char *problem;
-       friend class MultiTuner;
-};
-
-class TunerRecord {
-public:
-       TunerRecord(SearchTuner *_tuner) : tuner(_tuner), tunernumber(-1) {}
-       SearchTuner *getTuner() {return tuner;}
-       TunerRecord *changeTuner(SearchTuner *_newtuner);
-       void updateTuner(SearchTuner *_newtuner) {tuner = _newtuner;}
-       long long getTime(Problem *problem);
-       void setTime(Problem *problem, long long time);
-private:
-       SearchTuner *tuner;
-       Vector<Problem *> problems;
-       Hashtable<Problem *, long long, uint64_t> timetaken;
-       int tunernumber;
-       friend class MultiTuner;
-       friend void clearVector(Vector<TunerRecord *> *tunerV);
-};
-
-class MultiTuner {
+class MultiTuner : public BasicTuner {
 public:
        MultiTuner(uint budget, uint rounds, uint timeout);
-       ~MultiTuner();
-       void addProblem(const char *filename);
-       void addTuner(SearchTuner *tuner);
        void readData(uint numRuns);
        void tuneK();
-       void tuneComp();
-       void printData();
-       CMEMALLOC;
+       void tune();
+       void findBestThreeTuners();
 protected:
-       long long evaluate(Problem *problem, TunerRecord *tuner);
        double evaluateAll(TunerRecord *tuner);
-       SearchTuner *mutateTuner(SearchTuner *oldTuner, uint k);
        void mapProblemsToTuners(Vector<TunerRecord *> *tunerV);
        void improveTuners(Vector<TunerRecord *> *tunerV);
        TunerRecord *tune(TunerRecord *tuner);
-
-       Vector<TunerRecord *> allTuners;
-       Vector<Problem *> problems;
-       Vector<TunerRecord *> tuners;
-       uint budget;
        uint rounds;
-       uint timeout;
-       int execnum;
 };
+
+inline long long min(long long num1, long long num2, long long num3) {
+       return num1 < num2 && num1 < num3 ? num1 :
+                                num2 < num3 ? num2 : num3;
+}
+
 #endif