Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs

Timestamp:

06/22/12 11:11:38 (12 years ago)

Author:

jkarder

Message:

#1331:

• synced branch with trunk
• added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
• similarity calculators are now parameterized by the algorithm
• deleted SolutionPool2TierUpdateMethod
• deleted KnapsackMultipleGuidesPathRelinker
• moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
• added parameter descriptions
• fixed plugin references
• fixed count of EvaluatedSolutions
• fixed check for duplicate solutions
• minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs (modified) (10 diffs)

branches/ScatterSearch (trunk integration)

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs

@@ -92 +92 @@
       get { return (IValueLookupParameter<ISimilarityCalculator>)Parameters["SimilarityCalculator"]; }
     }
-    public IValueLookupParameter<ISolutionCreator> SolutionCreatorParameter {
-      get { return (IValueLookupParameter<ISolutionCreator>)Parameters["SolutionCreator"]; }
-    }
     public IValueLookupParameter<IItem> TargetParameter {
       get { return (IValueLookupParameter<IItem>)Parameters["Target"]; }
@@ -173 +170 @@
       set { SimilarityCalculatorParameter.ActualValue = value; }
     }
-    private ISolutionCreator SolutionCreator {
-      get { return SolutionCreatorParameter.ActualValue; }
-      set { SolutionCreatorParameter.ActualValue = value; }
-    }
     private IItem Target {
       get { return TargetParameter.ActualValue; }
@@ -194 +187 @@
     private void Initialize() {
       #region Create parameters
-      Parameters.Add(new ValueLookupParameter<IMultiAnalyzer>("Analyzer"));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestKnownQuality"));
-      Parameters.Add(new ValueLookupParameter<ICrossover>("Crossover"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("EvaluatedSolutions"));
-      Parameters.Add(new ValueLookupParameter<IEvaluator>("Evaluator"));
-      Parameters.Add(new ValueLookupParameter<BoolValue>("ExecutePathRelinking"));
-      Parameters.Add(new ValueLookupParameter<IImprovementOperator>("Improver"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Iterations"));
-      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("MaximumIterations"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfHighQualitySolutions"));
-      Parameters.Add(new ValueLookupParameter<IPathRelinker>("PathRelinker"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("PopulationSize"));
-      Parameters.Add(new ValueLookupParameter<IntValue>("ReferenceSetSize"));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("Quality"));
-      Parameters.Add(new ValueLookupParameter<IRandom>("Random"));
-      Parameters.Add(new ValueLookupParameter<VariableCollection>("Results"));
-      Parameters.Add(new ValueLookupParameter<ISimilarityCalculator>("SimilarityCalculator"));
-      Parameters.Add(new ValueLookupParameter<ISolutionCreator>("SolutionCreator"));
-      Parameters.Add(new ValueLookupParameter<IItem>("Target"));
+      Parameters.Add(new ValueLookupParameter<IMultiAnalyzer>("Analyzer", "The analyzer used to analyze each iteration."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestKnownQuality", "The best known quality value found so far."));
+      Parameters.Add(new ValueLookupParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("EvaluatedSolutions", "The number of times solutions have been evaluated."));
+      Parameters.Add(new ValueLookupParameter<IEvaluator>("Evaluator", "The operator used to evaluate solutions. This operator is executed in parallel, if an engine is used which supports parallelization."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("ExecutePathRelinking", "True if path relinking should be executed instead of crossover, otherwise false."));
+      Parameters.Add(new ValueLookupParameter<IImprovementOperator>("Improver", "The operator used to improve solutions."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("Iterations", "The number of iterations performed."));
+      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("MaximumIterations", "The maximum number of iterations which should be processed."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfHighQualitySolutions", "The number of high quality solutions in the reference set."));
+      Parameters.Add(new ValueLookupParameter<IPathRelinker>("PathRelinker", "The operator used to execute path relinking."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("PopulationSize", "The size of the population of solutions."));
+      Parameters.Add(new ValueLookupParameter<IntValue>("ReferenceSetSize", "The size of the reference set."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("Quality", "This parameter is used for name translation only."));
+      Parameters.Add(new ValueLookupParameter<IRandom>("Random", "A pseudo random number generator."));
+      Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
+      Parameters.Add(new ValueLookupParameter<ISimilarityCalculator>("SimilarityCalculator", "The operator used to calculate the similarity between two solutions."));
+      Parameters.Add(new ValueLookupParameter<IItem>("Target", "This parameter is used for name translation only."));
       #endregion
 
@@ -239 +231 @@
       SolutionPoolUpdateMethod solutionPoolUpdateMethod = new SolutionPoolUpdateMethod();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
-      SubScopesCounter subScopesCounter1 = new SubScopesCounter();
-      SubScopesCounter subScopesCounter2 = new SubScopesCounter();
+      DataReducer dataReducer1 = new DataReducer();
+      DataReducer dataReducer2 = new DataReducer();
       SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
       SubScopesProcessor subScopesProcessor2 = new SubScopesProcessor();
       SubScopesProcessor subScopesProcessor3 = new SubScopesProcessor();
+      SubScopesProcessor subScopesProcessor4 = new SubScopesProcessor();
       ConditionalBranch terminateBranch = new ConditionalBranch();
       UniformSubScopesProcessor uniformSubScopesProcessor1 = new UniformSubScopesProcessor();
@@ -253 +246 @@
       #region Create operator graph
       OperatorGraph.InitialOperator = variableCreator;
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>(IterationsParameter.Name, new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("NewSolutions", new BoolValue(false)));
       variableCreator.Successor = resultsCollector;
@@ -264 +257 @@
       iterationsChecker.Name = "IterationsChecker";
       iterationsChecker.Comparison.Value = ComparisonType.GreaterOrEqual;
-      iterationsChecker.LeftSideParameter.ActualName = "Iterations";
-      iterationsChecker.RightSideParameter.ActualName = "MaximumIterations";
+      iterationsChecker.LeftSideParameter.ActualName = IterationsParameter.Name;
+      iterationsChecker.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
       iterationsChecker.ResultParameter.ActualName = "Terminate";
       iterationsChecker.Successor = terminateBranch;
@@ -273 +266 @@
       terminateBranch.FalseBranch = referenceSetUpdateMethod;
 
-      referenceSetUpdateMethod.TargetParameter.ActualName = TargetParameter.ActualName;
       referenceSetUpdateMethod.Successor = assigner1;
 
@@ -305 +297 @@
 
       pathRelinker.Name = "PathRelinker";
-      pathRelinker.OperatorParameter.ActualName = "PathRelinker";
+      pathRelinker.OperatorParameter.ActualName = PathRelinkerParameter.Name;
       pathRelinker.Successor = offspringProcessor;
 
       crossover.Name = "Crossover";
-      crossover.OperatorParameter.ActualName = "Crossover";
+      crossover.OperatorParameter.ActualName = CrossoverParameter.Name;
       crossover.Successor = offspringProcessor;
 
@@ -326 +318 @@
       uniformSubScopesProcessor2.DepthParameter.Value = new IntValue(2);
       uniformSubScopesProcessor2.Operator = solutionImprover1;
-      uniformSubScopesProcessor2.Successor = subScopesCounter1;
+      uniformSubScopesProcessor2.Successor = subScopesProcessor4;
 
       solutionImprover1.Name = "SolutionImprover";
-      solutionImprover1.OperatorParameter.ActualName = "Improver";
+      solutionImprover1.OperatorParameter.ActualName = ImproverParameter.Name;
       solutionImprover1.Successor = solutionEvaluator1;
 
       solutionEvaluator1.Name = "SolutionEvaluator";
-      solutionEvaluator1.OperatorParameter.ActualName = "Evaluator";
-
-      subScopesCounter1.Name = "Increment EvaluatedSolutions";
-      subScopesCounter1.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
+      solutionEvaluator1.OperatorParameter.ActualName = EvaluatorParameter.Name;
+
+      subScopesProcessor4.Operators.Add(dataReducer1);
+
+      dataReducer1.Name = "Increment EvaluatedSolutions";
+      dataReducer1.ParameterToReduce.ActualName = "LocalEvaluatedSolutions";
+      dataReducer1.TargetParameter.ActualName = EvaluatedSolutionsParameter.Name;
+      dataReducer1.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum);
+      dataReducer1.TargetOperation.Value = new ReductionOperation(ReductionOperations.Sum);
 
       solutionPoolUpdateMethod.QualityParameter.ActualName = QualityParameter.ActualName;
-      solutionPoolUpdateMethod.TargetParameter.ActualName = TargetParameter.ActualName;
       solutionPoolUpdateMethod.Successor = analyzer;
 
       analyzer.Name = "Analyzer";
-      analyzer.OperatorParameter.ActualName = "Analyzer";
+      analyzer.OperatorParameter.ActualName = AnalyzerParameter.Name;
 
       newSolutionsBranch.Name = "NewSolutionsChecker";
@@ -359 +355 @@
 
       solutionsCreator.Name = "DiversificationGenerationMethod";
-      solutionsCreator.NumberOfSolutionsParameter.ActualName = "PopulationSize";
+      solutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;
       solutionsCreator.Successor = uniformSubScopesProcessor3;
 
       uniformSubScopesProcessor3.DepthParameter.Value = new IntValue(1);
       uniformSubScopesProcessor3.Operator = solutionImprover2;
-      uniformSubScopesProcessor3.Successor = subScopesCounter2;
+      uniformSubScopesProcessor3.Successor = dataReducer2;
 
       solutionImprover2.Name = "SolutionImprover";
-      solutionImprover2.OperatorParameter.ActualName = "Improver";
+      solutionImprover2.OperatorParameter.ActualName = ImproverParameter.Name;
       solutionImprover2.Successor = solutionEvaluator2;
 
       solutionEvaluator2.Name = "SolutionEvaluator";
-      solutionEvaluator2.OperatorParameter.ActualName = "Evaluator";
-
-      subScopesCounter2.Name = "Increment EvaluatedSolutions";
-      subScopesCounter2.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
+      solutionEvaluator2.OperatorParameter.ActualName = EvaluatorParameter.Name;
+
+      dataReducer2.Name = "Increment EvaluatedSolutions";
+      dataReducer2.ParameterToReduce.ActualName = "LocalEvaluatedSolutions";
+      dataReducer2.TargetParameter.ActualName = EvaluatedSolutionsParameter.Name;
+      dataReducer2.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum);
+      dataReducer2.TargetOperation.Value = new ReductionOperation(ReductionOperations.Sum);
 
       iterationsCounter.Name = "IterationCounter";
       iterationsCounter.IncrementParameter.Value = new IntValue(1);
-      iterationsCounter.ValueParameter.ActualName = "Iterations";
+      iterationsCounter.ValueParameter.ActualName = IterationsParameter.Name;
       iterationsCounter.Successor = resultsCollector;
       #endregion

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests