Changeset 3859 for trunk

Timestamp:

05/26/10 15:18:42 (15 years ago)

Author:

abeham

Message:

#866

• Updated external evaluation problem
• Added some Drivers
• Updated message

Location:

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3

Files:

• Drivers (added)
• Drivers/ExternalEvaluationDriver.cs (added)
• Drivers/ExternalEvaluationProcessDriver.cs (added)
• Drivers/ExternalEvaluationStreamDriver.cs (added)
• ExternalEvaluationProblem.cs (modified) (1 diff)
• ExternalEvaluationSolutionCreator.cs (added)
• ExternalEvaluator.cs (added)
• HeuristicLab.Problems.ExternalEvaluation-3.3.csproj (modified) (4 diffs)
• HeuristicLabProblemsExternalEvaluationPlugin.cs (modified) (1 diff)
• Interfaces/IExternalEvaluationDriver.cs (modified) (2 diffs)
• Interfaces/IExternalEvaluationProblemEvaluator.cs (added)
• Protos/ExternalEvaluationMessages.cs (added)
• Protos/ExternalEvaluationMessages.proto (modified) (8 diffs)
• Protos/ProcessProtos.cmd (added)
• SolutionMessageBuilding.cs (added)

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

@@ -23 +23 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Parameters;
+using System.Drawing;
+using HeuristicLab.Optimization;
+using HeuristicLab.Data;
+using HeuristicLab.Operators;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
   [Item("External Evaluation Problem", "A problem that is evaluated in a different process.")]
   [StorableClass]
-  public class ExternalEvaluationProblem : ParameterizedNamedItem {
+  public class ExternalEvaluationProblem : ParameterizedNamedItem, ISingleObjectiveProblem {
+    public override Image ItemImage {
+      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Type; }
+    }
+
     #region Parameters
+    private IValueParameter<IExternalEvaluationDriver> DriverParameter {
+      get { return (IValueParameter<IExternalEvaluationDriver>)Parameters["Driver"]; }
+    }
+    private IValueParameter<IExternalEvaluationProblemEvaluator> EvaluatorParameter {
+      get { return (IValueParameter<IExternalEvaluationProblemEvaluator>)Parameters["Evaluator"]; }
+    }
+    public ValueParameter<BoolValue> MaximizationParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["Maximization"]; }
+    }
+    IParameter ISingleObjectiveProblem.MaximizationParameter {
+      get { return MaximizationParameter; }
+    }
+    public ValueParameter<IOperator> SolutionCreatorParameter {
+      get { return (ValueParameter<IOperator>)Parameters["SolutionCreator"]; }
+    }
+    IParameter IProblem.SolutionCreatorParameter {
+      get { return SolutionCreatorParameter; }
+    }
+    IParameter IProblem.EvaluatorParameter {
+      get { return EvaluatorParameter; }
+    }
+    public OptionalValueParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (OptionalValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
+    }
+    IParameter ISingleObjectiveProblem.BestKnownQualityParameter {
+      get { return BestKnownQualityParameter; }
+    }
+    public OptionalValueParameter<IScope> BestKnownSolutionParameter {
+      get { return (OptionalValueParameter<IScope>)Parameters["BestKnownSolution"]; }
+    }
     #endregion
 
     public ExternalEvaluationProblem()
       : base() {
+      ExternalEvaluator evaluator = new ExternalEvaluator();
+      EmptyOperator solutionCreator = new EmptyOperator();
+
       Parameters.Add(new ValueParameter<IExternalEvaluationDriver>("Driver", "The communication driver that is used to exchange data with the external process."));
+      Parameters.Add(new ValueParameter<IExternalEvaluationProblemEvaluator>("Evaluator", "The evaluator that collects the values to exchange.", evaluator));
+      Parameters.Add(new ValueParameter<IOperator>("SolutionCreator", "An operator to create the solution components.", solutionCreator));
     }
   }

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

@@ -68 +68 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml.Linq">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -78 +79 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Drivers\ExternalEvaluationDriver.cs" />
+    <Compile Include="Drivers\ExternalEvaluationProcessDriver.cs" />
+    <Compile Include="Drivers\ExternalEvaluationStreamDriver.cs" />
     <Compile Include="ExternalEvaluationProblem.cs" />
+    <Compile Include="ExternalEvaluator.cs" />
     <Compile Include="HeuristicLabProblemsExternalEvaluationPlugin.cs" />
     <Compile Include="Interfaces\IExternalEvaluationDriver.cs" />
+    <Compile Include="Interfaces\IExternalEvaluationProblemEvaluator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Protos\ExternalEvaluationMessages.cs" />
+    <Compile Include="SolutionMessageBuilding.cs" />
+    <None Include="Protos\ProcessProtos.cmd" />
   </ItemGroup>
   <ItemGroup>
@@ -88 +97 @@
       <Name>HeuristicLab.Collections-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
+      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
+      <Name>HeuristicLab.Common.Resources-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
+      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
+      <Name>HeuristicLab.Common-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
       <Name>HeuristicLab.Core-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
+      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
+      <Name>HeuristicLab.Data-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\HeuristicLab.ProtobufCS\HeuristicLab.ProtobufCS-0.9.1.csproj">
+      <Project>{236459CE-80CF-4991-972F-DE74C826BCCC}</Project>
+      <Name>HeuristicLab.ProtobufCS-0.9.1 %28HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\HeuristicLab.ProtobufCS-0.9.1\HeuristicLab.ProtobufCS-0.9.1%29</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ProtobufCS\0.9.1\ProtobufCS\src\ProtocolBuffers\ProtocolBuffers.csproj">
+      <Project>{6908BDCE-D925-43F3-94AC-A531E6DF2591}</Project>
+      <Name>ProtocolBuffers</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
+      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
+      <Name>HeuristicLab.Operators-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
@@ -116 +153 @@
   </Target>
   -->
+  <PropertyGroup>
+    <PreBuildEvent>set ProjectDir=$(ProjectDir)
+set SolutionDir=$(SolutionDir)
+call "$(ProjectDir)"Protos\ProcessProtos.cmd</PreBuildEvent>
+  </PropertyGroup>
 </Project>

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

@@ -25 +25 @@
   [Plugin("HeuristicLab.Problems.ExternalEvaluation", "3.3.0.3832")]
   [PluginFile("HeuristicLab.Problems.ExternalEvaluation-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
-  [PluginDependency("HeuristicLab.Core", "3.3")]
-  [PluginDependency("HeuristicLab.Collections", "3.3")]
-  [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.ProtobufCS", "0.9.1")]
   public class HeuristicLabProblemsExternalEvaluationPlugin : PluginBase {

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IExternalEvaluationDriver.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Core;
+using Google.ProtocolBuffers;
+using Google.ProtocolBuffers.Descriptors;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
@@ -33 +36 @@
     /// <remarks>
     /// Must be called before calling <seealso cref="Send"/> or <seealso cref="Receive"/>.
-    /// The concrete implementation of the driver may require additional information on how to start a connection.
+    /// The concrete implementation of the driver may require additional information on how to start a connection,
+    /// which should be passed into the concrete driver's constructor.
     /// </remarks>
     void Start();
     /// <summary>
-    /// Tells the driver to send a particular message.
+    /// Evaluates a given solution in a blocking manner.
     /// </summary>
-    /// <param name="msg">The message that should be transmitted.</param>
-    /// <remarks>
-    /// This call is non-blocking, the message need not be received synchronously.
-    /// </remarks>
-    void Send(MainMessage msg);
+    /// <param name="solution">The solution message that should be evaluated.</param>
+    /// <returns>The resulting quality message from the external process.</returns>
+    QualityMessage Evaluate(SolutionMessage solution);
     /// <summary>
-    /// Tells the driver to receive the next message.
+    /// Evaluates a given solution in a non-blocking manner.
     /// </summary>
-    /// <exception cref="ConnectionTerminatedException">Thrown when the other client sent a message saying it will end the connection. In this case <see cref="Stop"/> is called automatically.</exception>
-    /// <exception cref="NotSupportedException">Thrown when there is no notion of a "next" message for a given driver.</exception>
-    /// <returns>The message that was received or null if no message is present.</returns>
-    /// <remarks>
-    /// This call is non-blocking and returns null if no message is present.
-    /// </remarks>
-    MainMessage Receive();
-    /// <summary>
-    /// Tells the driver to receive the next message of the type given in the parameter.
-    /// </summary>
-    /// <exception cref="NotSupportedException">Some implementations may not support receiving a specific message.</exception>
-    /// <returns>The message that was received.</returns>
-    /// <remarks>
-    /// This call is non-blocking and returns null if no message is present.
-    /// </remarks>
-    /// <param name="messageDescriptor">The fullname of the descriptor for the message type to receive.</param>
-    MainMessage Receive(MainMessage message);
+    /// <param name="solution">The solution message that should be evaluated.</param>
+    /// <param name="callback">The callback method that is invoked when evaluation is finished.</param>
+    void EvaluateAsync(SolutionMessage solution, Action<QualityMessage> callback);
     /// <summary>
     /// Tells the driver to stop and terminate open connections.

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

@@ -2 +2 @@
 option java_package = "com.heuristiclab.problems.externalevaluation";
 
-message MainMessage {
+message SolutionMessage {
+  required int32 solutionId = 1;
+  
   message IntegerVariable {
     required string name = 1;
     optional int32 data = 2;
   }
-  repeated IntegerVariable integerVars = 1;
+  repeated IntegerVariable integerVars = 2;
   
   message IntegerArrayVariable {
     required string name = 1;
-    repeated int32 data = 2 [packed = true];
+    repeated int32 data = 2;
   }
-  repeated IntegerArrayVariable integerArrayVars = 2;
+  repeated IntegerArrayVariable integerArrayVars = 3;
   
   message DoubleVariable {
@@ -19 +21 @@
     optional double data = 2;
   }
-  repeated DoubleVariable doubleVars = 3;
+  repeated DoubleVariable doubleVars = 4;
   
   message DoubleArrayVariable {
@@ -25 +27 @@
     repeated double data = 2;
   }
-  repeated DoubleArrayVariable doubleArrayVars = 4;
+  repeated DoubleArrayVariable doubleArrayVars = 5;
   
   message BoolVariable {
@@ -31 +33 @@
     optional bool data = 2;
   }
-  repeated BoolVariable boolVars = 5;
+  repeated BoolVariable boolVars = 6;
   
   message BoolArrayVariable {
@@ -37 +39 @@
     repeated bool data = 2;
   }
-  repeated BoolArrayVariable boolArrayVars = 6;
+  repeated BoolArrayVariable boolArrayVars = 7;
   
   message StringVariable {
@@ -43 +45 @@
     optional string data = 2;
   }
-  repeated StringVariable stringVars = 7;
+  repeated StringVariable stringVars = 8;
   
   message StringArrayVariable {
@@ -49 +51 @@
     repeated string data = 2;
   }
-  repeated StringArrayVariable stringArrayVars = 8;
+  repeated StringArrayVariable stringArrayVars = 9;
   
   message RawVariable {
@@ -55 +57 @@
     optional bytes data = 2;
   }
-  repeated RawVariable rawVars = 9;
+  repeated RawVariable rawVars = 10;
 }
 
+message QualityMessage {
+  required int32 solutionId = 1;
+  required double quality = 2;
+}
+  
 service ExchangeService {
-  rpc Exchange (MainMessage) returns (MainMessage);
+  rpc EvaluateSingleObjectively (SolutionMessage) returns (QualityMessage);
 }