Changeset 14873 for branches/HeuristicLab.ExpressionGenerator/HeuristicLab.ExpressionGenerator/3.4/Expression.cs

Timestamp:

04/15/17 08:44:15 (7 years ago)

Author:

gkronber

Message:

#2704: added possibility to automatically adjust constants based on the distributions of evaluated expressions to allow limiting distributions for arguments of functions (e.g. log should have positive args only, exp should have rather small args only)

File:

• branches/HeuristicLab.ExpressionGenerator/HeuristicLab.ExpressionGenerator/3.4/Expression.cs (modified) (3 diffs)

branches/HeuristicLab.ExpressionGenerator/HeuristicLab.ExpressionGenerator/3.4/Expression.cs

@@ -42 +42 @@
     }
 
-    public IRandom Distribution { get; private set; }
-
-    public Func<IEnumerable<double>, double> Transform { get; private set; }
-
-    public double Value { get; private set; }
+    public IRandom Distribution { get; private set; }  // only for random variables
+
+    public Func<IEnumerable<double>, double> Transform { get; private set; } // only for functions
+
+    public double Value { get; private set; } // only for constants
 
     public Expression(string name, double value) {
@@ -85 +85 @@
       switch (Type) {
         case ExpressionType.Constant:
-          sb.Append(Value.ToString("0.000", CultureInfo.CurrentCulture));
+          sb.Append(Value.ToString("0.000", CultureInfo.InvariantCulture));
           break;
         case ExpressionType.RandomVariable:
@@ -108 +108 @@
         case ExpressionType.Constant:
           sb.Append(Value < 0
-              ? string.Format("(- {0})", Math.Abs(Value).ToString("0.000", CultureInfo.CurrentCulture))
-              : Value.ToString("0.000", CultureInfo.CurrentCulture));
+              ? string.Format("(- {0})", Math.Abs(Value).ToString("0.000", CultureInfo.InvariantCulture))
+              : Value.ToString("0.000", CultureInfo.InvariantCulture));
           break;
         case ExpressionType.RandomVariable: