Changeset 14411

Timestamp:

11/24/16 16:58:48 (8 years ago)

Author:

bburlacu

Message:

#2704: Slightly improve usage of ExpressionTemplate class.

File:

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

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

@@ -28 +28 @@
 namespace HeuristicLab.ExpressionGenerator {
   public abstract class ExpressionTemplate {
-    protected List<Tuple<Expression, double>> arguments;
-    protected readonly Func<IEnumerable<double>, double> transform;
-    protected readonly string label;
+    private List<Tuple<Expression, double>> arguments;
+    private readonly Func<IEnumerable<double>, double> transform;
+    private readonly string label;
+
+    protected Expression Instantiate(IRandom random, int n, bool sampleWithRepetition = false) {
+      var weights = arguments.Select(x => x.Item2);
+      var args = sampleWithRepetition
+       ? arguments.SampleProportional(random, n, weights).Select(x => x.Item1)
+       : arguments.SampleProportionalWithoutRepetition(random, n, weights).Select(x => x.Item1);
+      return Expression.Function(label, transform, args);
+    }
 
     public abstract Expression Instantiate(IRandom random, bool sampleWithRepetition = false);
@@ -64 +72 @@
     public override Expression Instantiate(IRandom random, bool sampleWithRepetition = false) {
       var arity = (int)Math.Round(arityDistribution.NextDouble());
-      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);
+      return Instantiate(random, arity, sampleWithRepetition);
     }
   }
@@ -79 +83 @@
 
     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);
+      return Instantiate(random, arity, sampleWithRepetition);
     }
   }