more edits

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

diff --git a/src/Tuner/multituner.h b/src/Tuner/multituner.h
index f14dbccf47341341ea89f1782bfe82ffdb2cd57e..79cacf69e60c4ff9063c487736ddbaa92fee4312 100644 (file)
--- a/src/Tuner/multituner.h
+++ b/src/Tuner/multituner.h
@@ -25,6 +25,7 @@ private:
        SearchTuner *tuner;
        Vector<Problem *> problems;
        friend class MultiTuner;
        SearchTuner *tuner;
        Vector<Problem *> problems;
        friend class MultiTuner;

+       friend void clearVector(Vector<TunerRecord *> *tunerV);

 };
 
 class MultiTuner {
 };
 
 class MultiTuner {


@@ -33,14 +34,17 @@ public:
        ~MultiTuner();
        void addProblem(const char *filename);
        void addTuner(SearchTuner *tuner);
        ~MultiTuner();
        void addProblem(const char *filename);
        void addTuner(SearchTuner *tuner);

-       void tune();
+

        void tuneK();
        CMEMALLOC;
 protected:
        long long evaluate(Problem *problem, SearchTuner *tuner);
        void tuneK();
        CMEMALLOC;
 protected:
        long long evaluate(Problem *problem, SearchTuner *tuner);

-       double evaluateAll(SearchTuner *tuner);
+       double evaluateAll(SearchTuner *tuner, Vector<Problem *> *tProblems);

        SearchTuner *mutateTuner(SearchTuner *oldTuner, uint k);
        void mapProblemsToTuners(Vector<TunerRecord *> *tunerV);
        SearchTuner *mutateTuner(SearchTuner *oldTuner, uint k);
        void mapProblemsToTuners(Vector<TunerRecord *> *tunerV);

+       void improveTuners(Vector<TunerRecord *> *tunerV);
+       SearchTuner *tune(SearchTuner *tuner, Vector<Problem *> *tProblems);
+

 
        Vector<Problem *> problems;
        Vector<TunerRecord *> tuners;
 
        Vector<Problem *> problems;
        Vector<TunerRecord *> tuners;