Changeset 8331 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs

Timestamp:

07/26/12 09:51:13 (12 years ago)

Author:

jkarder

Message:

#1331: merged r8086:8330 from trunk

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs (modified) (7 diffs)

branches/ScatterSearch (trunk integration)

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll

branches/ScatterSearch (trunk integration)/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();

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll