Changeset 7412 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveSingleMoveGenerator.cs

Timestamp:

01/25/12 18:32:44 (12 years ago)

Author:

abeham

Message:

#1614: worked on GQAP and GRASP+PR

Location:

branches/GeneralizedQAP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveSingleMoveGenerator.cs (modified) (2 diffs)

branches/GeneralizedQAP

@@ -1 +1 @@
 *.suo
+TestResults

@@ -1 +1 @@
 *.suo
+TestResults

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveSingleMoveGenerator.cs

@@ -54 +54 @@
     }
 
-    public static NMove Generate(IRandom random, IntegerVector assignment, int n, DoubleArray capacities) {
-      int moving = random.Next(n) + 1;
-      int[] equipments = new int[moving], locations = new int[moving];
+    public static NMove GenerateUpToN(IRandom random, IntegerVector assignment, int n, DoubleArray capacities) {
+      return GenerateExactlyN(random, assignment, random.Next(n) + 1, capacities);
+    }
+
+    public static NMove GenerateExactlyN(IRandom random, IntegerVector assignment, int n, DoubleArray capacities) {
+      int[] equipments = new int[n], locations = new int[n];
       HashSet<int> chosenEquipments = new HashSet<int>();
-      for (int i = 0; i < moving; i++) {
+      for (int i = 0; i < n; i++) {
         do {
           equipments[i] = random.Next(assignment.Length);
@@ -71 +74 @@
 
     public override IEnumerable<NMove> GenerateMoves(IntegerVector assignment, int n) {
-      yield return Generate(RandomParameter.ActualValue, assignment, n, CapacitiesParameter.ActualValue);
+      yield return GenerateUpToN(RandomParameter.ActualValue, assignment, n, CapacitiesParameter.ActualValue);
     }
   }

@@ -1 +1 @@
 *.suo
+TestResults