Changeset 14879 for branches

Timestamp:

04/19/17 18:49:00 (7 years ago)

Author:

gkronber

Message:

#2704 added min value parameter for exp

File:

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

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Random;
@@ -48 +46 @@
 
       var expTemplate = ExpOfScaledExpression(uniformRandom, Instantiate(prodTemplate, uniformRandom, 100, "prodOfVars"),
-        valueRange: new UniformDistributedRandom(uniformRandom, 1, 4)); // TODO should also specify an offset
+        minValue: new PointDistribution(-3),
+        valueRange: new UniformDistributedRandom(uniformRandom, 4, 6)); 
 
       var scaledExprTemplate = new ScalingTemplate(new UniformDistributedRandom(uniformRandom, 1, 10)) { Label = "*" };
@@ -123 +122 @@
     /// template scales the argument expression first to guarantee reasonable values
     private static ExpressionTemplate ExpOfScaledExpression(IRandom uniformRandom, IEnumerable<Expression> arguments,
+      IRandom minValue = null,
       IRandom valueRange = null) {
-      var limitToRangeTemplate = new RangeTemplate(null, valueRange);
+      var limitToRangeTemplate = new RangeTemplate(minValue, valueRange);
       limitToRangeTemplate.AddArguments(arguments);