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

Timestamp:

05/31/10 21:06:45 (14 years ago)

Author:

abeham

Message:

#866

• Added license headers to designer files
• Refactored message building, to be user customizable and better extendable
  • A SolutionMessageBuilder holds several Converters
  • A Converter specifies several types to convert and a conversion method
• ExternalEvaluator has the message builder as parameter and exposes it to the UI through the parameters collection
• The proto file has been updated to include a length field in the array variables
• Converters exist for all types in HeuristicLab.Data

Location:

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3

Files:

• Converters (added)
• Converters/BoolConverter.cs (added)
• Converters/DateTimeValueConverter.cs (added)
• Converters/DoubleConverter.cs (added)
• Converters/IntegerConverter.cs (added)
• Converters/StringConverter.cs (added)
• Converters/TimeSpanValueConverter.cs (added)
• ExternalEvaluator.cs (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation-3.3.csproj (modified) (2 diffs)
• Interfaces/IItemToSolutionMessageConverter.cs (added)
• Protos/ExternalEvaluationMessages.proto (modified) (4 diffs)
• SolutionMessageBuilder.cs (added)
• SolutionMessageBuilding.cs (deleted)

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

@@ -38 +38 @@
     }
 
+    public IValueParameter<SolutionMessageBuilder> MessageBuilderParameter {
+      get { return (IValueParameter<SolutionMessageBuilder>)Parameters["MessageBuilder"]; }
+    }
+
+    private SolutionMessageBuilder MessageBuilder {
+      get { return MessageBuilderParameter.Value; }
+    }
+
     public ExternalEvaluator()
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the current solution."));
       Parameters.Add(new ValueLookupParameter<IEvaluationServiceClient>("Client", "The client that communicates with the external process."));
+      Parameters.Add(new ValueParameter<SolutionMessageBuilder>("MessageBuilder", "The message builder that converts from HeuristicLab objects to SolutionMessage representation.", new SolutionMessageBuilder()));
     }
 
     public override IOperation Apply() {
       IEvaluationServiceClient client = ClientParameter.ActualValue;
-      SolutionMessage.Builder messageBuilder = SolutionMessage.CreateBuilder();
-      messageBuilder.SolutionId = 0;
+      SolutionMessage.Builder protobufBuilder = SolutionMessage.CreateBuilder();
+      protobufBuilder.SolutionId = 0;
       foreach (IParameter param in CollectedValues) {
         IItem value = param.ActualValue;
@@ -54 +63 @@
           string name = lookupParam != null ? lookupParam.TranslatedName : param.Name;
           try {
-            value.AddToSolutionMessage(name, messageBuilder);
+            MessageBuilder.AddToMessage(value, name, protobufBuilder);
           } catch (ArgumentException ex) {
             throw new InvalidOperationException("ERROR in " + Name + ": Parameter " + name + " cannot be added to the message.", ex);
@@ -60 +69 @@
         }
       }
-      QualityMessage answer = client.Evaluate(messageBuilder.Build());
+      QualityMessage answer = client.Evaluate(protobufBuilder.Build());
       if (QualityParameter.ActualValue == null)
         QualityParameter.ActualValue = new DoubleValue(answer.Quality);

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLab.Problems.ExternalEvaluation-3.3.csproj

@@ -83 +83 @@
   <ItemGroup>
     <None Include="HeuristicLabProblemsExternalEvaluationPlugin.cs.frame" />
+    <Compile Include="Converters\BoolConverter.cs" />
+    <Compile Include="Converters\TimeSpanValueConverter.cs" />
+    <Compile Include="Converters\DateTimeValueConverter.cs" />
+    <Compile Include="Converters\DoubleConverter.cs" />
+    <Compile Include="Converters\IntegerConverter.cs" />
+    <Compile Include="Converters\StringConverter.cs" />
     <Compile Include="Drivers\EvaluationServiceClient.cs" />
     <Compile Include="Drivers\EvaluationChannel.cs" />
@@ -93 +99 @@
     <Compile Include="Interfaces\IEvaluationChannel.cs" />
     <Compile Include="Interfaces\IExternalEvaluationProblemEvaluator.cs" />
+    <Compile Include="Interfaces\IItemToSolutionMessageConverter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <None Include="Properties\AssemblyInfo.frame" />
     <Compile Include="Protos\ExternalEvaluationMessages.cs" />
-    <Compile Include="SolutionMessageBuilding.cs" />
+    <Compile Include="SolutionMessageBuilder.cs" />
     <None Include="Protos\ProcessProtos.cmd" />
   </ItemGroup>

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Protos/ExternalEvaluationMessages.proto

@@ -14 +14 @@
     required string name = 1;
     repeated int32 data = 2;
+    optional int32 length = 3;
   }
   repeated IntegerArrayVariable integerArrayVars = 3;
@@ -26 +27 @@
     required string name = 1;
     repeated double data = 2;
+    optional int32 length = 3;
   }
   repeated DoubleArrayVariable doubleArrayVars = 5;
@@ -38 +40 @@
     required string name = 1;
     repeated bool data = 2;
+    optional int32 length = 3;
   }
   repeated BoolArrayVariable boolArrayVars = 7;
@@ -50 +53 @@
     required string name = 1;
     repeated string data = 2;
+    optional int32 length = 3;
   }
   repeated StringArrayVariable stringArrayVars = 9;