Changeset 13259 for stable/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs

Timestamp:

11/18/15 17:23:48 (8 years ago)

Author:

ascheibe

Message:

#1674 merged r13180,r13183,r13203,r13212,r13257 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs (modified) (7 diffs)

stable/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs

@@ -35 +35 @@
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
-  [Item("External Evaluation Problem", "A problem that is evaluated in a different process.")]
+  [Item("External Evaluation Problem (single-objective)", "A problem that is evaluated in a different process.")]
   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 100)]
   [StorableClass]
-  public class ExternalEvaluationProblem : SingleObjectiveBasicProblem<IEncoding> {
+  // BackwardsCompatibility3.3
+  // Rename class to SingleObjectiveExternalEvaluationProblem
+  public class ExternalEvaluationProblem : SingleObjectiveBasicProblem<IEncoding>, IExternalEvaluationProblem {
 
     public static new Image StaticItemImage {
@@ -89 +91 @@
       Parameters.Add(new OptionalValueParameter<EvaluationCache>("Cache", "Cache of previously evaluated solutions."));
       Parameters.Add(new ValueParameter<CheckedItemCollection<IEvaluationServiceClient>>("Clients", "The clients that are used to communicate with the external application.", new CheckedItemCollection<IEvaluationServiceClient>() { new EvaluationServiceClient() }));
-      Parameters.Add(new ValueParameter<SolutionMessageBuilder>("MessageBuilder", "The message builder that converts from HeuristicLab objects to SolutionMessage representation.", new SolutionMessageBuilder()));
+      Parameters.Add(new ValueParameter<SolutionMessageBuilder>("MessageBuilder", "The message builder that converts from HeuristicLab objects to SolutionMessage representation.", new SolutionMessageBuilder()) { Hidden = true });
       Parameters.Add(new FixedValueParameter<SingleObjectiveOptimizationSupportScript>("SupportScript", "A script that can provide neighborhood and analyze the results of the optimization.", new SingleObjectiveOptimizationSupportScript()));
 
@@ -101 +103 @@
 
     public override double Evaluate(Individual individual, IRandom random) {
-      return Cache == null ? EvaluateOnNextAvailableClient(BuildSolutionMessage(individual)).Quality
-        : Cache.GetValue(BuildSolutionMessage(individual), m => EvaluateOnNextAvailableClient(m).Quality);
+      var qualityMessage = Evaluate(BuildSolutionMessage(individual));
+      if (!qualityMessage.HasExtension(SingleObjectiveQualityMessage.QualityMessage_))
+        throw new InvalidOperationException("The received message is not a SingleObjectiveQualityMessage.");
+      return qualityMessage.GetExtension(SingleObjectiveQualityMessage.QualityMessage_).Quality;
+    }
+    public virtual QualityMessage Evaluate(SolutionMessage solutionMessage) {
+      return Cache == null
+        ? EvaluateOnNextAvailableClient(solutionMessage)
+        : Cache.GetValue(solutionMessage, EvaluateOnNextAvailableClient, GetQualityMessageExtensions());
     }
 
@@ -114 +123 @@
     #endregion
 
-    #region Evaluation Helpers
+    public virtual ExtensionRegistry GetQualityMessageExtensions() {
+      var extensions = ExtensionRegistry.CreateInstance();
+      extensions.Add(SingleObjectiveQualityMessage.QualityMessage_);
+      return extensions;
+    }
+
+    #region Evaluation
     private HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
     private object clientLock = new object();
+
     private QualityMessage EvaluateOnNextAvailableClient(SolutionMessage message) {
       IEvaluationServiceClient client = null;
@@ -130 +146 @@
       try {
         return client.Evaluate(message, GetQualityMessageExtensions());
-      }
-      finally {
+      } finally {
         lock (clientLock) {
           activeClients.Remove(client);
@@ -139 +154 @@
     }
 
-    protected virtual ExtensionRegistry GetQualityMessageExtensions() {
-      return ExtensionRegistry.CreateInstance();
-    }
-
-    private SolutionMessage BuildSolutionMessage(Individual individual) {
+    private SolutionMessage BuildSolutionMessage(Individual individual, int solutionId = 0) {
       lock (clientLock) {
         SolutionMessage.Builder protobufBuilder = SolutionMessage.CreateBuilder();
-        protobufBuilder.SolutionId = 0;
+        protobufBuilder.SolutionId = solutionId;
         var scope = new Scope();
         individual.CopyToScope(scope);
@@ -152 +163 @@
           try {
             MessageBuilder.AddToMessage(variable.Value, variable.Name, protobufBuilder);
-          }
-          catch (ArgumentException ex) {
-            throw new InvalidOperationException(string.Format("ERROR while building solution message: Parameter {0} cannot be added to the message", name), ex);
+          } catch (ArgumentException ex) {
+            throw new InvalidOperationException(string.Format("ERROR while building solution message: Parameter {0} cannot be added to the message", Name), ex);
           }
         }