Fix tuner issues

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

diff --git a/src/Tuner/multituner.h b/src/Tuner/multituner.h
index 1c2a1fe7f5a61c4db02ae3402c40f869496d5af0..69430cc7408617776816ad9342bf82885def7d0b 100644 (file)
--- a/src/Tuner/multituner.h
+++ b/src/Tuner/multituner.h
@@ -21,9 +21,14 @@ class TunerRecord {
 public:
        TunerRecord(SearchTuner *_tuner) : tuner(_tuner) {}
        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;
        friend class MultiTuner;
        friend void clearVector(Vector<TunerRecord *> *tunerV);
 };
@@ -34,18 +39,19 @@ public:
        ~MultiTuner();
        void addProblem(const char *filename);
        void addTuner(SearchTuner *tuner);
-
        void tuneK();
+       void tuneComp();
        CMEMALLOC;
 protected:
-       long long evaluate(Problem *problem, SearchTuner *tuner);
-       double evaluateAll(SearchTuner *tuner, Vector<Problem *> *tProblems);
+       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);
-       SearchTuner *tune(SearchTuner *tuner, Vector<Problem *> *tProblems);
+       TunerRecord *tune(TunerRecord *tuner);
 
 
+       Vector<TunerRecord *> allTuners;
        Vector<Problem *> problems;
        Vector<TunerRecord *> tuners;
        uint budget;