Changeset 15506 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.cs

Timestamp:

12/11/17 11:57:56 (6 years ago)

Author:

abeham

Message:

#1614: finished wiring

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.cs (modified) (7 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.cs

@@ -35 +35 @@
   public class CordeauCrossover : GQAPCrossover,
     IQualitiesAwareGQAPOperator, IProblemInstanceAwareGQAPOperator {
-
-    public ILookupParameter<BoolValue> MaximizationParameter {
-      get { return (ILookupParameter<BoolValue>)Parameters["Maximization"]; }
-    }
+    
     public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
       get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
@@ -56 +53 @@
     public CordeauCrossover()
       : base() {
-      Parameters.Add(new LookupParameter<BoolValue>("Maximization", ""));
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The quality of the parents", 1));
       Parameters.Add(new ScopeTreeLookupParameter<Evaluation>("Evaluation", GQAP.EvaluationDescription, 1));
@@ -66 +62 @@
     }
 
-    public static IntegerVector Apply(IRandom random, bool maximization,
+    public static IntegerVector Apply(IRandom random,
       IntegerVector parent1, DoubleValue quality1,
       IntegerVector parent2, DoubleValue quality2,
@@ -80 +76 @@
       
       bool onefound = false;
-      double fbest, fbestAttempt = maximization ? double.MinValue : double.MaxValue;
+      double fbest, fbestAttempt = double.MaxValue;
       IntegerVector bestAttempt = null;
       IntegerVector result = null;
 
       fbest = quality1.Value;
-      if (maximization && quality1.Value < quality2.Value
-        || !maximization && quality1.Value > quality2.Value) {
+      if (quality1.Value > quality2.Value) {
         var temp = parent1;
         parent1 = parent2;
@@ -102 +97 @@
           var childFit = problemInstance.ToSingleObjective(problemInstance.Evaluate(child));
           evaluatedSolutions.Value++;
-          if (maximization && childFit >= fbest
-            || !maximization && childFit <= fbest) {
+          if (childFit <= fbest) {
             fbest = childFit;
             result = child;
             onefound = true;
           }
-          if (!onefound && (maximization && fbestAttempt < childFit || !maximization && fbestAttempt > childFit)) {
+          if (!onefound && fbestAttempt > childFit) {
             bestAttempt = child;
             fbestAttempt = childFit;
@@ -130 +124 @@
         }
 
-        if (!onefound && (maximization && fbestAttempt < childFit || !maximization && fbestAttempt > childFit)) {
+        if (!onefound && fbestAttempt > childFit) {
           bestAttempt = child;
           fbestAttempt = childFit;
@@ -203 +197 @@
 
       var qualities = QualityParameter.ActualValue;
-      return Apply(random, MaximizationParameter.ActualValue.Value,
+      return Apply(random,
         parents[0], qualities[0],
         parents[1], qualities[1],