Issue77 Add evaluation contexts, to be passed into the evaluators by the search methods

src/search/weighted_evaluator.cc

 #include "weighted_evaluator.h"
 
 #include <cstdlib>
 #include <sstream>
 
 #include "option_parser.h"
 #include "plugin.h"
 
 WeightedEvaluator::WeightedEvaluator(const Options &opts)
     : evaluator(opts.get_list<ScalarEvaluator *>("evals")[0]),
       w(opts.get<int>("weight")) {
 }
 
 WeightedEvaluator::WeightedEvaluator(ScalarEvaluator *eval, int weight)
     : evaluator(eval), w(weight) {
 }
 
 
 WeightedEvaluator::~WeightedEvaluator() {
 }
 
 void WeightedEvaluator::evaluate(int g, bool preferred) {
-    evaluator->evaluate(g, preferred);
-    value = w * evaluator->get_value();
+    evaluator->evaluate(current_evaluation_context, g, preferred);
+    value = w * evaluator->get_value(current_evaluation_context);
     // TODO: catch overflow?
 }
 
-bool WeightedEvaluator::is_dead_end() const {
-    return evaluator->is_dead_end();
+bool WeightedEvaluator::is_last_evaluated_dead_end() const {
+    return evaluator->is_dead_end(current_evaluation_context);
 }
 
 bool WeightedEvaluator::dead_end_is_reliable() const {
     return evaluator->dead_end_is_reliable();
 }
 
-int WeightedEvaluator::get_value() const {
+int WeightedEvaluator::get_last_evaluated_value() const {
     return value;
 }
 
 void WeightedEvaluator::get_involved_heuristics(std::set<Heuristic *> &hset) {
     evaluator->get_involved_heuristics(hset);
 }
 
 static ScalarEvaluator *_parse(OptionParser &parser) {
     parser.add_list_option<ScalarEvaluator *>("evals");
     parser.add_option<int>("weight");
     Options opts = parser.parse();
     if (parser.dry_run())
         return 0;
     else
         return new WeightedEvaluator(opts);
 }
 
 static Plugin<ScalarEvaluator> _plugin("weight", _parse);