Changeset 14410 for branches/HeuristicLab.ExpressionGenerator/HeuristicLab.ExpressionGenerator/3.4/ExpressionTemplate.cs

Timestamp:

11/24/16 16:38:20 (7 years ago)

Author:

bburlacu

Message:

#2704: Added the possibility to sample possible arguments without repetition when instantiating expression templates.

File:

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

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

@@ -32 +32 @@
     protected readonly string label;
 
-    public abstract Expression Instantiate(IRandom random);
+    public abstract Expression Instantiate(IRandom random, bool sampleWithRepetition = false);
 
     protected ExpressionTemplate(string label, Func<IEnumerable<double>, double> transform) {
@@ -62 +62 @@
     }
 
-    public override Expression Instantiate(IRandom random) {
+    public override Expression Instantiate(IRandom random, bool sampleWithRepetition = false) {
       var arity = (int)Math.Round(arityDistribution.NextDouble());
-      var args = arguments.SampleProportional(random, arity, arguments.Select(x => x.Item2)).Select(x => x.Item1);
+      var weights = arguments.Select(x => x.Item2);
+      var args = sampleWithRepetition
+        ? arguments.SampleProportional(random, arity, weights).Select(x => x.Item1)
+        : arguments.SampleProportionalWithoutRepetition(random, arity, weights).Select(x => x.Item1);
       return Expression.Function(label, transform, args);
     }
@@ -75 +78 @@
     }
 
-    public override Expression Instantiate(IRandom random) {
+    public override Expression Instantiate(IRandom random, bool sampleWithRepetition = false) {
       var args = arguments.SampleProportional(random, arity, arguments.Select(x => x.Item2)).Select(x => x.Item1);
       return Expression.Function(label, transform, args);