Changeset 6140 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs

Timestamp:

05/06/11 15:08:57 (13 years ago)

Author:

epitzer

Message:

Add new CachedExternalEvaluator with replaceable permanent cache of all evaluated solutions (#1516)

File:

• trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs

@@ -32 +32 @@
   [StorableClass]
   public class ExternalEvaluator : ValuesCollector, IExternalEvaluationProblemEvaluator {
+
     public ILookupParameter<DoubleValue> QualityParameter {
       get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
@@ -43 +44 @@
     }
 
-    private SolutionMessageBuilder MessageBuilder {
+    protected SolutionMessageBuilder MessageBuilder {
       get { return MessageBuilderParameter.Value; }
     }
@@ -61 +62 @@
 
     public override IOperation Apply() {
+      SolutionMessage message = BuildSolutionMessage();
+
       IEvaluationServiceClient client = ClientParameter.ActualValue;
+      QualityMessage answer = client.Evaluate(message);
+
+      if (QualityParameter.ActualValue == null)
+        QualityParameter.ActualValue = new DoubleValue(answer.Quality);
+      else QualityParameter.ActualValue.Value = answer.Quality;
+
+      return base.Apply();
+    }
+
+    protected virtual SolutionMessage BuildSolutionMessage() {
       SolutionMessage.Builder protobufBuilder = SolutionMessage.CreateBuilder();
       protobufBuilder.SolutionId = 0;
@@ -71 +84 @@
           try {
             MessageBuilder.AddToMessage(value, name, protobufBuilder);
-          }
-          catch (ArgumentException ex) {
+          } catch (ArgumentException ex) {
             throw new InvalidOperationException("ERROR in " + Name + ": Parameter " + name + " cannot be added to the message.", ex);
           }
         }
       }
-      QualityMessage answer = client.Evaluate(protobufBuilder.Build());
-      if (QualityParameter.ActualValue == null)
-        QualityParameter.ActualValue = new DoubleValue(answer.Quality);
-      else QualityParameter.ActualValue.Value = answer.Quality;
-
-      return base.Apply();
+      return protobufBuilder.Build();
     }
   }