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

Timestamp:

07/18/12 03:22:03 (12 years ago)

Author:

abeham

Message:

#1896:

• Added tags 1000 to max which can be used as extensions to the quality message
• Updated the evaluator to allow better subclassing in case extensions are used
• Updated the method signatures to pipe the extension registry down to the channel

File:

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

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

@@ -24 +24 @@
 using System.Linq;
 using System.Threading;
+using Google.ProtocolBuffers;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +36 @@
   [StorableClass]
   public class ExternalEvaluator : ValuesCollector, IExternalEvaluationProblemEvaluator {
+    protected HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
+    protected object clientLock = new object();
 
     #region Parameters
@@ -48 +51 @@
     #endregion
 
-    #region Parameter Values
+    #region Parameter Properties
     protected SolutionMessageBuilder MessageBuilder {
       get { return MessageBuilderParameter.Value; }
@@ -55 +58 @@
       get { return ClientsParameter.ActualValue; }
     }
-    #endregion
-
-    #region Fields
-    protected HashSet<IEvaluationServiceClient> activeClients = new HashSet<IEvaluationServiceClient>();
-    protected object clientLock = new object();
     #endregion
 
@@ -103 +101 @@
     }
 
-    protected QualityMessage EvaluateOnNextAvailableClient(SolutionMessage message) {
+    protected virtual QualityMessage EvaluateOnNextAvailableClient(SolutionMessage message) {
       IEvaluationServiceClient client = null;
       lock (clientLock) {
@@ -115 +113 @@
       }
       try {
-        return client.Evaluate(message);
+        return client.Evaluate(message, GetQualityMessageExtensions());
       } finally {
         lock (clientLock) {
@@ -124 +122 @@
     }
 
-    protected SolutionMessage BuildSolutionMessage() {
+    protected virtual ExtensionRegistry GetQualityMessageExtensions() {
+      return ExtensionRegistry.CreateInstance();
+    }
+
+    protected virtual SolutionMessage BuildSolutionMessage() {
       lock (clientLock) {
         SolutionMessage.Builder protobufBuilder = SolutionMessage.CreateBuilder();