Changeset 8660 for branches/GP-MoveOperators/HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces

Timestamp:

09/14/12 18:58:15 (12 years ago)

Author:

gkronber

Message:

#1847 merged r8205:8635 from trunk into branch

Location:

branches/GP-MoveOperators

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationChannel.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationServiceClient.cs (modified) (2 diffs)

branches/GP-MoveOperators

@@ -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/GP-MoveOperators/HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationChannel.cs

@@ -48 +48 @@
     /// <param name="builder">The builder that must match the message type that is to be received.</param>
     /// <returns>The received message.</returns>
-    IMessage Receive(IBuilder builder);
+    IMessage Receive(IBuilder builder, ExtensionRegistry extensions);
     /// <summary>
     /// Tells the channel to close down and terminate open connections.

branches/GP-MoveOperators/HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationServiceClient.cs

@@ -21 +21 @@
 
 using System;
+using Google.ProtocolBuffers;
 using HeuristicLab.Core;
 
@@ -29 +30 @@
     /// </summary>
     /// <param name="solution">The solution message that should be evaluated.</param>
+    /// <param name="qualityExtensions">An extension registry for the quality message that specifies additional custom fields.</param>
     /// <returns>The resulting quality message from the external process.</returns>
-    QualityMessage Evaluate(SolutionMessage solution);
+    QualityMessage Evaluate(SolutionMessage solution, ExtensionRegistry qualityExtensions);
     /// <summary>
     /// Evaluates a given solution in a non-blocking manner.
     /// </summary>
     /// <param name="solution">The solution message that should be evaluated.</param>
+    /// <param name="qualityExtensions">An extension registry for the quality message that specifies additional custom fields.</param>
     /// <param name="callback">The callback method that is invoked when evaluation is finished.</param>
-    void EvaluateAsync(SolutionMessage solution, Action<QualityMessage> callback);
+    void EvaluateAsync(SolutionMessage solution, ExtensionRegistry qualityExtensions, Action<QualityMessage> callback);
   }
 }

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