Changeset 7786 for branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/Knapsack/KnapsackMultipleGuidesPathRelinker.cs

Timestamp:

05/09/12 12:22:33 (12 years ago)

Author:

jkarder

Message:

#1331:

• fixed bug in path relinking selection
• fixed bug in ScatterSearch.Prepare()
• added custom interface (IImprovementOperator) for Scatter Search specific improvement operators
• switched from diversity calculation to similarity calculation
• separated IPathRelinker from ICrossover
• changed TestFunctionsImprovementOperator to use reflection for evaluating functions
• changed SolutionPoolUpdateMethod to use similarity calculation for solution comparison
• improved TravelingSalesmanImprovementOperator
• improved operator graph
• removed specific operators used to evaluate TestFunctions problems
• removed custom crossover operator (NChildCrossover)
• added parameters and adjusted types
• adjusted event handling
• changed access levels
• minor code improvements

File:

• branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/Knapsack/KnapsackMultipleGuidesPathRelinker.cs (modified) (2 diffs)

branches/ScatterSearch/HeuristicLab.Algorithms.ScatterSearch/3.3/Knapsack/KnapsackMultipleGuidesPathRelinker.cs

@@ -54 +54 @@
         throw new ArgumentException("RelinkingAccuracy must be greater than 0.");
 
-      var v1 = initiator.Clone() as BinaryVector;
-      var targets = new BinaryVector[guides.Length];
+      BinaryVector v1 = initiator.Clone() as BinaryVector;
+      BinaryVector[] targets = new BinaryVector[guides.Length];
       Array.Copy(guides, targets, guides.Length);
 
@@ -61 +61 @@
         throw new ArgumentException("At least one solution is of different length.");
 
-      var solutions = new List<BinaryVector>();
+      IList<BinaryVector> solutions = new List<BinaryVector>();
       for (int i = 0; i < v1.Length; i++) {
         // TODO: path relinking
       }
 
-      var selection = new List<IItem>();
+      IList<IItem> selection = new List<IItem>();
       if (solutions.Count > 0) {
-        var noSol = (int)Math.Round(solutions.Count * n.Value);
+        int noSol = (int)(solutions.Count * n.Value);
         if (noSol <= 0) noSol++;
-        var stepSize = (double)solutions.Count / (double)noSol;
+        double stepSize = (double)solutions.Count / (double)noSol;
         for (int i = 0; i < noSol; i++)
-          selection.Add(solutions.ElementAt((int)Math.Round((i + 1) * stepSize - stepSize * 0.5)));
+          selection.Add(solutions.ElementAt((int)((i + 1) * stepSize - stepSize * 0.5)));
       }