Changeset 3872

Timestamp:

05/30/10 22:31:40 (15 years ago)

Author:

abeham

Message:

#866

• Updated ExternalEvaluationProblem
• Removed the custom crossover, manipulator, and solution creator (they're replaced with the UserDefined ones)
• Renamed all drivers to channels
• Added a client that takes the role of the previous driver
• Moved the BestScopeSolutionAnalyzer into Analysis (it's a generic operator after all)

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategy.cs (modified) (previous)
• HeuristicLab.Analysis/3.3/BestScopeSolutionAnalyzer.cs (added)
• HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationProcessChannelView.Designer.cs (added)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationProcessChannelView.cs (added)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationProcessChannelView.resx (added)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationServiceClientView.Designer.cs (added)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationServiceClientView.cs (added)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/EvaluationServiceClientView.resx (added)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/ExternalEvaluationProcessDriverView.Designer.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/ExternalEvaluationProcessDriverView.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/ExternalEvaluationProcessDriverView.resx (deleted)
• HeuristicLab.Problems.ExternalEvaluation.Views/3.3/HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Analyzers (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationChannel.cs (added)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationProcessChannel.cs (added)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationServiceClient.cs (added)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/EvaluationStreamChannel.cs (added)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/ExternalEvaluationDriver.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/ExternalEvaluationProcessDriver.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Drivers/ExternalEvaluationStreamDriver.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationCrossover.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationManipulator.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationProblem.cs (modified) (6 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluationSolutionCreator.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/ExternalEvaluator.cs (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLab.Problems.ExternalEvaluation-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/HeuristicLabProblemsExternalEvaluationPlugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationChannel.cs (added)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IEvaluationServiceClient.cs (added)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IExternalEvaluationDriver.cs (deleted)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Interfaces/IExternalEvaluationProblemEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.ExternalEvaluation/3.3/Protos/ExternalEvaluationMessages.proto (modified) (1 diff)

trunk/sources/HeuristicLab.Analysis/3.3/HeuristicLab.Analysis-3.3.csproj

@@ -87 +87 @@
     <Compile Include="BestAverageWorstQualityAnalyzer.cs" />
     <Compile Include="BestAverageWorstQualityCalculator.cs" />
+    <Compile Include="BestScopeSolutionAnalyzer.cs" />
     <Compile Include="BestQualityMemorizer.cs" />
     <Compile Include="QualityAnalyzer.cs" />

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

@@ -83 +83 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ExternalEvaluationProcessDriverView.cs">
+    <Compile Include="EvaluationServiceClientView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="ExternalEvaluationProcessDriverView.Designer.cs">
-      <DependentUpon>ExternalEvaluationProcessDriverView.cs</DependentUpon>
+    <Compile Include="EvaluationServiceClientView.Designer.cs">
+      <DependentUpon>EvaluationServiceClientView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="EvaluationProcessChannelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="EvaluationProcessChannelView.Designer.cs">
+      <DependentUpon>EvaluationProcessChannelView.cs</DependentUpon>
     </Compile>
     <Compile Include="HeuristicLabProblemsExternalEvaluationViewsPlugin.cs" />
@@ -126 +132 @@
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="ExternalEvaluationProcessDriverView.resx">
-      <DependentUpon>ExternalEvaluationProcessDriverView.cs</DependentUpon>
+    <EmbeddedResource Include="EvaluationProcessChannelView.resx">
+      <DependentUpon>EvaluationProcessChannelView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="EvaluationServiceClientView.resx">
+      <DependentUpon>EvaluationServiceClientView.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

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

@@ -31 +31 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Analysis;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
@@ -48 +50 @@
 
     #region Parameters
-    private IValueParameter<IExternalEvaluationDriver> DriverParameter {
-      get { return (IValueParameter<IExternalEvaluationDriver>)Parameters["Driver"]; }
-    }
-    private IValueParameter<IExternalEvaluationProblemEvaluator> EvaluatorParameter {
+    public IValueParameter<IEvaluationServiceClient> ClientParameter {
+      get { return (IValueParameter<IEvaluationServiceClient>)Parameters["Client"]; }
+    }
+    public IValueParameter<IExternalEvaluationProblemEvaluator> EvaluatorParameter {
       get { return (IValueParameter<IExternalEvaluationProblemEvaluator>)Parameters["Evaluator"]; }
     }
@@ -112 +114 @@
       get { return OperatorsParameter.Value; }
     }
-    private BestExternalEvaluationSolutionAnalyzer BestExternalEvaluationSolutionAnalyzer {
-      get { return OperatorsParameter.Value.OfType<BestExternalEvaluationSolutionAnalyzer>().FirstOrDefault(); }
+    private BestScopeSolutionAnalyzer BestScopeSolutionAnalyzer {
+      get { return OperatorsParameter.Value.OfType<BestScopeSolutionAnalyzer>().FirstOrDefault(); }
     }
     #endregion
@@ -122 +124 @@
       : base() {
       ExternalEvaluator evaluator = new ExternalEvaluator();
-      ExternalEvaluationSolutionCreator solutionCreator = new ExternalEvaluationSolutionCreator();
-
-      Parameters.Add(new ValueParameter<IExternalEvaluationDriver>("Driver", "The communication driver that is used to exchange data with the external process."));
+      UserDefinedSolutionCreator solutionCreator = new UserDefinedSolutionCreator();
+
+      Parameters.Add(new ValueParameter<IEvaluationServiceClient>("Client", "The client that is used to communicate with the external application."));
       Parameters.Add(new ValueParameter<IExternalEvaluationProblemEvaluator>("Evaluator", "The evaluator that collects the values to exchange.", evaluator));
       Parameters.Add(new ValueParameter<ISolutionCreator>("SolutionCreator", "An operator to create the solution components.", solutionCreator));
@@ -168 +170 @@
     }
     private void EvaluatorParameter_ValueChanged(object sender, EventArgs e) {
+      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
+      ParameterizeOperators();
       OnEvaluatorChanged();
     }
     private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
-      // TODO: Following code is not yet approved behavior, but it's the best effort I can make here regarding wiring
+      ParameterizeOperators();
+    }
+    private void OperatorsParameter_ValueChanged(object sender, EventArgs e) {
+      OnOperatorsChanged();
+    }
+    private void OperatorsParameter_Value_ItemsAdded(object sender, EventArgs e) {
+      OnOperatorsChanged();
+    }
+    private void OperatorsParameter_Value_ItemsRemoved(object sender, EventArgs e) {
+      OnOperatorsChanged();
+    }
+    private void OperatorsParameter_Value_CollectionReset(object sender, EventArgs e) {
+      OnOperatorsChanged();
+    }
+    #endregion
+
+    #region Helpers
+    private void InitializeOperators() {
+      ItemList<IOperator> operators = OperatorsParameter.Value;
+      operators.Add(new BestScopeSolutionAnalyzer());
+      ParameterizeAnalyzers();
+    }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AttachEventHandlers() {
+      SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
+      EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
+      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
+      OperatorsParameter.ValueChanged += new EventHandler(OperatorsParameter_ValueChanged);
+      OperatorsParameter.Value.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsAdded);
+      OperatorsParameter.Value.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsRemoved);
+      OperatorsParameter.Value.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_CollectionReset);
+    }
+    private void ParameterizeAnalyzers() {
+      BestScopeSolutionAnalyzer.ResultsParameter.ActualName = "Results";
+      BestScopeSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
+      BestScopeSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
+      BestScopeSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
+      BestScopeSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+    }
+    private void ParameterizeEvaluator() {
+      Evaluator.ClientParameter.ActualName = ClientParameter.Name;
+    }
+    private void ParameterizeOperators() {
+      // This is a best effort approach to wiring
       string qualityName = Evaluator.QualityParameter.ActualName;
       foreach (IOperator op in OperatorsParameter.Value) {
@@ -182 +229 @@
       }
     }
-    private void OperatorsParameter_ValueChanged(object sender, EventArgs e) {
-      OnOperatorsChanged();
-    }
-    private void OperatorsParameter_Value_ItemsAdded(object sender, EventArgs e) {
-      OnOperatorsChanged();
-    }
-    private void OperatorsParameter_Value_ItemsRemoved(object sender, EventArgs e) {
-      OnOperatorsChanged();
-    }
-    private void OperatorsParameter_Value_CollectionReset(object sender, EventArgs e) {
-      OnOperatorsChanged();
-    }
-    #endregion
-
-    #region Helpers
-    private void InitializeOperators() {
-      ItemList<IOperator> operators = OperatorsParameter.Value;
-      operators.Add(new BestExternalEvaluationSolutionAnalyzer());
-      ParameterizeAnalyzers();
-    }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AttachEventHandlers() {
-      SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
-      EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
-      Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
-      OperatorsParameter.ValueChanged += new EventHandler(OperatorsParameter_ValueChanged);
-      OperatorsParameter.Value.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsAdded);
-      OperatorsParameter.Value.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_ItemsRemoved);
-      OperatorsParameter.Value.CollectionReset += new CollectionItemsChangedEventHandler<IndexedItem<IOperator>>(OperatorsParameter_Value_CollectionReset);
-    }
-    private void ParameterizeAnalyzers() {
-      BestExternalEvaluationSolutionAnalyzer.ResultsParameter.ActualName = "Results";
-      BestExternalEvaluationSolutionAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      BestExternalEvaluationSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
-      BestExternalEvaluationSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
-      BestExternalEvaluationSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
-    }
-    private void ParameterizeEvaluator() {
-      Evaluator.DriverParameter.ActualName = DriverParameter.Name;
-    }
     #endregion
   }

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

@@ -34 +34 @@
       get { return (ILookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public IValueLookupParameter<IExternalEvaluationDriver> DriverParameter {
-      get { return (IValueLookupParameter<IExternalEvaluationDriver>)Parameters["Driver"]; }
+    public IValueLookupParameter<IEvaluationServiceClient> ClientParameter {
+      get { return (IValueLookupParameter<IEvaluationServiceClient>)Parameters["Client"]; }
     }
 
@@ -41 +41 @@
       : base() {
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the current solution."));
-      Parameters.Add(new ValueLookupParameter<IExternalEvaluationDriver>("Driver", "The driver to communicate with the external process."));
+      Parameters.Add(new ValueLookupParameter<IEvaluationServiceClient>("Client", "The client that communicates with the external process."));
     }
 
     public override IOperation Apply() {
-      IExternalEvaluationDriver driver = DriverParameter.ActualValue;
+      IEvaluationServiceClient client = ClientParameter.ActualValue;
       SolutionMessage.Builder messageBuilder = SolutionMessage.CreateBuilder();
       messageBuilder.SolutionId = 0;
@@ -60 +60 @@
         }
       }
-      QualityMessage answer = driver.Evaluate(messageBuilder.Build());
+      QualityMessage answer = client.Evaluate(messageBuilder.Build());
       if (QualityParameter.ActualValue == null)
         QualityParameter.ActualValue = new DoubleValue(answer.Quality);

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

@@ -82 +82 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Analyzers\BestExternalEvaluationSolutionAnalyzer.cs" />
     <None Include="HeuristicLabProblemsExternalEvaluationPlugin.cs.frame" />
-    <Compile Include="ExternalEvaluationManipulator.cs" />
-    <Compile Include="Drivers\ExternalEvaluationDriver.cs" />
-    <Compile Include="Drivers\ExternalEvaluationProcessDriver.cs" />
-    <Compile Include="Drivers\ExternalEvaluationStreamDriver.cs" />
-    <Compile Include="ExternalEvaluationCrossover.cs" />
+    <Compile Include="Drivers\EvaluationServiceClient.cs" />
+    <Compile Include="Drivers\EvaluationChannel.cs" />
+    <Compile Include="Drivers\EvaluationProcessChannel.cs" />
+    <Compile Include="Drivers\EvaluationStreamChannel.cs" />
     <Compile Include="ExternalEvaluationProblem.cs" />
-    <Compile Include="ExternalEvaluationSolutionCreator.cs" />
     <Compile Include="ExternalEvaluator.cs" />
     <Compile Include="HeuristicLabProblemsExternalEvaluationPlugin.cs" />
-    <Compile Include="Interfaces\IExternalEvaluationDriver.cs" />
+    <Compile Include="Interfaces\IEvaluationServiceClient.cs" />
+    <Compile Include="Interfaces\IEvaluationChannel.cs" />
     <Compile Include="Interfaces\IExternalEvaluationProblemEvaluator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -102 +100 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
+      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
+      <Name>HeuristicLab.Analysis-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
@@ -133 +135 @@
       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
       <Name>HeuristicLab.Operators-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
+      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
+      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">

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

@@ -25 +25 @@
   [Plugin("HeuristicLab.Problems.ExternalEvaluation", "3.3.0.$WCREV$")]
   [PluginFile("HeuristicLab.Problems.ExternalEvaluation-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
@@ -32 +33 @@
   [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]

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

@@ -25 +25 @@
 namespace HeuristicLab.Problems.ExternalEvaluation {
   public interface IExternalEvaluationProblemEvaluator : ISingleObjectiveEvaluator {
-    IValueLookupParameter<IExternalEvaluationDriver> DriverParameter { get; }
+    IValueLookupParameter<IEvaluationServiceClient> ClientParameter { get; }
   }
 }

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

@@ -65 +65 @@
 }
   
-service ExchangeService {
-  rpc EvaluateSingleObjectively (SolutionMessage) returns (QualityMessage);
+service EvaluationService {
+  rpc Evaluate (SolutionMessage) returns (QualityMessage);
 }