Changeset 1791

Timestamp:

05/13/09 20:55:58 (16 years ago)

Author:

abeham

Message:

removed annoying quit after x tries

File:

• trunk/sources/HeuristicLab.SimOpt/3.2/SimOptSelfAdaptiveNumericVectorNormalMutation.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.SimOpt/3.2/SimOptSelfAdaptiveNumericVectorNormalMutation.cs

@@ -48 +48 @@
 
       ConstrainedItemList parameters = GetVariableValue<ConstrainedItemList>("Items", scope, false);
-      int tries;
       ConstrainedItemList temp = null;
       ICollection<IConstraint> tmp;
@@ -54 +53 @@
       NormalDistributedRandom nd = new NormalDistributedRandom(random, 0.0, 1.0);
 
-      for (tries = 0; tries < 10000; tries++) {
+      do {
         temp = (ConstrainedItemList)parameters.Clone();
 
@@ -73 +72 @@
           }
         }
-        if (temp.EndCombinedOperation(out tmp)) break;
-      }
+      } while (!temp.EndCombinedOperation(out tmp));
 
-      if (tries < 10000) {
-        parameters.BeginCombinedOperation();
-        for (int i = 0; i < temp.Count; i++)
-          parameters.TrySetAt(i, temp[i], out tmp);
-        parameters.EndCombinedOperation(out tmp);
-      } else throw new InvalidOperationException("ERROR in SimOptSelfAdaptiveNumericVectorProbabilityMutation: no feasible result in 10000 tries");
+      parameters.BeginCombinedOperation();
+      for (int i = 0; i < temp.Count; i++)
+        parameters.TrySetAt(i, temp[i], out tmp);
+      parameters.EndCombinedOperation(out tmp);
 
       return null;