Changeset 5337 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators

Timestamp:

01/20/11 01:30:44 (14 years ago)

Author:

cneumuel

Message:

#1215

• made all IAlgorithm types compatible to be loaded into MetaOptimization.
• valid problem types are now automatically set

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators

Files:

• Crossovers/AverageDoubleValueCrossover.cs (modified) (1 diff)
• Crossovers/NormalDoubleValueCrossover.cs (modified) (1 diff)
• Crossovers/NormalIntValueCrossover.cs (modified) (1 diff)
• Manipulators/NormalDoubleValueManipulator.cs (modified) (1 diff)
• Manipulators/NormalIntValueManipulator.cs (modified) (1 diff)
• Manipulators/UniformDoubleValueManipulator.cs (modified) (1 diff)
• Manipulators/UniformIntValueManipulator.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Crossovers/AverageDoubleValueCrossover.cs

@@ -34 +34 @@
     public static void ApplyStatic(IRandom random, DoubleValue value, DoubleValue other, DoubleValueRange range) {
       value.Value = (value.Value + other.Value) / 2;
-      range.ApplyStepSize(value);
+      value.Value = range.ApplyStepSize(value.Value);
     }
   }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Crossovers/NormalDoubleValueCrossover.cs

@@ -39 +39 @@
       do {
         offspring.Value = N.NextDouble();
-        range.ApplyStepSize(offspring);
+        offspring.Value = range.ApplyStepSize(offspring.Value);
       } while (!range.IsInRange(offspring.Value));
       return offspring;

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Crossovers/NormalIntValueCrossover.cs

@@ -38 +38 @@
       do {
         offspring.Value = (int)N.NextDouble();
-        range.ApplyStepSize(offspring);
+        offspring.Value = range.ApplyStepSize(offspring.Value);
       } while (!range.IsInRange(offspring.Value));
       return offspring;

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Manipulators/NormalDoubleValueManipulator.cs

@@ -45 +45 @@
         NormalAllPositionsManipulator.Apply(random, vector, strategy);
         value.Value = vector[0];
-        range.ApplyStepSize(value);
+        value.Value = range.ApplyStepSize(value.Value);
         ok = range.IsInRange(value.Value);
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Manipulators/NormalIntValueManipulator.cs

@@ -47 +47 @@
         NormalAllPositionsManipulator.Apply(random, vector, strategy);
         value.Value = (int)vector[0];
-        range.ApplyStepSize(value);
+        value.Value = range.ApplyStepSize(value.Value);
         ok = range.IsInRange(value.Value);
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Manipulators/UniformDoubleValueManipulator.cs

@@ -47 +47 @@
         UniformOnePositionManipulator.Apply(random, vector, bounds);
         value.Value = vector[0];
-        range.ApplyStepSize(value);
+        value.Value = range.ApplyStepSize(value.Value);
         ok = range.IsInRange(value.Value);
       }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Operators/Manipulators/UniformIntValueManipulator.cs

@@ -45 +45 @@
         UniformOnePositionManipulator.Apply(random, vector, range.LowerBound, new IntValue(range.UpperBound.Value + 1));
         value.Value = vector[0];
-        range.ApplyStepSize(value);
+        value.Value = range.ApplyStepSize(value.Value);
         ok = range.IsInRange(value.Value);
       }