Changeset 15081 for stable/HeuristicLab.Optimization

Timestamp:

06/28/17 22:10:45 (8 years ago)

Author:

gkronber

Message:

#2560 merged r13501, r13503, r13511, r13513, r13534, r13535, r13540, r13550, r13552, r13593, r13666 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimization (modified) (1 prop)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/ICharacteristicCalculator.cs (copied) (copied from trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/ICharacteristicCalculator.cs) (1 diff)

stable/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -153 +153 @@
     <Compile Include="BasicProblems\Operators\SingleObjectiveMoveMaker.cs" />
     <Compile Include="BasicProblems\SingleObjectiveBasicProblem.cs" />
+    <Compile Include="Interfaces\ICharacteristicCalculator.cs" />
     <Compile Include="Interfaces\ILocalImprovementAlgorithmOperator.cs" />
     <Compile Include="Interfaces\IMultiObjectiveOperator.cs" />

stable/HeuristicLab.Optimization/3.3/Interfaces/ICharacteristicCalculator.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Optimization {
-  public interface ICharacteristicCalculator : INamedItem {
-    IEnumerable<string> Characteristics { get; }
-    bool CanCalculate(IProblem problem);
-    IEnumerable<KeyValuePair<string, double>> Calculate(IProblem problem, IEnumerable<string> characteristics = null);
+  public interface ICharacteristicCalculator : IParameterizedNamedItem {
+    IProblem Problem { get; set; }
+    ReadOnlyCheckedItemList<StringValue> Characteristics { get; }
+
+    bool CanCalculate();
+    IEnumerable<IResult> Calculate();
   }
 }