Changeset 14448

Timestamp:

12/02/16 16:38:11 (8 years ago)

Author:

bburlacu

Message:

#2704: Rename expression label to name, and remove label from expression template as it should be specified for each individual instance.

Location:

branches/HeuristicLab.ExpressionGenerator

Files:

• .vs/HeuristicLab.ExpressionGenerator/v14/.suo (modified) (previous)
• HeuristicLab.ExpressionGenerator/3.4/Expression.cs (modified) (4 diffs)
• HeuristicLab.ExpressionGenerator/3.4/ExpressionTemplate.cs (modified) (4 diffs)

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

@@ -30 +30 @@
 namespace HeuristicLab.ExpressionGenerator {
   public class Expression : IExpression {
-    public string Label { get; set; }
+    public string Name { get; set; }
 
     public ExpressionType Type { get; }
@@ -45 +45 @@
     public double Value { get; }
 
-    public Expression(string label, double value) {
+    public Expression(string name, double value) {
       Type = ExpressionType.Constant;
       Value = value;
-      Label = label;
+      Name = name;
     }
 
-    public Expression(string label, IRandom distribution) {
+    public Expression(string name, IRandom distribution) {
       Type = ExpressionType.RandomVariable;
       Distribution = distribution;
-      Label = label;
+      Name = name;
     }
 
-    public Expression(string label, Func<IEnumerable<double>, double> transform, IEnumerable<Expression> arguments) {
+    public Expression(string name, Func<IEnumerable<double>, double> transform, IEnumerable<Expression> arguments) {
       Type = ExpressionType.Function;
       Transform = transform;
       this.arguments = this.arguments ?? new List<Expression>();
       this.arguments.AddRange(arguments);
-      Label = label;
+      Name = name;
     }
 
@@ -85 +85 @@
           break;
         case ExpressionType.RandomVariable:
-          sb.Append(string.Format("{0} ~ {1}", Label, GetStringDescription(Distribution)));
+          sb.Append(string.Format("{0} ~ {1}", Name, GetStringDescription(Distribution)));
           break;
         case ExpressionType.Function:
-          sb.Append(string.Format("{0} (", Label));
+          sb.Append(string.Format("{0} = f(", Name));
           if (Arguments.Any()) {
             for (int i = 0; i < arguments.Count - 1; ++i)
-              sb.Append(string.Format("{0}, ", arguments[i]));
-            sb.Append(string.Format("{0})", arguments.Last()));
+              sb.Append(string.Format("{0}, ", arguments[i].Name));
+            sb.Append(string.Format("{0})", arguments.Last().Name));
           }
           break;
       }
+
+      return sb.ToString();
+    }
+
+    public string PrintInfix() {
+      var sb = new StringBuilder();
 
       return sb.ToString();
@@ -114 +120 @@
 
         foreach (var arg in top.Arguments) {
-          var from = top.Arguments.Any() ? top.Label : top.ToString();
-          var to = arg.Arguments.Any() ? arg.Label : arg.ToString();
+          var from = top.Arguments.Any() ? top.Name : top.ToString();
+          var to = arg.Arguments.Any() ? arg.Name : arg.ToString();
           sb.AppendLine(string.Format("\"{0}\" -> \"{1}\";", from, to));
           stack.Push(arg);

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

@@ -30 +30 @@
     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) {
+    protected Expression Instantiate(string label, IRandom random, int n, bool sampleWithRepetition = false) {
       var weights = arguments.Select(x => x.Item2);
       var args = sampleWithRepetition
@@ -40 +39 @@
     }
 
-    public abstract Expression Instantiate(IRandom random, bool sampleWithRepetition = false);
+    public abstract Expression Instantiate(string name, IRandom random, bool sampleWithRepetition = false);
 
-    protected ExpressionTemplate(string label, Func<IEnumerable<double>, double> transform) {
+    protected ExpressionTemplate(Func<IEnumerable<double>, double> transform) {
       this.transform = transform;
-      this.label = label;
     }
 
@@ -66 +64 @@
     private readonly IRandom arityDistribution;
 
-    public RandomArityTemplate(string label, Func<IEnumerable<double>, double> transform, IRandom arityDistribution) : base(label, transform) {
+    public RandomArityTemplate(Func<IEnumerable<double>, double> transform, IRandom arityDistribution) : base(transform) {
       this.arityDistribution = arityDistribution;
     }
 
-    public override Expression Instantiate(IRandom random, bool sampleWithRepetition = false) {
+    public override Expression Instantiate(string name, IRandom random, bool sampleWithRepetition = false) {
       var arity = (int)Math.Round(arityDistribution.NextDouble());
-      return Instantiate(random, arity, sampleWithRepetition);
+      return Instantiate(name, random, arity, sampleWithRepetition);
     }
   }
@@ -78 +76 @@
   public class FixedArityTemplate : ExpressionTemplate {
     private readonly int arity;
-    public FixedArityTemplate(string label, Func<IEnumerable<double>, double> transform, int arity) : base(label, transform) {
+    public FixedArityTemplate(Func<IEnumerable<double>, double> transform, int arity) : base(transform) {
       this.arity = arity;
     }
 
-    public override Expression Instantiate(IRandom random, bool sampleWithRepetition = false) {
-      return Instantiate(random, arity, sampleWithRepetition);
+    public override Expression Instantiate(string name, IRandom random, bool sampleWithRepetition = false) {
+      return Instantiate(name, random, arity, sampleWithRepetition);
     }
   }