Changeset 7715

Timestamp:

04/06/12 23:54:30 (13 years ago)

Author:

abeham

Message:

#1775: fixed operator to respect bounds

Location:

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators

Files:

• RoundedNormalAllPositionsManipulator.cs (modified) (1 diff)
• SelfAdaptiveRoundedNormalAllPositionsManipulator.cs (modified) (1 diff)

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/RoundedNormalAllPositionsManipulator.cs

@@ -80 +80 @@
 
         int value = (vector[i] + (int)Math.Round((N.NextDouble() * sigma[i % sigma.Length])) - min) / step;
-        vector[i] = value * step + min;
+        vector[i] = Math.Max(min, Math.Min(max, value * step + min));
       }
     }

branches/IntegerVectorEncoding/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/SelfAdaptiveRoundedNormalAllPositionsManipulator.cs

@@ -90 +90 @@
 
           int value = (vector[i] + (int)Math.Round((N.NextDouble() * strategyParameters[i % strategyParameters.Length])) - min) / step;
-          vector[i] = value * step + min;
+          vector[i] = Math.Max(min, Math.Min(max, value * step + min));
         }
       }