memoize timeouts

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

diff --git a/src/Tuner/multituner.h b/src/Tuner/multituner.h
index 85b028bc930b3e137eb586ba6ea5975239af8674..87e8557be82e70f84ded95a570c340196fe8bd1a 100644 (file)
--- a/src/Tuner/multituner.h
+++ b/src/Tuner/multituner.h
@@ -7,7 +7,7 @@
 
 class Problem {
 public:
-       Problem(const char *problem, uint timeout);
+       Problem(const char *problem);
        char *getProblem() {return problem;}
        ~Problem();
        CMEMALLOC;
@@ -15,14 +15,14 @@ private:
        int problemnumber;
        int result;
        char *problem;
-        double besttime;
-        uint timeout;
+       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;}
@@ -44,10 +44,11 @@ public:
        void addProblem(const char *filename);
        void addTuner(SearchTuner *tuner);
        void readData(uint numRuns);
-        void updateTimeout(Problem *problem, long long metric);
+       void updateTimeout(Problem *problem, long long metric);
        void tuneK();
        void tuneComp();
        void printData();
+       void findBestThreeTuners();
        CMEMALLOC;
 protected:
        long long evaluate(Problem *problem, TunerRecord *tuner);
@@ -56,7 +57,6 @@ protected:
        void mapProblemsToTuners(Vector<TunerRecord *> *tunerV);
        void improveTuners(Vector<TunerRecord *> *tunerV);
        TunerRecord *tune(TunerRecord *tuner);
-
        Vector<TunerRecord *> allTuners;
        Vector<Problem *> problems;
        Vector<TunerRecord *> tuners;
@@ -65,4 +65,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