Bug fix:duplicated tuners in explored array

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

diff --git a/src/Tuner/multituner.h b/src/Tuner/multituner.h
index 73201dd0ade136f3b764fd413d9990767ce603d2..e1845403bff881b46ef3d68625756bf76c7f6714 100644 (file)
--- a/src/Tuner/multituner.h
+++ b/src/Tuner/multituner.h
@@ -12,19 +12,23 @@ public:
        ~Problem();
        CMEMALLOC;
 private:
+       int problemnumber;
        int result;
        char *problem;
+       long long besttime;
        friend class MultiTuner;
 };
 
 class TunerRecord {
 public:
        TunerRecord(SearchTuner *_tuner) : tuner(_tuner), tunernumber(-1) {}
+       TunerRecord(SearchTuner *_tuner, int _tunernumber) : tuner(_tuner), tunernumber(_tunernumber) {}
        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);
+        void print();
 private:
        SearchTuner *tuner;
        Vector<Problem *> problems;
@@ -40,19 +44,24 @@ public:
        ~MultiTuner();
        void addProblem(const char *filename);
        void addTuner(SearchTuner *tuner);
+       void readData(uint numRuns);
+       void updateTimeout(Problem *problem, long long metric);
        void tuneK();
+       bool finishTunerExist(TunerRecord *tuner);
        void tuneComp();
        void printData();
+       void findBestThreeTuners();
        CMEMALLOC;
 protected:
        long long evaluate(Problem *problem, TunerRecord *tuner);
        double evaluateAll(TunerRecord *tuner);
        SearchTuner *mutateTuner(SearchTuner *oldTuner, uint k);
+       bool hasExplored(SearchTuner *newTuner);
        void mapProblemsToTuners(Vector<TunerRecord *> *tunerV);
        void improveTuners(Vector<TunerRecord *> *tunerV);
        TunerRecord *tune(TunerRecord *tuner);
-
        Vector<TunerRecord *> allTuners;
+       Vector<TunerRecord *> explored;
        Vector<Problem *> problems;
        Vector<TunerRecord *> tuners;
        uint budget;
@@ -60,4 +69,10 @@ protected:
        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