Changeset 13594 for branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ProblemCharacteristicAnalysis/CharacteristicCalculator.cs

Timestamp:

02/07/16 23:14:22 (8 years ago)

Author:

abeham

Message:

#2457: Adapted branch to trunk changes

File:

• branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ProblemCharacteristicAnalysis/CharacteristicCalculator.cs (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem/3.3/ProblemCharacteristicAnalysis/CharacteristicCalculator.cs

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System.Collections.Generic;
 
 namespace HeuristicLab.Problems.CharacteristicAnalysis {
   [Item("Characteristic Calculator", "")]
   [StorableClass]
-  public abstract class CharacteristicCalculator : NamedItem, ICharacteristicCalculator {
+  public abstract class CharacteristicCalculator : ParameterizedNamedItem, ICharacteristicCalculator {
 
-    public abstract IEnumerable<string> Characteristics { get; }
+    [Storable]
+    public IProblem Problem { get; set; }
+
+    [Storable]
+    protected CheckedItemList<StringValue> characteristics;
+    public ReadOnlyCheckedItemList<StringValue> Characteristics { get { return characteristics.AsReadOnly(); } }
 
     [StorableConstructor]
     protected CharacteristicCalculator(bool deserializing) : base(deserializing) { }
-    protected CharacteristicCalculator(CharacteristicCalculator original, Cloner cloner) : base(original, cloner) { }
+    protected CharacteristicCalculator(CharacteristicCalculator original, Cloner cloner)
+      : base(original, cloner) {
+      characteristics = cloner.Clone(original.characteristics);
+      Problem = cloner.Clone(original.Problem);
+    }
     protected CharacteristicCalculator()
       : base() {
       name = ItemName;
       description = ItemDescription;
+      characteristics = new CheckedItemList<StringValue>();
     }
 
-    public abstract bool CanCalculate(IProblem problem);
+    public abstract bool CanCalculate();
 
-    public abstract IEnumerable<KeyValuePair<string, IItem>> Calculate(IProblem problem, IEnumerable<string> characteristics = null);
+    public abstract IEnumerable<IResult> Calculate();
   }
 }