Changeset 14873 for branches/HeuristicLab.ExpressionGenerator/HeuristicLab.ExpressionGenerator/3.4/ExpressionEvaluator.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/ExpressionEvaluator.cs (modified) (1 diff)

branches/HeuristicLab.ExpressionGenerator/HeuristicLab.ExpressionGenerator/3.4/ExpressionEvaluator.cs

@@ -57 +57 @@
 
     public Dictionary<Expression, List<double>> GenerateData(Expression expression, int rows) {
+      return GenerateData(new [] {expression}, rows);
+    }
+    public Dictionary<Expression, List<double>> GenerateData(IEnumerable<Expression> expressions, int rows) {
       var data = new Dictionary<Expression, List<double>>();
       for (int i = 0; i < rows; ++i) {
         evaluationCache.Clear();
-        Evaluate(expression);
+        foreach(var expr in expressions) Evaluate(expr);
         foreach (var pair in evaluationCache) {
           if (!data.ContainsKey(pair.Key))