Changeset 7744 for branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs

Timestamp:

04/20/12 17:00:09 (13 years ago)

Author:

jkarder

Message:

#1331:

• added problem specific improvement operators (KnapsackImprovementOperator, TravelingSalesmanImprovementOperator)
• added custom interface (IScatterSearchTargetProcessor) for Scatter Search specific operators that use a target parameter
• added custom operator (OffspringProcessor) to process multiple children that were created by crossovers
• extracted diversity calculation and added problem/encoding specific operators (BinaryVectorDiversityCalculator, PermutationDiversityCalculator) for it
• added parameters and adjusted types
• adjusted event handling
• minor code improvements

File:

• branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs (modified) (3 diffs)

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs

@@ -46 +46 @@
       get { return (IValueLookupParameter<IOperator>)Parameters["Improver"]; }
     }
+    public IValueLookupParameter<DiversityCalculator> DiversityCalculatorParameter {
+      get { return (IValueLookupParameter<DiversityCalculator>)Parameters["DiversityCalculator"]; }
+    }
     public IValueLookupParameter<IntValue> NumberOfHighQualitySolutionsParameter {
       get { return (IValueLookupParameter<IntValue>)Parameters["NumberOfHighQualitySolutions"]; }
@@ -99 +102 @@
       get { return ImproverParameter.ActualValue; }
       set { ImproverParameter.ActualValue = value; }
+    }
+    private DiversityCalculator DiversityCalculator {
+      get { return DiversityCalculatorParameter.ActualValue; }
+      set { DiversityCalculatorParameter.ActualValue = value; }
     }
     private IntValue NumberOfHighQualitySolutions {
@@ -168 +175 @@
       Parameters.Add(new ValueLookupParameter<ICrossover>("Crossover", "The operator used to combine solutions."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Improver", "The operator used to improve solutions."));
+      Parameters.Add(new ValueLookupParameter<DiversityCalculator>("DiversityCalculator", "The operator used to calculate the diversity of two solutions."));
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfHighQualitySolutions", "The number of high quality solutions that should be added to the reference set."));
       Parameters.Add(new ValueLookupParameter<IntValue>("PopulationSize", "The size of the population."));