Changeset 11996 for trunk/sources/HeuristicLab.Problems.Binary/3.3

Timestamp:

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

Author:

mkommend

Message:

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

Location:

trunk/sources/HeuristicLab.Problems.Binary/3.3

Files:

• BinaryProblem.cs (modified) (2 diffs)
• DeceptiveTrapProblem.cs (modified) (1 diff)
• HIFFProblem.cs (modified) (1 diff)
• OneMaxProblem.cs (modified) (2 diffs)

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();
     }