Changeset 11668

Timestamp:

12/07/14 10:25:46 (10 years ago)

Author:

bgoldman

Message:

#2282 Fixed mistake in HillClimber which was causing P3 to give slightly incorrect results on HIFF

Location:

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3

Files:

• HillClimber.cs (modified) (1 diff)
• ParameterlessPopulationPyramid.cs (modified) (1 diff)

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HillClimber.cs

@@ -87 +87 @@
         var options = Enumerable.Range(0, solution.Length).Shuffle(rand);
         foreach (var option in options) {
+          if (tried.Contains(option)) continue;
           solution[option] = !solution[option];
           double newFitness = problem.Evaluate(solution);

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

@@ -143 +143 @@
 
     public ParameterlessPopulationPyramid() {
-      Parameters.Add(new FixedValueParameter<IntValue>(MaximumIterationsParameterName, "", new IntValue(100)));
-      Parameters.Add(new FixedValueParameter<IntValue>(MaximumEvaluationsParameterName, "", new IntValue(1000)));
+      Parameters.Add(new FixedValueParameter<IntValue>(MaximumIterationsParameterName, "", new IntValue(Int32.MaxValue)));
+      Parameters.Add(new FixedValueParameter<IntValue>(MaximumEvaluationsParameterName, "", new IntValue(10000)));
       Parameters.Add(new FixedValueParameter<IntValue>(SeedParameterName, "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
       Parameters.Add(new FixedValueParameter<BoolValue>(SetSeedRandomlyParameterName, "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));