Changeset 7213 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Knapsack

Timestamp:

12/20/11 11:45:18 (13 years ago)

Author:

gkronber

Message:

#1081 merged r7103:7209 from trunk into time series branch

Location:

branches/HeuristicLab.TimeSeries

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Knapsack/3.3/Analyzers/BestKnapsackSolutionAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackSolution.cs (modified) (1 diff)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Knapsack/3.3/Analyzers/BestKnapsackSolutionAnalyzer.cs

@@ -37 +37 @@
   [StorableClass]
   public class BestKnapsackSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
+    public virtual bool EnabledByDefault {
+      get { return true; }
+    }
+
     public LookupParameter<BoolValue> MaximizationParameter {
       get { return (LookupParameter<BoolValue>)Parameters["Maximization"]; }

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Knapsack/3.3/KnapsackSolution.cs

@@ -35 +35 @@
   [StorableClass]
   public class KnapsackSolution : Item {
-    public override Image ItemImage {
+    public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Image; }
     }