Changeset 13361 for branches/ProblemRefactoring/HeuristicLab.Optimization

Timestamp:

11/24/15 16:01:02 (9 years ago)

Author:

mkommend

Message:

#2521: Adapted real vector encoding, test function problems, P3, CMA-ES and optimization.

Location:

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3

Files:

• BasicProblems/Interfaces/IProblemDefinition.cs (modified) (1 diff)
• BasicProblems/Interfaces/ISingleObjectiveProblem.cs (modified) (1 diff)
• BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs (modified) (1 diff)
• BasicProblems/MultiObjectiveProblem.cs (modified) (1 diff)
• BasicProblems/SingleObjectiveProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• Interfaces/IProblem.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/IProblemDefinition.cs ¶

@@ -20 +20 @@
 #endregion
 
+
 namespace HeuristicLab.Optimization {
   public interface IProblemDefinition<TEncoding, TSolution>

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblem.cs ¶

@@ -24 +24 @@
 
 namespace HeuristicLab.Optimization {
-  public interface ISingleObjectiveProblem<TEncoding, TSolution> : IProblem<TEncoding, TSolution>, ISingleObjectiveProblemDefinition<TEncoding, TSolution>, ISingleObjectiveHeuristicOptimizationProblem
+  public interface ISingleObjectiveProblem<TEncoding, TSolution> : IProblem<TEncoding, TSolution>, ISingleObjectiveHeuristicOptimizationProblem
     where TEncoding : class, IEncoding<TSolution>
     where TSolution : class, ISolution {
-    bool IsBetter(double quality, double bestQuality);
+
   }
 }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Interfaces/ISingleObjectiveProblemDefinition.cs ¶

@@ -31 +31 @@
     void Analyze(TSolution[] individuals, double[] qualities, ResultCollection results, IRandom random);
     IEnumerable<TSolution> GetNeighbors(TSolution individual, IRandom random);
+    bool IsBetter(double quality, double bestQuality);
   }
 }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveProblem.cs ¶

@@ -29 +29 @@
 namespace HeuristicLab.Optimization {
   [StorableClass]
-  public abstract class MultiObjectiveProblem<TEncoding, TSolution> : Problem<TEncoding, TSolution, MultiObjectiveEvaluator<TSolution>>, IMultiObjectiveHeuristicOptimizationProblem, IMultiObjectiveProblemDefinition<TEncoding, TSolution>
+  public abstract class MultiObjectiveProblem<TEncoding, TSolution> :
+    Problem<TEncoding, TSolution, MultiObjectiveEvaluator<TSolution>>,
+    IMultiObjectiveProblem<TEncoding, TSolution>,
+    IMultiObjectiveProblemDefinition<TEncoding, TSolution>
     where TEncoding : class, IEncoding<TSolution>
     where TSolution : class, ISolution {
+
     [StorableConstructor]
     protected MultiObjectiveProblem(bool deserializing) : base(deserializing) { }

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs ¶

@@ -30 +30 @@
 namespace HeuristicLab.Optimization {
   [StorableClass]
-  public abstract class SingleObjectiveProblem<TEncoding, TSolution> : Problem<TEncoding, TSolution, SingleObjectiveEvaluator<TSolution>>, ISingleObjectiveProblem<TEncoding, TSolution>
+  public abstract class SingleObjectiveProblem<TEncoding, TSolution> :
+    Problem<TEncoding, TSolution, SingleObjectiveEvaluator<TSolution>>,
+    ISingleObjectiveProblem<TEncoding, TSolution>,
+    ISingleObjectiveProblemDefinition<TEncoding, TSolution>
     where TEncoding : class, IEncoding<TSolution>
     where TSolution : class, ISolution {

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj ¶

@@ -123 +123 @@
     <Compile Include="BasicProblems\Individuals\MultiSolution.cs" />
     <Compile Include="BasicProblems\Interfaces\IMultiEncodingOperator.cs" />
+    <Compile Include="BasicProblems\Interfaces\IMultiObjectiveProblem.cs" />
     <Compile Include="BasicProblems\Interfaces\ISingleObjectiveProblem.cs" />
     <Compile Include="BasicProblems\MultiEncoding.cs" />

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/Interfaces/IProblem.cs ¶

@@ -36 +36 @@
   }
 
-  public interface IProblem<TEncoding, TSolution> : IHeuristicOptimizationProblem, IProblemDefinition<TEncoding, TSolution>
+  public interface IProblem<TEncoding, TSolution> : IHeuristicOptimizationProblem
     where TEncoding : class, IEncoding<TSolution>
     where TSolution : class, ISolution {