Changeset 15506 for branches/GeneralizedQAP

Timestamp:

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

Author:

abeham

Message:

#1614: finished wiring

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

Files:

• Evaluation/GQAPNMoveEvaluator.cs (modified) (1 diff)
• GQAP.cs (modified) (5 diffs)
• Interfaces/Parameter/IAssignmentAwareGQAPOperator.cs (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IProblemInstanceAwareGQAPOperator.cs) (1 diff)
• Operators/Crossovers/CordeauCrossover.cs (modified) (7 diffs)
• Operators/LocalImprovers/ApproximateLocalSearch.cs (modified) (1 diff)
• Operators/PopulationReducers/GQAPQualitySimilarityReducer.cs (modified) (1 diff)
• Operators/Shakers/NMoveShakingOperator.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/GQAPNMoveEvaluator.cs

@@ -34 +34 @@
   [StorableClass]
   public class GQAPNMoveEvaluator : SingleSuccessorOperator, IGQAPNMoveEvaluator,
-    IQualityAwareGQAPOperator, IProblemInstanceAwareGQAPOperator {
+    IQualityAwareGQAPOperator, IProblemInstanceAwareGQAPOperator, IAssignmentAwareGQAPOperator {
 
     #region Parameter Descriptions

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAP.cs

@@ -48 +48 @@
     public override bool Maximization { get { return false; } }
 
+    [Storable]
+    private bool initialized; // ABE: helper variable that defines if the constructor has completed
+
     #region Parameter Descriptions
     public static readonly string BestKnownQualityDescription = "The best known quality (if available).";
@@ -88 +91 @@
       : base(original, cloner) {
       RegisterEventHandlers();
+      initialized = original.initialized;
     }
     public GQAP() : base() {
@@ -97 +101 @@
       InitializeOperators();
       RegisterEventHandlers();
+      initialized = true;
+      Parameterize();
     }
 
@@ -343 +349 @@
     protected override void OnOperatorsChanged() {
       base.OnOperatorsChanged();
+      if (!initialized) return;
       Parameterize();
     }
     protected override void OnEncodingChanged() {
       base.OnEncodingChanged();
+      if (!initialized) return;
       Parameterize();
     }
@@ -397 +405 @@
       Operators.RemoveAll(x => x is ISingleObjectiveMoveEvaluator);
       Operators.AddRange(ApplicationManager.Manager.GetInstances<IGQAPMoveEvaluator>());
-      Operators.Add(new HammingSimilarityCalculator());
-      Operators.Add(new QualitySimilarityCalculator());
+      Operators.Add(new HammingSimilarityCalculator() { SolutionVariableName = Encoding.Name, QualityVariableName = Evaluator.QualityParameter.ActualName });
+      Operators.Add(new QualitySimilarityCalculator() { SolutionVariableName = Encoding.Name, QualityVariableName = Evaluator.QualityParameter.ActualName });
       
       Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>()));
-      Parameterize();
     }
 
     private void Parameterize() {
       var operators = Operators.Union(new IOperator[] { SolutionCreator, Evaluator }).ToArray();
-      
+      Encoding.ConfigureOperators(operators.OfType<IOperator>());
+      foreach (var op in operators.OfType<IAssignmentAwareGQAPOperator>()) {
+        op.AssignmentParameter.ActualName = Encoding.Name;
+        op.AssignmentParameter.Hidden = true;
+      }
       foreach (var op in operators.OfType<IBestKnownQualityAwareGQAPOperator>()) {
         op.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IAssignmentAwareGQAPOperator.cs

@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  public interface IProblemInstanceAwareGQAPOperator : IGQAPOperator {
-    ILookupParameter<GQAPInstance> ProblemInstanceParameter { get; }
+  public interface IAssignmentAwareGQAPOperator : IGQAPOperator {
+    ILookupParameter<IntegerVector> AssignmentParameter { get; }
   }
 }

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],

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/LocalImprovers/ApproximateLocalSearch.cs

@@ -36 +36 @@
   [StorableClass]
   public class ApproximateLocalSearch : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator,
-    IQualityAwareGQAPOperator, IGQAPLocalImprovementOperator, IStochasticOperator {
+    IQualityAwareGQAPOperator, IGQAPLocalImprovementOperator, IAssignmentAwareGQAPOperator, IStochasticOperator {
     public IProblem Problem { get; set; }
     public Type ProblemType {

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/PopulationReducers/GQAPQualitySimilarityReducer.cs

@@ -34 +34 @@
   [Item("GQAPQualitySimilarityReducer", "Reduces two populations two one by using quality and similarity information to obtain a population of high quality, but also diverse solutions.")]
   [StorableClass]
-  public class GQAPQualitySimilarityReducer : SingleSuccessorOperator, IQualityAwareGQAPOperator, IPopulationReducer {
+  public class GQAPQualitySimilarityReducer : SingleSuccessorOperator, IQualityAwareGQAPOperator, IAssignmentAwareGQAPOperator, IPopulationReducer {
     public ILookupParameter<IntegerVector> AssignmentParameter {
       get { return (ILookupParameter<IntegerVector>)Parameters["Assignment"]; }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Shakers/NMoveShakingOperator.cs

@@ -32 +32 @@
   [Item("NMoveShakingOperator", "Performs a number of shaking operations that increase in strength.")]
   [StorableClass]
-  public class NMoveShakingOperator : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator, IMultiNeighborhoodShakingOperator, IStochasticOperator {
+  public class NMoveShakingOperator : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator,
+    IAssignmentAwareGQAPOperator, IMultiNeighborhoodShakingOperator, IStochasticOperator {