Changeset 7373 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms

Timestamp:

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

Author:

abeham

Message:

#1614: Worked on GQAP

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASPWithPathRelinkingMainLoop.cs (modified) (7 diffs)

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;