Changeset 17570 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack

Timestamp:

05/28/20 16:26:46 (4 years ago)

Author:

abeham

Message:

#2521: adapted knapsack, added base call to symbolic expression tree encoding, changed parameterization operators in base classes

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3

Files:

• Analyzers (deleted)
• HeuristicLab.Problems.Knapsack-3.3.csproj (modified) (2 diffs)
• KnapsackProblem.cs (modified) (9 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj

@@ -126 +126 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Analyzers\BestKnapsackSolutionAnalyzer.cs" />
     <Compile Include="SimilarityCalculators\KnapsackSimilarityCalculator.cs" />
   </ItemGroup>
@@ -223 +222 @@
     </Reference>
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -41 +40 @@
 
     #region Parameter Properties
-    public ValueParameter<IntValue> KnapsackCapacityParameter {
-      get { return (ValueParameter<IntValue>)Parameters["KnapsackCapacity"]; }
-    }
-    public ValueParameter<IntArray> WeightsParameter {
-      get { return (ValueParameter<IntArray>)Parameters["Weights"]; }
-    }
-    public ValueParameter<IntArray> ValuesParameter {
-      get { return (ValueParameter<IntArray>)Parameters["Values"]; }
-    }
-    public OptionalValueParameter<BinaryVector> BestKnownSolutionParameter {
-      get { return (OptionalValueParameter<BinaryVector>)Parameters["BestKnownSolution"]; }
-    }
+    [Storable] public ValueParameter<IntValue> KnapsackCapacityParameter { get; private set; }
+    [Storable] public ValueParameter<IntArray> WeightsParameter { get; private set; }
+    [Storable] public ValueParameter<IntArray> ValuesParameter { get; private set; }
+    [Storable] public OptionalValueParameter<BinaryVector> BestKnownSolutionParameter { get; private set; }
     #endregion
 
     #region Properties
-    public new int Dimension {
-      get { return base.Dimension; }
-      set { DimensionRefParameter.Value.Value = value; }
-    }
     public int KnapsackCapacity {
       get { return KnapsackCapacityParameter.Value.Value; }
@@ -75 +62 @@
       get { return BestKnownSolutionParameter.Value; }
       set { BestKnownSolutionParameter.Value = value; }
-    }
-    private BestKnapsackSolutionAnalyzer BestKnapsackSolutionAnalyzer {
-      get { return Operators.OfType<BestKnapsackSolutionAnalyzer>().FirstOrDefault(); }
     }
     #endregion
@@ -85 +69 @@
     private KnapsackProblem(KnapsackProblem original, Cloner cloner)
       : base(original, cloner) {
+      KnapsackCapacityParameter = cloner.Clone(original.KnapsackCapacityParameter);
+      WeightsParameter = cloner.Clone(original.WeightsParameter);
+      ValuesParameter = cloner.Clone(original.ValuesParameter);
+      BestKnownSolutionParameter = cloner.Clone(original.BestKnownSolutionParameter);
       RegisterEventHandlers();
     }
     public KnapsackProblem()
       : base(new BinaryVectorEncoding("Selection")) {
+      DimensionRefParameter.ReadOnly = true;
       Maximization = true;
-      Parameters.Add(new ValueParameter<IntValue>("KnapsackCapacity", "Capacity of the Knapsack.", new IntValue(1)));
-      Parameters.Add(new ValueParameter<IntArray>("Weights", "The weights of the items.", new IntArray(5)));
-      Parameters.Add(new ValueParameter<IntArray>("Values", "The values of the items.", new IntArray(5)));
-      Parameters.Add(new OptionalValueParameter<BinaryVector>("BestKnownSolution", "The best known solution of this Knapsack instance."));
-
-      DimensionRefParameter.Value = new IntValue(Weights.Length, @readonly: true);
+      Parameters.Add(KnapsackCapacityParameter = new ValueParameter<IntValue>("KnapsackCapacity", "Capacity of the Knapsack.", new IntValue(1)));
+      Parameters.Add(WeightsParameter = new ValueParameter<IntArray>("Weights", "The weights of the items.", new IntArray(5)));
+      Parameters.Add(ValuesParameter = new ValueParameter<IntArray>("Values", "The values of the items.", new IntArray(5)));
+      Parameters.Add(BestKnownSolutionParameter = new OptionalValueParameter<BinaryVector>("BestKnownSolution", "The best known solution of this Knapsack instance."));
+      Dimension = Weights.Length;
+
       InitializeRandomKnapsackInstance();
 
@@ -114 +103 @@
     }
 
+    public override void Analyze(BinaryVector[] solutions, double[] qualities, ResultCollection results, IRandom random) {
+      base.Analyze(solutions, qualities, results, random);
+
+      var best = GetBestSolution(solutions, qualities);
+
+      if (double.IsNaN(BestKnownQuality) || IsBetter(best.Item2, BestKnownQuality)) {
+        BestKnownQuality = best.Item2;
+        BestKnownSolution = (BinaryVector)best.Item1.Clone();
+      }
+
+      IResult result;
+      if (!results.TryGetValue("Best Knapsack Solution", out result)) {
+        results.Add(result = new Result("Best Knapsack Solution", typeof(KnapsackSolution)));
+      }
+      var solution = (KnapsackSolution)result.Value;
+      if (solution == null) {
+        solution = new KnapsackSolution((BinaryVector)best.Item1.Clone(), new DoubleValue(best.Item2),
+          KnapsackCapacityParameter.Value, WeightsParameter.Value, ValuesParameter.Value);
+        result.Value = solution;
+      } else {
+        if (IsBetter(best.Item2, solution.Quality.Value)) {
+          solution.BinaryVector = (BinaryVector)best.Item1.Clone();
+          solution.Quality = new DoubleValue(best.Item2);
+          solution.Capacity = KnapsackCapacityParameter.Value;
+          solution.Weights = WeightsParameter.Value;
+          solution.Values = ValuesParameter.Value;
+        }
+      }
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new KnapsackProblem(this, cloner);
@@ -124 +143 @@
 
     private void RegisterEventHandlers() {
-      Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
-      KnapsackCapacityParameter.ValueChanged += KnapsackCapacityParameter_ValueChanged;
       WeightsParameter.ValueChanged += WeightsParameter_ValueChanged;
-      WeightsParameter.Value.Reset += WeightsValue_Reset;
+      WeightsParameter.Value.Reset += (_, __) => SyncValuesToWeights();
       ValuesParameter.ValueChanged += ValuesParameter_ValueChanged;
-      ValuesParameter.Value.Reset += ValuesValue_Reset;
+      ValuesParameter.Value.Reset += (_, __) => SyncWeightsToValues();
     }
 
     #region Events
-    protected override void OnEncodingChanged() {
-      base.OnEncodingChanged();
-      Parameterize();
-    }
-    //TODO check with abeham if this is really necessary
-    //protected override void OnSolutionCreatorChanged() {
-    //  base.OnSolutionCreatorChanged();
-    //  Parameterize();
-    //}
-    protected override void OnEvaluatorChanged() {
-      base.OnEvaluatorChanged();
-      Evaluator.QualityParameter.ActualNameChanged += Evaluator_QualityParameter_ActualNameChanged;
-      Parameterize();
-    }
     protected override void DimensionOnChanged() {
       base.DimensionOnChanged();
@@ -155 +158 @@
         ((IStringConvertibleArray)ValuesParameter.Value).Length = Dimension;
       }
-      Parameterize();
-    }
-    private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
-      Parameterize();
-    }
-    private void KnapsackCapacityParameter_ValueChanged(object sender, EventArgs e) {
-      Parameterize();
     }
     private void WeightsParameter_ValueChanged(object sender, EventArgs e) {
-      Parameterize();
-      WeightsParameter.Value.Reset += WeightsValue_Reset;
-    }
-    private void WeightsValue_Reset(object sender, EventArgs e) {
+      WeightsParameter.Value.Reset += (_, __) => SyncValuesToWeights();
+      SyncValuesToWeights();
+    }
+    private void ValuesParameter_ValueChanged(object sender, EventArgs e) {
+      ValuesParameter.Value.Reset += (_, __) => SyncWeightsToValues();
+      SyncWeightsToValues();
+    }
+    private void SyncWeightsToValues() {
+      if (WeightsParameter.Value != null && ValuesParameter.Value != null) {
+        ((IStringConvertibleArray)WeightsParameter.Value).Length = Values.Length;
+        Dimension = Values.Length;
+      }
+    }
+    private void SyncValuesToWeights() {
       if (WeightsParameter.Value != null && ValuesParameter.Value != null) {
         ((IStringConvertibleArray)ValuesParameter.Value).Length = Weights.Length;
         Dimension = Weights.Length;
       }
-      Parameterize();
-    }
-    private void ValuesParameter_ValueChanged(object sender, EventArgs e) {
-      Parameterize();
-      ValuesParameter.Value.Reset += ValuesValue_Reset;
-    }
-    private void ValuesValue_Reset(object sender, EventArgs e) {
-      if (WeightsParameter.Value != null && ValuesParameter.Value != null) {
-        ((IStringConvertibleArray)WeightsParameter.Value).Length = Values.Length;
-        Dimension = Values.Length;
-      }
-      Parameterize();
     }
     #endregion
@@ -189 +183 @@
     #region Helpers
     private void InitializeOperators() {
-      Operators.Add(new KnapsackImprovementOperator());
-      Operators.Add(new KnapsackPathRelinker());
-      Operators.Add(new KnapsackSimultaneousPathRelinker());
-      Operators.Add(new QualitySimilarityCalculator());
-      Operators.Add(new NoSimilarityCalculator());
-
-      Operators.Add(new BestKnapsackSolutionAnalyzer());
+      Operators.AddRange(new IItem[] { new KnapsackImprovementOperator(),
+      new KnapsackPathRelinker(), new KnapsackSimultaneousPathRelinker(),
+      new QualitySimilarityCalculator(), new NoSimilarityCalculator(),
+      new KnapsackOneBitflipMoveEvaluator()});
       Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
 
-      Operators.Add(new KnapsackOneBitflipMoveEvaluator());
+      ParameterizeOperators();
+    }
+
+    protected override void ParameterizeOperators() {
+      base.ParameterizeOperators();
       Parameterize();
     }
+
     private void Parameterize() {
-      var operators = new List<IItem>();
-
-      if (BestKnapsackSolutionAnalyzer != null) {
-        operators.Add(BestKnapsackSolutionAnalyzer);
-        BestKnapsackSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
-        BestKnapsackSolutionAnalyzer.MaximizationParameter.Hidden = true;
-        BestKnapsackSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;
-        BestKnapsackSolutionAnalyzer.BestKnownQualityParameter.Hidden = true;
-        BestKnapsackSolutionAnalyzer.BestKnownSolutionParameter.ActualName = BestKnownSolutionParameter.Name;
-        BestKnapsackSolutionAnalyzer.BestKnownSolutionParameter.Hidden = true;
-        BestKnapsackSolutionAnalyzer.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name;
-        BestKnapsackSolutionAnalyzer.KnapsackCapacityParameter.Hidden = true;
-        BestKnapsackSolutionAnalyzer.WeightsParameter.ActualName = WeightsParameter.Name;
-        BestKnapsackSolutionAnalyzer.WeightsParameter.Hidden = true;
-        BestKnapsackSolutionAnalyzer.ValuesParameter.ActualName = ValuesParameter.Name;
-        BestKnapsackSolutionAnalyzer.ValuesParameter.Hidden = true;
-      }
       foreach (var op in Operators.OfType<IKnapsackMoveEvaluator>()) {
-        operators.Add(op);
         op.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name;
         op.KnapsackCapacityParameter.Hidden = true;
@@ -227 +205 @@
         op.ValuesParameter.ActualName = ValuesParameter.Name;
         op.ValuesParameter.Hidden = true;
-
-        var bitflipMoveEval = op as IKnapsackOneBitflipMoveEvaluator;
-        if (bitflipMoveEval != null) {
-          foreach (var moveOp in Encoding.Operators.OfType<IOneBitflipMoveQualityOperator>()) {
-            moveOp.MoveQualityParameter.ActualName = bitflipMoveEval.MoveQualityParameter.ActualName;
-            moveOp.MoveQualityParameter.Hidden = true;
-          }
-        }
-      }
-      foreach (var op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
-        operators.Add(op);
-        op.SolutionParameter.ActualName = Encoding.Name;
-        op.SolutionParameter.Hidden = true;
-      }
-      foreach (var op in Operators.OfType<ISingleObjectivePathRelinker>()) {
-        operators.Add(op);
-        op.ParentsParameter.ActualName = Encoding.Name;
-        op.ParentsParameter.Hidden = true;
-      }
-      foreach (var op in Operators.OfType<ISolutionSimilarityCalculator>()) {
-        operators.Add(op);
-        op.SolutionVariableName = Encoding.Name;
-        op.QualityVariableName = Evaluator.QualityParameter.ActualName;
-      }
-
-      if (operators.Count > 0) Encoding.ConfigureOperators(Operators);
+      }
     }
     #endregion