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

Timestamp:

04/20/12 17:00:09 (12 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/ReferenceSetUpdateMethod.cs (modified) (4 diffs)

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

@@ -46 +46 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["ReferenceSetSize"]; }
     }
-    public IValueLookupParameter<IItem> QualityParameter {
-      get { return (IValueLookupParameter<IItem>)Parameters["Quality"]; }
+    public IValueLookupParameter<IItem> TargetParameter {
+      get { return (IValueLookupParameter<IItem>)Parameters["Target"]; }
+    }
+    public IValueLookupParameter<DiversityCalculator> DiversityCalculatorParameter {
+      get { return (IValueLookupParameter<DiversityCalculator>)Parameters["DiversityCalculator"]; }
     }
     #endregion
@@ -61 +64 @@
       get { return ReferenceSetSizeParameter.ActualValue; }
     }
-    private IItem Quality {
-      get { return QualityParameter.ActualValue; }
+    private IItem Target {
+      get { return TargetParameter.ActualValue; }
+    }
+    private DiversityCalculator DiversityCalculator {
+      get { return DiversityCalculatorParameter.ActualValue; }
     }
     #endregion
@@ -80 +86 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("NumberOfHighQualitySolutions"));
       Parameters.Add(new ValueLookupParameter<IntValue>("ReferenceSetSize"));
-      Parameters.Add(new ValueLookupParameter<IItem>("Quality"));
+      Parameters.Add(new ValueLookupParameter<IItem>("Target"));
+      Parameters.Add(new ValueLookupParameter<DiversityCalculator>("DiversityCalculator"));
       #endregion
+      TargetParameter.ActualName = "KnapsackSolution"; // temporary solution for the knapsack problem
     }
 
@@ -88 +96 @@
       foreach (var pScope in CurrentScope.SubScopes[0].SubScopes) {
         int diversity = 0;
-        var pSol = pScope.Variables[QualityParameter.ActualName].Value;
+        var pSol = pScope.Variables[TargetParameter.ActualName].Value;
         foreach (var rScope in CurrentScope.SubScopes[1].SubScopes) {
-          var rSol = rScope.Variables[QualityParameter.ActualName].Value;
-          if (pSol != null && rSol != null) diversity += Knapsack.DiversityCalculator.CalculateDiversity(pSol, rSol);
+          var rSol = rScope.Variables[TargetParameter.ActualName].Value;
+          diversity += DiversityCalculator.ExecuteCalculation(pSol, rSol);
         }
         population[pScope] = diversity;