Changeset 16816 for branches/2521_ProblemRefactoring

Timestamp:

04/18/19 14:06:00 (6 years ago)

Author:

abeham

Message:

#2521: Refactored external evaluation problem

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4

Files:

• ExternalEvaluationProblemInstances.cs (added)
• HeuristicLab.Problems.ExternalEvaluation-3.4.csproj (modified) (4 diffs)
• Interfaces/IMultiObjectiveOptimizationSupport.cs (modified) (1 diff)
• Interfaces/ISingleObjectiveOptimizationSupport.cs (modified) (1 diff)
• MultiObjectiveExternalEvaluationProblem.cs (modified) (10 diffs)
• Plugin.cs.frame (modified) (1 diff)
• Programmable/MultiObjective (added)
• Programmable/MultiObjective/CompiledMultiObjectiveOptimizationSupport.cs (added)
• Programmable/MultiObjective/MultiObjectiveOptimizationSupportScript.cs (added)
• Programmable/SingleObjective (added)
• Programmable/SingleObjective/CompiledSingleObjectiveOptimizationSupport.cs (added)
• Programmable/SingleObjective/SingleObjectiveOptimizationSupportScript.cs (added)
• Programmable/Templates.Designer.cs (modified) (3 diffs)
• Programmable/Templates.resx (modified) (1 diff)
• SingleObjectiveExternalEvaluationProblem.cs (added)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/HeuristicLab.Problems.ExternalEvaluation-3.4.csproj

@@ -137 +137 @@
     <Compile Include="Interfaces\IMultiObjectiveOptimizationSupport.cs" />
     <Compile Include="MultiObjectiveExternalEvaluationProblem.cs" />
-    <Compile Include="ExternalEvaluationProblem.cs" />
+    <Compile Include="ExternalEvaluationProblemInstances.cs" />
+    <Compile Include="SingleObjectiveExternalEvaluationProblem.cs" />
     <Compile Include="Interfaces\IEvaluationServiceClient.cs" />
     <Compile Include="Interfaces\IEvaluationChannel.cs" />
@@ -144 +145 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Programmable\CompiledOptimizationSupport.cs" />
-    <Compile Include="Programmable\CompiledMultiObjectiveOptimizationSupport.cs" />
-    <Compile Include="Programmable\CompiledSingleObjectiveOptimizationSupport.cs" />
-    <Compile Include="Programmable\MultiObjectiveOptimizationSupportScript.cs" />
+    <Content Include="Programmable\MultiObjective\CompiledMultiObjectiveOptimizationSupport.cs" />
+    <Content Include="Programmable\SingleObjective\CompiledSingleObjectiveOptimizationSupport.cs" />
+    <Compile Include="Programmable\MultiObjective\MultiObjectiveOptimizationSupportScript.cs" />
     <Compile Include="Programmable\OptimizationSupportScript.cs" />
-    <Compile Include="Programmable\SingleObjectiveOptimizationSupportScript.cs" />
+    <Compile Include="Programmable\SingleObjective\SingleObjectiveOptimizationSupportScript.cs" />
     <Compile Include="Programmable\OptimizationSupportScriptException.cs" />
     <Compile Include="Programmable\Templates.Designer.cs">
@@ -187 +188 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Templates.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
@@ -218 +220 @@
       <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
       <Name>HeuristicLab.Data-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.BinaryVectorEncoding\3.3\HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj">
+      <Project>{66d249c3-a01d-42a8-82a2-919bc8ec3d83}</Project>
+      <Name>HeuristicLab.Encodings.BinaryVectorEncoding-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
+      <Project>{ddfb14dd-2a85-493c-a52d-e69729bbaeb0}</Project>
+      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.LinearLinkageEncoding\3.4\HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj">
+      <Project>{be698769-975a-429e-828c-72bb2b6182c8}</Project>
+      <Name>HeuristicLab.Encodings.LinearLinkageEncoding-3.4</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
+      <Project>{dbecb8b0-b166-4133-baf1-ed67c3fd7fca}</Project>
+      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
+      <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
+      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
+      <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project>
+      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
       <Private>False</Private>
     </ProjectReference>

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Interfaces/IMultiObjectiveOptimizationSupport.cs

@@ -20 +20 @@
 #endregion
 
+using HEAL.Attic;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
   [StorableType("f924ef9c-d824-40d2-89b2-6dd1220df98b")]
-  public interface IMultiObjectiveOptimizationSupport {
-    void Analyze(IEncodedSolution[] individuals, double[][] qualities, ResultCollection results, IRandom random);
+  public interface IMultiObjectiveOptimizationSupport<TEncodedSolution> {
+    void Analyze(TEncodedSolution[] individuals, double[][] qualities, ResultCollection results, IRandom random);
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Interfaces/ISingleObjectiveOptimizationSupport.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HEAL.Attic;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Optimization;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
   [StorableType("09d522e0-c10f-474c-b7c0-7d7f98e63f44")]
-  public interface ISingleObjectiveOptimizationSupport {
-    void Analyze(IEncodedSolution[] individuals, double[] qualities, ResultCollection results, IRandom random);
-    IEnumerable<IEncodedSolution> GetNeighbors(IEncodedSolution individual, IRandom random);
+  public interface ISingleObjectiveOptimizationSupport<TEncodedSolution>
+    where TEncodedSolution : IDeepCloneable {
+
+    void Analyze(TEncodedSolution[] individuals, double[] qualities, ResultCollection results, IRandom random);
+    IEnumerable<TEncodedSolution> GetNeighbors(TEncodedSolution individual, IRandom random);
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/MultiObjectiveExternalEvaluationProblem.cs

@@ -26 +26 @@
 using System.Threading;
 using Google.ProtocolBuffers;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +32 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.ExternalEvaluation {
@@ -37 +37 @@
   [Creatable(CreatableAttribute.Categories.ExternalEvaluationProblems, Priority = 200)]
   [StorableType("CCA50199-A6AB-4C84-B4FA-0262CAF416EC")]
-  public class MultiObjectiveExternalEvaluationProblem : MultiObjectiveProblem<IEncoding<IEncodedSolution>, IEncodedSolution>, IExternalEvaluationProblem {
+  public class MultiObjectiveExternalEvaluationProblem<TEncoding, TEncodedSolution> : MultiObjectiveProblem<TEncoding, TEncodedSolution>, IExternalEvaluationProblem
+    where TEncoding : class, IEncoding<TEncodedSolution>
+    where TEncodedSolution : class, IEncodedSolution {
 
     public static new Image StaticItemImage {
@@ -53 +55 @@
       get { return (IValueParameter<SolutionMessageBuilder>)Parameters["MessageBuilder"]; }
     }
-    public IFixedValueParameter<MultiObjectiveOptimizationSupportScript> SupportScriptParameter {
-      get { return (IFixedValueParameter<MultiObjectiveOptimizationSupportScript>)Parameters["SupportScript"]; }
-    }
-
-    private IFixedValueParameter<BoolArray> MaximizationParameter {
-      get { return (IFixedValueParameter<BoolArray>)Parameters["Maximization"]; }
+    public IFixedValueParameter<MultiObjectiveOptimizationSupportScript<TEncodedSolution>> SupportScriptParameter {
+      get { return (IFixedValueParameter<MultiObjectiveOptimizationSupportScript<TEncodedSolution>>)Parameters["SupportScript"]; }
     }
     #endregion
 
     #region Properties
-    public new IEncoding<IEncodedSolution> Encoding {
+    public new TEncoding Encoding {
       get { return base.Encoding; }
       set { base.Encoding = value; }
@@ -76 +74 @@
       get { return MessageBuilderParameter.Value; }
     }
-    public MultiObjectiveOptimizationSupportScript OptimizationSupportScript {
+    public MultiObjectiveOptimizationSupportScript<TEncodedSolution> OptimizationSupportScript {
       get { return SupportScriptParameter.Value; }
     }
-    private IMultiObjectiveOptimizationSupport OptimizationSupport {
+    private IMultiObjectiveOptimizationSupport<TEncodedSolution> OptimizationSupport {
       get { return SupportScriptParameter.Value; }
     }
@@ -86 +84 @@
     [StorableConstructor]
     protected MultiObjectiveExternalEvaluationProblem(StorableConstructorFlag _) : base(_) { }
-    protected MultiObjectiveExternalEvaluationProblem(MultiObjectiveExternalEvaluationProblem original, Cloner cloner) : base(original, cloner) { }
+    protected MultiObjectiveExternalEvaluationProblem(MultiObjectiveExternalEvaluationProblem<TEncoding, TEncodedSolution> original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new MultiObjectiveExternalEvaluationProblem(this, cloner);
+      return new MultiObjectiveExternalEvaluationProblem<TEncoding, TEncodedSolution>(this, cloner);
     }
-    public MultiObjectiveExternalEvaluationProblem()
-      : base() {
+    public MultiObjectiveExternalEvaluationProblem(TEncoding encoding)
+      : base(encoding) {
       Parameters.Remove("Maximization"); // readonly in base class
       Parameters.Add(new FixedValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", new BoolArray()));
@@ -97 +95 @@
       Parameters.Add(new ValueParameter<CheckedItemCollection<IEvaluationServiceClient>>("Clients", "The clients that are used to communicate with the external application.", new CheckedItemCollection<IEvaluationServiceClient>() { new EvaluationServiceClient() }));
       Parameters.Add(new ValueParameter<SolutionMessageBuilder>("MessageBuilder", "The message builder that converts from HeuristicLab objects to SolutionMessage representation.", new SolutionMessageBuilder()) { Hidden = true });
-      Parameters.Add(new FixedValueParameter<MultiObjectiveOptimizationSupportScript>("SupportScript", "A script that can analyze the results of the optimization.", new MultiObjectiveOptimizationSupportScript()));
+      Parameters.Add(new FixedValueParameter<MultiObjectiveOptimizationSupportScript<TEncodedSolution>>("SupportScript", "A script that can analyze the results of the optimization.", new MultiObjectiveOptimizationSupportScript<TEncodedSolution>()));
     }
 
@@ -114 +112 @@
     }
 
-    public override double[] Evaluate(IEncodedSolution individual, IRandom random) {
+    public override double[] Evaluate(TEncodedSolution individual, IRandom random) {
       var qualityMessage = Evaluate(BuildSolutionMessage(individual));
       if (!qualityMessage.HasExtension(MultiObjectiveQualityMessage.QualityMessage_))
@@ -126 +124 @@
     }
 
-    public override void Analyze(IEncodedSolution[] individuals, double[][] qualities, ResultCollection results, IRandom random) {
+    public override void Analyze(TEncodedSolution[] individuals, double[][] qualities, ResultCollection results, IRandom random) {
       OptimizationSupport.Analyze(individuals, qualities, results, random);
     }
@@ -164 +162 @@
     }
 
-    private SolutionMessage BuildSolutionMessage(IEncodedSolution solution, int solutionId = 0) {
+    private SolutionMessage BuildSolutionMessage(TEncodedSolution solution, int solutionId = 0) {
       lock (clientLock) {
         SolutionMessage.Builder protobufBuilder = SolutionMessage.CreateBuilder();

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Plugin.cs.frame

@@ -32 +32 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/Templates.Designer.cs

@@ -20 +20 @@
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -62 +62 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to using System;
-        ///using System.Linq;
-        ///using System.Collections.Generic;
-        ///using HeuristicLab.Common;
-        ///using HeuristicLab.Core;
-        ///using HeuristicLab.Data;
+        ///   Looks up a localized string similar to using HeuristicLab.Core;
         ///using HeuristicLab.Optimization;
+        ///using ENCODING_NAMESPACE;
         ///
         ///namespace HeuristicLab.Problems.ExternalEvaluation {
-        ///  public class CompiledMultiObjectiveOptimizationSupport : CompiledOptimizationSupport, IMultiObjectiveOptimizationSupport {
+        ///  public class CompiledMultiObjectiveOptimizationSupport : CompiledOptimizationSupport, IMultiObjectiveOptimizationSupport&lt;SOLUTION_CLASS&gt; {
         ///
-        ///    public void Analyze(Individual[] individuals, double[][] qualities, ResultCollection results, IRandom random) {
-        ///      // Use vars.yourVaria [rest of string was truncated]&quot;;.
+        ///    public void Analyze(SOLUTION_CLASS[] solutions, double[][] qualities, ResultCollection results, IRandom random) {
+        ///      // Use vars.yourVariable to access variables in the variable store i.e. yourVariable
+        ///      // Write [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string CompiledMultiObjectiveOptimizationSupport {
@@ -83 +80 @@
         
         /// <summary>
-        ///   Looks up a localized string similar to using System;
-        ///using System.Linq;
-        ///using System.Collections.Generic;
+        ///   Looks up a localized string similar to using System.Collections.Generic;
         ///using HeuristicLab.Common;
         ///using HeuristicLab.Core;
-        ///using HeuristicLab.Data;
         ///using HeuristicLab.Optimization;
+        ///using ENCODING_NAMESPACE;
         ///
         ///namespace HeuristicLab.Problems.ExternalEvaluation {
-        ///  public class CompiledSingleObjectiveOptimizationSupport : CompiledOptimizationSupport, ISingleObjectiveOptimizationSupport {
+        ///  public class CompiledSingleObjectiveOptimizationSupport : CompiledOptimizationSupport, ISingleObjectiveOptimizationSupport&lt;SOLUTION_CLASS&gt; {
         ///
-        ///    public void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
-        ///      // Use vars.yourVaria [rest of string was truncated]&quot;;.
+        ///    public void Analyze(SOLUTION_CLASS[] solutions, double[] qualities, ResultCollection results, IRandom random) {
+        ///      // Use vars.yourVariable to access va [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string CompiledSingleObjectiveOptimizationSupport {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/Programmable/Templates.resx

@@ -120 +120 @@
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="CompiledMultiObjectiveOptimizationSupport" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>compiledmultiobjectiveoptimizationsupport.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>MultiObjective\CompiledMultiObjectiveOptimizationSupport.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
   <data name="CompiledSingleObjectiveOptimizationSupport" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>CompiledSingleObjectiveOptimizationSupport.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+    <value>SingleObjective\CompiledSingleObjectiveOptimizationSupport.cs;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
 </root>