Changeset 11996 for trunk/sources

Timestamp:

02/12/15 21:49:06 (10 years ago)

Author:

mkommend

Message:

#2282: Fixed maximization flag and solution creators for binary problems.

Location:

trunk/sources

Files:

• HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs (modified) (3 diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveBasicProblem.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Binary/3.3/BinaryProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Binary/3.3/DeceptiveTrapProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Binary/3.3/HIFFProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Binary/3.3/OneMaxProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs

@@ -67 +67 @@
       Parameters.Add(new ValueParameter<TEncoding>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any."));
       oldEncoding = Encoding;
+      Parameterize();
       RegisterEvents();
     }
@@ -91 +92 @@
 
     protected virtual void OnEncodingChanged() {
+      Parameterize();
+
+      OnOperatorsChanged();
+      OnReset();
+    }
+
+    private void Parameterize() {
       if (oldEncoding != null) {
         AdaptEncodingOperators(oldEncoding, Encoding);
@@ -107 +115 @@
         Encoding.SolutionCreator);
       Parameters.Remove(SolutionCreatorParameter);
-      Parameters.Add(solutionCreatorParam);  
-      ((IValueParameter)solutionCreatorParam).ValueChanged += SolutionCreatorParameter_ValueChanged;      
+      Parameters.Add(solutionCreatorParam);
+      ((IValueParameter)solutionCreatorParam).ValueChanged += SolutionCreatorParameter_ValueChanged;
 
       var multiEncoding = Encoding as MultiEncoding;
       if (multiEncoding != null) multiEncoding.EncodingsChanged += MultiEncodingOnEncodingsChanged;
-
-      OnOperatorsChanged();
-      OnReset();
     }
 

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/MultiObjectiveBasicProblem.cs

@@ -41 +41 @@
     protected MultiObjectiveBasicProblem()
       : base() {
-      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", new BoolArray()));
+      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()));
 
       Operators.Add(Evaluator);
@@ -57 +57 @@
     public abstract double[] Evaluate(Individual individual, IRandom random);
     public virtual void Analyze(Individual[] individuals, double[][] qualities, ResultCollection results, IRandom random) { }
-
-    protected override void OnEncodingChanged() {
-      base.OnEncodingChanged();
-      Parameters["Maximization"].ActualValue = new BoolArray(Maximization);
-    }
 
     protected override void OnOperatorsChanged() {

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs

@@ -59 +59 @@
     protected SingleObjectiveBasicProblem()
       : base() {
-      Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", new BoolValue()));
+      Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", (BoolValue)new BoolValue(Maximization).AsReadOnly()) { Hidden = true });
       Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
 
@@ -82 +82 @@
     public virtual IEnumerable<Individual> GetNeighbors(Individual individual, IRandom random) {
       return Enumerable.Empty<Individual>();
-    }
-
-
-    protected override void OnEncodingChanged() {
-      base.OnEncodingChanged();
-      var max = (BoolValue)Parameters["Maximization"].ActualValue;
-      max.Value = Maximization;
     }
 

trunk/sources/HeuristicLab.Problems.Binary/3.3/BinaryProblem.cs

@@ -23 +23 @@
 
 using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -67 +68 @@
     }
 
+    public abstract double Evaluate(BinaryVector vector, IRandom random);
     public sealed override double Evaluate(Individual individual, IRandom random) {
       return Evaluate(individual.BinaryVector(), random);
     }
 
-    public abstract double Evaluate(BinaryVector vector, IRandom random);
+    public override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
+      base.Analyze(individuals, qualities, results, random);
+      var best = individuals.Zip(qualities, (i, q) => new { Individual = i, Quality = q }).OrderByDescending(z => z.Quality).First();
+      if (!results.ContainsKey("Best Solution")) {
+        results.Add(new Result("Best Solution", typeof(BinaryVector)));
+      }
+      results["Best Solution"].Value = best.Individual.BinaryVector();
+    }
 
     protected override void OnEncodingChanged() {

trunk/sources/HeuristicLab.Problems.Binary/3.3/DeceptiveTrapProblem.cs

@@ -66 +66 @@
       : base() {
       Parameters.Add(new FixedValueParameter<IntValue>(TrapSizeParameterName, "", new IntValue(7)));
-      Length = 49;
+      Encoding.Length = 49;
     }
 

trunk/sources/HeuristicLab.Problems.Binary/3.3/HIFFProblem.cs

@@ -48 +48 @@
     public HIFFProblem()
       : base() {
-      Length = 64;
+        Encoding.Length = 64;
     }
     // In the GECCO paper, Section 4.1

trunk/sources/HeuristicLab.Problems.Binary/3.3/OneMaxProblem.cs

@@ -39 +39 @@
     public OneMaxProblem()
       : base() {
-      Encoding = new BinaryVectorEncoding("BinaryVector", 10);
-      BestKnownQuality = Length;
+      Encoding.Length = 10;
+      BestKnownQuality = Encoding.Length;
     }
 
@@ -49 +49 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new OneMaxProblem(this, cloner);
-    }
-
-    public override void Analyze(Individual[] individuals, double[] qualities, ResultCollection results, IRandom random) {
-      base.Analyze(individuals, qualities, results, random);
-      var best = individuals.Zip(qualities, (i, q) => new { Individual = i, Quality = q }).OrderByDescending(z => z.Quality).First();
-      if (!results.ContainsKey("Best Solution")) {
-        results.Add(new Result("Best Solution", typeof(BinaryVector)));
-      }
-      results["Best Solution"].Value = best.Individual.BinaryVector();
     }
 

trunk/sources/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -24 +24 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -73 +74 @@
 
     private void OnProblemDefinitionChanged() {
+      if (Parameters.ContainsKey("Maximization")) Parameters.Remove("Maximization");
+      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()));
+
       Encoding = ProblemDefinition.Encoding;
       OnOperatorsChanged();

trunk/sources/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -26 +26 @@
 using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
@@ -76 +77 @@
 
     private void OnProblemDefinitionChanged() {
+      if (Parameters.ContainsKey("Maximization")) Parameters.Remove("Maximization");
+      Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", (BoolValue)new BoolValue(Maximization).AsReadOnly()) { Hidden = true });
+
       Encoding = ProblemDefinition.Encoding;
+      OnOperatorsChanged();
+      OnReset();
     }