Changeset 9265

Timestamp:

03/01/13 13:55:09 (12 years ago)

Author:

abeham

Message:

#2020: review comments

Location:

trunk/sources

Files:

• HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs (modified) (1 diff)
• HeuristicLab.Encodings.RealVectorEncoding/3.3/Creators/NormalDistributedRealVectorCreator.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Analysis/3.3/DataVisualization/DataTableVisualProperties.cs

@@ -480 +480 @@
       get { return secondYAxisMaximumFixedValue; }
       set { secondYAxisMaximumFixedValue = value; }
+    }
+    [Storable(Name = "XAxisLogScale")]
+    private bool StorableXAxisLogScale {
+      get { return xAxisLogScale; }
+      set { xAxisLogScale = value; }
+    }
+    [Storable(Name = "SecondXAxisLogScale")]
+    private bool StorableSecondXAxisLogScale {
+      get { return secondXAxisLogScale; }
+      set { secondXAxisLogScale = value; }
+    }
+    [Storable(Name = "YAxisLogScale")]
+    private bool StorableYAxisLogScale {
+      get { return yAxisLogScale; }
+      set { yAxisLogScale = value; }
+    }
+    [Storable(Name = "SecondYAxisLogScale")]
+    private bool StorableSecondYAxisLogScale {
+      get { return secondYAxisLogScale; }
+      set { secondYAxisLogScale = value; }
     }
     #endregion

trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/Creators/NormalDistributedRealVectorCreator.cs

@@ -45 +45 @@
     }
 
+    public IValueParameter<IntValue> MaximumTriesParameter {
+      get { return (IValueParameter<IntValue>)Parameters["MaximumTries"]; }
+    }
+
     [StorableConstructor]
     protected NormalDistributedRealVectorCreator(bool deserializing) : base(deserializing) { }
@@ -52 +56 @@
       Parameters.Add(new ValueLookupParameter<RealVector>("Mean", "The mean vector around which the points will be sampled."));
       Parameters.Add(new ValueLookupParameter<DoubleArray>("Sigma", "The standard deviations for all or for each dimension."));
+      Parameters.Add(new ValueParameter<IntValue>("MaximumTries", "The maximum number of tries to sample within the specified bounds.", new IntValue(1000)));
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new NormalDistributedRealVectorCreator(this, cloner);
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      if (!Parameters.ContainsKey("MaximumTries"))
+        Parameters.Add(new ValueParameter<IntValue>("MaximumTries", "The maximum number of tries to sample within the specified bounds.", new IntValue(1000)));
     }
 
@@ -80 +91 @@
     /// <param name="sigma">The vector of standard deviations, must have at least one row.</param>
     /// <param name="bounds">The lower and upper bound (1st and 2nd column) of the positions in the vector. If there are less rows than dimensions, the rows are cycled.</param>
+    /// <param name="maximumTries">The maximum number of tries to sample a value inside the bounds for each dimension. If a valid value cannot be obtained, the mean will be used.</param>
     /// <returns>The newly created real vector.</returns>
-    public static RealVector Apply(IRandom random, RealVector mean, DoubleArray sigma, DoubleMatrix bounds) {
-      if (random == null) throw new ArgumentException("Random is not defined", "random");
-      if (mean == null || mean.Length == 0) throw new ArgumentException("Mean is not defined", "mean");
-      if (sigma == null || sigma.Length == 0) throw new ArgumentException("Sigma is not defined.", "sigma");
+    public static RealVector Apply(IRandom random, RealVector mean, DoubleArray sigma, DoubleMatrix bounds, int maximumTries = 1000) {
+      if (random == null) throw new ArgumentNullException("Random is not defined", "random");
+      if (mean == null || mean.Length == 0) throw new ArgumentNullException("Mean is not defined", "mean");
+      if (sigma == null || sigma.Length == 0) throw new ArgumentNullException("Sigma is not defined.", "sigma");
       if (bounds == null || bounds.Rows == 0) bounds = new DoubleMatrix(new[,] { { double.MinValue, double.MaxValue } });
       var nd = new NormalDistributedRandom(random, 0, 1);
@@ -94 +106 @@
         else if (mean[i] > max) result[i] = max;
         else {
+          int count = 0;
+          bool inRange;
           do {
             result[i] = mean[i] + sigma[i % sigma.Length] * nd.NextDouble();
-          } while (result[i] < bounds[i % sigma.Length, 0] || result[i] > bounds[i % sigma.Length, 1]);
+            inRange = result[i] >= bounds[i % sigma.Length, 0] && result[i] < bounds[i % sigma.Length, 1];
+            count++;
+          } while (count < maximumTries && !inRange);
+          if (count == maximumTries && !inRange)
+            result[i] = mean[i];
         }
       }
@@ -110 +128 @@
     /// <returns>The newly created real vector.</returns>
     protected override RealVector Create(IRandom random, IntValue length, DoubleMatrix bounds) {
-      return Apply(random, MeanParameter.ActualValue, SigmaParameter.ActualValue, bounds);
+      return Apply(random, MeanParameter.ActualValue, SigmaParameter.ActualValue, bounds, MaximumTriesParameter.Value.Value);
     }
   }