Changeset 7373 for branches

Timestamp:

01/19/12 17:33:28 (13 years ago)

Author:

abeham

Message:

#1614: Worked on GQAP

Location:

branches/GeneralizedQAP

Files:

• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinkingMainLoop.cs (modified) (7 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (7 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IEquipmentAwareGQAPOperator.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IGQAPSolutionCreator.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/DemandEquivalentSwapEquipmentManipluator.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GQAPSolutionCreator.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/GreedyRandomizedSolutionCreator.cs (added)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/RandomSolutionCreator.cs (added)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinkingMainLoop.cs

@@ -61 +61 @@
       get { return (IValueLookupParameter<IOperator>)Parameters["PathRelinking"]; }
     }
-    public IValueLookupParameter<IOperator> EliteSetReplacerParameter {
-      get { return (IValueLookupParameter<IOperator>)Parameters["EliteSetReplacer"]; }
+    public IValueLookupParameter<IOperator> EliteSetMergerParameter {
+      get { return (IValueLookupParameter<IOperator>)Parameters["EliteSetMerger"]; }
     }
     public IValueLookupParameter<IOperator> AnalyzerParameter {
@@ -82 +82 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("LocalImprovement", "The operator which performs the local improvement."));
       Parameters.Add(new ValueLookupParameter<IOperator>("PathRelinking", "The operator which performs the path relinking."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("EliteSetReplacer", "The operator that replaces elements in the elite set."));
+      Parameters.Add(new ValueLookupParameter<IOperator>("EliteSetMerger", "The operator that merges elements in the elite set."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The analyzer that is to be applied."));
 
       var variableCreator1 = new VariableCreator();
+      variableCreator1.Name = "Iterations = 0";
       variableCreator1.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
 
       var variableCreator2 = new VariableCreator();
+      variableCreator2.Name = "ActualEliteSetSize = 0";
       variableCreator2.CollectedValues.Add(new ValueParameter<IntValue>("ActualEliteSetSize", new IntValue(0)));
-      variableCreator2.Name = "ActualEliteSetSize = 0";
 
       var subScopesCounter1 = new SubScopesCounter();
@@ -119 +120 @@
 
       var solutionsCreator = new SolutionsCreator();
+      solutionsCreator.ParallelParameter.Value = new BoolValue(false);
       solutionsCreator.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
       solutionsCreator.SolutionCreatorParameter.ActualName = SolutionCreatorParameter.Name;
@@ -149 +151 @@
       childrenCreator.ParentsPerChild = new IntValue(2);
 
+      var ssp3 = new SubScopesProcessor();
+
       var placeholder2 = new Placeholder();
       placeholder2.Name = "(PathRelinking)";
@@ -156 +160 @@
       subScopesRemover.RemoveAllSubScopes = true;
 
-      var ssp3 = new SubScopesProcessor();
+      var ssp4 = new SubScopesProcessor();
 
       var placeholder3 = new Placeholder();
@@ -163 +167 @@
 
       var placeholder4 = new Placeholder();
-      placeholder4.Name = "(Replacer)";
-      placeholder4.OperatorParameter.ActualName = EliteSetReplacerParameter.Name;
+      placeholder4.Name = "(EliteSetMerger)";
+      placeholder4.OperatorParameter.ActualName = EliteSetMergerParameter.Name;
 
       var counter = new IntCounter();
@@ -203 +207 @@
       conditionalBranch2.TrueBranch = ssp2;
       conditionalBranch2.FalseBranch = null;
-      conditionalBranch2.Successor = ssp3;
+      conditionalBranch2.Successor = ssp4;
       ssp2.Operators.Add(eo2);
       ssp2.Operators.Add(placeholder1);
-      ssp2.Successor = null;
+      ssp2.Successor = childrenCreator;
       eo2.Successor = null;
-      placeholder1.Successor = childrenCreator;
-      childrenCreator.Successor = placeholder2;
+      placeholder1.Successor = null;
+      childrenCreator.Successor = ssp3;
+      ssp3.Operators.Add(placeholder2);
+      ssp3.Successor = null;
       placeholder2.Successor = subScopesRemover;
       subScopesRemover.Successor = null;
-      ssp3.Operators.Add(placeholder3);
-      ssp3.Successor = null;
+      ssp4.Operators.Add(placeholder3);
+      ssp4.Successor = null;
       placeholder4.Successor = counter;
       counter.Successor = analyzer1;

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

@@ -36 +36 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class GeneralizedQuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IGQAPEvaluator, IIntegerVectorCreator>, IStorableContent {
+  public sealed class GeneralizedQuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IGQAPEvaluator, IGQAPSolutionCreator>, IStorableContent {
     public override Image ItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Type; }
@@ -109 +109 @@
     }
     public GeneralizedQuadraticAssignmentProblem()
-      : base(new GQAPEvaluator(), new UniformRandomIntegerVectorCreator()) {
+      : base(new GQAPEvaluator(), new RandomSolutionCreator()) {
       Parameters.Add(new ValueParameter<DoubleMatrix>("Weights", "The weights matrix describes the flows between the equipments.", new DoubleMatrix()));
       Parameters.Add(new ValueParameter<DoubleMatrix>("Distances", "The distances matrix describes the distances between the locations at which the equipment can be installed.", new DoubleMatrix()));
@@ -146 +146 @@
       Capacities[0] = 4; Capacities[1] = 1; Capacities[2] = 4;
 
-      SolutionCreator.IntegerVectorParameter.ActualName = "Assignment";
+      SolutionCreator.AssignmentParameter.ActualName = "Assignment";
       Parameterize();
 
@@ -184 +184 @@
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserializationHook() {
-      // BackwardsCompatibility3.3
-      #region Backwards compatible code, remove with 3.4
-      if (!Parameters.ContainsKey("EquipmentNames"))
-        Parameters.Add(new OptionalValueParameter<StringArray>("EquipmentNames", "Optional: A list of names that describes the equipments.", null, false));
-      if (!Parameters.ContainsKey("LocationNames"))
-        Parameters.Add(new OptionalValueParameter<StringArray>("LocationNames", "Optional: A list of names that describes the locations.", null, false));
-      #endregion
       AttachEventHandlers();
     }
@@ -196 +189 @@
     private void AttachEventHandlers() {
       Evaluator.QualityParameter.ActualNameChanged += new System.EventHandler(Evaluator_QualityParameter_ActualNameChanged);
-      SolutionCreator.IntegerVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_IntegerVectorParameter_ActualNameChanged);
+      SolutionCreator.AssignmentParameter.ActualNameChanged += new EventHandler(SolutionCreator_IntegerVectorParameter_ActualNameChanged);
     }
 
@@ -214 +207 @@
       Evaluator.DemandsParameter.ActualName = DemandsParameter.Name;
       Evaluator.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
-      Evaluator.AssignmentParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
-
-      SolutionCreator.LengthParameter.Value = new IntValue(Demands.Length);
-      SolutionCreator.MinimumParameter.Value = new IntValue(0);
-      SolutionCreator.MaximumParameter.Value = new IntValue(Capacities.Length);
+      Evaluator.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+
+      SolutionCreator.DemandsParameter.ActualName = DemandsParameter.Name;
+      SolutionCreator.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
 
       foreach (var op in Operators.OfType<IIntegerVectorCrossover>()) {
-        op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
-        op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        op.ParentsParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+        op.ChildParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
       }
       foreach (var op in Operators.OfType<IIntegerVectorManipulator>()) {
-        op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        op.IntegerVectorParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
       }
       foreach (var op in Operators.OfType<IGQAPCrossover>()) {
-        op.ParentsParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
-        op.ChildParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        op.ParentsParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
+        op.ChildParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
       }
       foreach (var op in Operators.OfType<IGQAPManipulator>()) {
-        op.IntegerVectorParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        op.IntegerVectorParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
       }
       foreach (var op in Operators.OfType<ILocationAwareGQAPOperator>()) {
         op.CapacitiesParameter.ActualName = CapacitiesParameter.Name;
       }
-      foreach (var op in Operators.OfType<IEquipmentAwareGQAPManipulator>()) {
+      foreach (var op in Operators.OfType<IEquipmentAwareGQAPOperator>()) {
         op.DemandsParameter.ActualName = DemandsParameter.Name;
       }
@@ -245 +237 @@
         BestSolutionAnalyzer.DistancesParameter.ActualName = DistancesParameter.Name;
         BestSolutionAnalyzer.WeightsParameter.ActualName = WeightsParameter.Name;
-        BestSolutionAnalyzer.AssignmentParameter.ActualName = SolutionCreator.IntegerVectorParameter.ActualName;
+        BestSolutionAnalyzer.AssignmentParameter.ActualName = SolutionCreator.AssignmentParameter.ActualName;
         BestSolutionAnalyzer.ResultsParameter.ActualName = "Results";
         BestSolutionAnalyzer.BestKnownQualityParameter.ActualName = BestKnownQualityParameter.Name;

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/IEquipmentAwareGQAPOperator.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  public interface IEquipmentAwareGQAPManipulator : IGQAPManipulator {
+  public interface IEquipmentAwareGQAPOperator : IGQAPOperator {
     ILookupParameter<DoubleArray> DemandsParameter { get; }
   }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/DemandEquivalentSwapEquipmentManipluator.cs

@@ -34 +34 @@
   [Item("DemandEquivalentSwapEquipmentManipluator", "Swaps equipment X from location A with as much equipments from location B that the demand of X is less than or equal to the demand of the swapped equipments in B.")]
   [StorableClass]
-  public class DemandEquivalentSwapEquipmentManipluator : GQAPManipulator, ILocationAwareGQAPOperator, IEquipmentAwareGQAPManipulator {
-    
+  public class DemandEquivalentSwapEquipmentManipluator : GQAPManipulator, ILocationAwareGQAPOperator, IEquipmentAwareGQAPOperator {
+
     public ILookupParameter<DoubleArray> CapacitiesParameter {
       get { return (ILookupParameter<DoubleArray>)Parameters["Capacities"]; }