Changeset 14877 for trunk/sources/HeuristicLab.Problems.ExternalEvaluation

Timestamp:

04/19/17 14:42:41 (7 years ago)

Author:

mkommend

Message:

#2774: Allowed storing additional data in the scope of an individual.

Location:

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4

Files:

• ExternalEvaluationProblem.cs (modified) (2 diffs)
• MultiObjectiveExternalEvaluationProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs

@@ -158 +158 @@
       try {
         return client.Evaluate(message, GetQualityMessageExtensions());
-      } finally {
+      }
+      finally {
         lock (clientLock) {
           activeClients.Remove(client);
@@ -170 +171 @@
         SolutionMessage.Builder protobufBuilder = SolutionMessage.CreateBuilder();
         protobufBuilder.SolutionId = solutionId;
-        var scope = new Scope();
-        individual.CopyToScope(scope);
-        foreach (var variable in scope.Variables) {
+        foreach (var variable in individual.Values) {
           try {
-            MessageBuilder.AddToMessage(variable.Value, variable.Name, protobufBuilder);
-          } catch (ArgumentException ex) {
+            MessageBuilder.AddToMessage(variable.Value, variable.Key, protobufBuilder);
+          }
+          catch (ArgumentException ex) {
             throw new InvalidOperationException(string.Format("ERROR while building solution message: Parameter {0} cannot be added to the message", Name), ex);
           }

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/MultiObjectiveExternalEvaluationProblem.cs

@@ -155 +155 @@
       try {
         return client.Evaluate(message, GetQualityMessageExtensions());
-      } finally {
+      }
+      finally {
         lock (clientLock) {
           activeClients.Remove(client);
@@ -167 +168 @@
         SolutionMessage.Builder protobufBuilder = SolutionMessage.CreateBuilder();
         protobufBuilder.SolutionId = solutionId;
-        var scope = new Scope();
-        individual.CopyToScope(scope);
-        foreach (var variable in scope.Variables) {
+        foreach (var variable in individual.Values) {
           try {
-            MessageBuilder.AddToMessage(variable.Value, variable.Name, protobufBuilder);
-          } catch (ArgumentException ex) {
+            MessageBuilder.AddToMessage(variable.Value, variable.Key, protobufBuilder);
+          }
+          catch (ArgumentException ex) {
             throw new InvalidOperationException(string.Format("ERROR while building solution message: Parameter {0} cannot be added to the message", Name), ex);
           }