Changeset 8086 for branches/ScatterSearch (trunk integration)/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVector.cs

Timestamp:

06/22/12 11:11:38 (13 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.Encodings.IntegerVectorEncoding (modified) (1 prop)
• HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVector.cs (modified) (2 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.Encodings.IntegerVectorEncoding/3.3/IntegerVector.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -49 +50 @@
     }
 
-    public virtual void Randomize(IRandom random, int startIndex, int length, int min, int max) {
+    public virtual void Randomize(IRandom random, int startIndex, int length, int min, int max, int step = 1) {
       if (length > 0) {
-        for (int i = 0; i < length; i++)
-          array[startIndex + i] = random.Next(min, max);
+        int numbers = (int)Math.Floor((max - min) / (double)step);
+        for (int i = startIndex; i < startIndex + length; i++) {
+          array[i] = random.Next(numbers) * step + min;
+        }
         OnReset();
       }
     }
-    public void Randomize(IRandom random, int min, int max) {
-      Randomize(random, 0, Length, min, max);
+    public virtual void Randomize(IRandom random, int startIndex, int length, IntMatrix bounds) {
+      if (length > 0) {
+        for (int i = startIndex; i < startIndex + length; i++) {
+          int min = bounds[i % bounds.Rows, 0], max = bounds[i % bounds.Rows, 1], step = 1;
+          if (bounds.Columns > 2) step = bounds[i % bounds.Rows, 2];
+          int numbers = (int)Math.Floor((max - min) / (double)step);
+          array[i] = random.Next(numbers) * step + min;
+        }
+        OnReset();
+      }
+    }
+    public void Randomize(IRandom random, int min, int max, int step = 1) {
+      Randomize(random, 0, Length, min, max, step);
+    }
+    public void Randomize(IRandom random, IntMatrix bounds) {
+      Randomize(random, 0, Length, bounds);
     }
   }

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