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

Timestamp:

01/04/11 02:18:27 (14 years ago)

Author:

cneumuel

Message:

#1215

• lots of memory-consumption improvements
• validValues -> validTypes (this saves memory!)
• changed manipulators; modifications are less significant, out-of-bound-values are resampled instead of set to lower or upper bound
• changed the way a base-level algorithm gets executed -> introduced AlgorithmExecutor

Location:

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

Files:

• NormalDoubleValueManipulator.cs (modified) (1 diff)
• UniformDoubleValueManipulator.cs (modified) (1 diff)
• UniformIntValueManipulator.cs (modified) (1 diff)

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

@@ -36 +36 @@
 
     public static void ApplyStatic(IRandom random, DoubleValue value, DoubleValueRange range) {
-      var vector = new RealVector(new double[] { value.Value });
-      var strategy = new RealVector(new double[] { (range.UpperBound.Value - range.LowerBound.Value) / 5});
-      NormalAllPositionsManipulator.Apply(random, vector, strategy);
-      value.Value = vector[0];
-      range.Fix(value);
+      bool ok = false;
+      RealVector strategy = new RealVector(new double[] { (range.UpperBound.Value - range.LowerBound.Value) / 15});
+      RealVector vector = new RealVector(1);
+      double val = value.Value;
+
+      while (!ok) { 
+        vector[0] = val;
+        NormalAllPositionsManipulator.Apply(random, vector, strategy);
+        value.Value = vector[0];
+        range.ApplyStepSize(value);
+        ok = range.IsInRange(value.Value);
+      }
     }
   }

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

@@ -36 +36 @@
 
     public static void ApplyStatic(IRandom random, DoubleValue value, DoubleValueRange range) {
-      var vector = new RealVector(new double[] { value.Value });
+      bool ok = false;
+      var vector = new RealVector(1);
       var bounds = new DoubleMatrix(1, 2);
       bounds[0, 0] = range.LowerBound.Value;
       bounds[0, 1] = range.UpperBound.Value;
-      UniformOnePositionManipulator.Apply(random, vector, bounds);
-      value.Value = vector[0];
-      range.Fix(value);
+      double val = value.Value;
+
+      while (!ok) {
+        vector[0] = val;
+        UniformOnePositionManipulator.Apply(random, vector, bounds);
+        value.Value = vector[0];
+        range.ApplyStepSize(value);
+        ok = range.IsInRange(value.Value);
+      }
     }
   }

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

@@ -37 +37 @@
 
     public static void ApplyStatic(IRandom random, IntValue value, IntValueRange range) {
+      bool ok = false;
       var vector = new IntegerVector(new int[] { value.Value });
-      UniformOnePositionManipulator.Apply(random, vector, range.LowerBound, new IntValue(range.UpperBound.Value + 1));
-      value.Value = vector[0];
-      range.Fix(value);
+      int val = value.Value;
+
+      while (!ok) {
+        vector[0] = val;
+        UniformOnePositionManipulator.Apply(random, vector, range.LowerBound, new IntValue(range.UpperBound.Value + 1));
+        value.Value = vector[0];
+        range.ApplyStepSize(value);
+        ok = range.IsInRange(value.Value);
+      }
     }
   }