Changeset 14515 for branches

Timestamp:

12/21/16 13:37:55 (7 years ago)

Author:

bburlacu

Message:

#2704: Fix infix formatting bug, refactored generation of polynomial to respect user choices (with or without exp/log).

Location:

branches/HeuristicLab.ExpressionGenerator/HeuristicLab.ExpressionGenerator/3.4

Files:

• Expression.cs (modified) (1 diff)
• ExpressionGenerator.cs (modified) (2 diffs)

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

@@ -121 +121 @@
           // the Label should be known to the infix parser
           if (Label == "+" || Label == "-" || Label == "*" || Label == "/") {
+            if (Label == "/")
+              sb.Append("1 / ");
             if (args.Count == 1) {
               sb.Append(string.Format("{0}", args[0].PrintInfix()));

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

@@ -33 +33 @@
 
     public static Expression Polynomial(IRandom uniformRandom, Expression[] variables, bool useLog, bool useExp) {
+      const int count = 10; // how many instances of each template should be produce?
+      int i = 1;
+      // the main template
+      var template = new RandomArityTemplate(Sum, new UniformDistributedRandom(uniformRandom, 2, count)) { Label = "+" };
+      template.AddArguments(variables);
+
       var sumTemplate = new RandomArityTemplate(Sum, new UniformDistributedRandom(uniformRandom, 1, variables.Length)) { Label = "+" };
       sumTemplate.AddArguments(variables);
@@ -39 +45 @@
       productTemplate.AddArguments(variables);
 
-      const int count = 10; // how many instances of each template should be produce?
-      int i = 1;
-
-      var logTemplate = new FixedArityTemplate(Log, 1) { Label = "log" };
-      logTemplate.AddArguments(variables);
-      logTemplate.AddArguments(Enumerable.Range(1, count).Select(x => sumTemplate.Instantiate(string.Format("sum{0}", i++), uniformRandom)));
-
-      var expTemplate = new FixedArityTemplate(Exp, 1) { Label = "exp" };
-      expTemplate.AddArguments(variables);
-      expTemplate.AddArguments(Enumerable.Range(1, count).Select(x => productTemplate.Instantiate(string.Format("prod{0}", i++), uniformRandom)));
-
       var inverseTemplate = new FixedArityTemplate(Division, 1) { Label = "/" };
       inverseTemplate.AddArguments(variables);
       inverseTemplate.AddArguments(Enumerable.Range(1, count).Select(x => sumTemplate.Instantiate(string.Format("sum{0}", i++), uniformRandom)));
       inverseTemplate.AddArguments(Enumerable.Range(1, count).Select(x => productTemplate.Instantiate(string.Format("prod{0}", i++), uniformRandom)));
-      inverseTemplate.AddArguments(Enumerable.Range(1, count).Select(x => logTemplate.Instantiate(string.Format("log{0}", i++), uniformRandom)));
-      inverseTemplate.AddArguments(Enumerable.Range(1, count).Select(x => expTemplate.Instantiate(string.Format("exp{0}", i++), uniformRandom)));
 
-      var template = new RandomArityTemplate(Sum, new UniformDistributedRandom(uniformRandom, 2, count)) { Label = "+" };
-      template.AddArguments(variables);
-      template.AddArguments(Enumerable.Range(1, count).Select(x => logTemplate.Instantiate(string.Format("log{0}", i++), uniformRandom)));
-      template.AddArguments(Enumerable.Range(1, count).Select(x => expTemplate.Instantiate(string.Format("exp{0}", i++), uniformRandom)));
+      if (useLog) {
+        var logTemplate = new FixedArityTemplate(Log, 1) { Label = "log" };
+        logTemplate.AddArguments(variables);
+        logTemplate.AddArguments(Enumerable.Range(1, count).Select(x => sumTemplate.Instantiate(string.Format("sum{0}", i++), uniformRandom)));
+        template.AddArguments(Enumerable.Range(1, count).Select(x => logTemplate.Instantiate(string.Format("log{0}", i++), uniformRandom)));
+        inverseTemplate.AddArguments(Enumerable.Range(1, count).Select(x => logTemplate.Instantiate(string.Format("log{0}", i++), uniformRandom)));
+      }
+
+      if (useExp) {
+        var expTemplate = new FixedArityTemplate(Exp, 1) { Label = "exp" };
+        expTemplate.AddArguments(variables);
+        expTemplate.AddArguments(Enumerable.Range(1, count).Select(x => productTemplate.Instantiate(string.Format("prod{0}", i++), uniformRandom)));
+        template.AddArguments(Enumerable.Range(1, count).Select(x => expTemplate.Instantiate(string.Format("exp{0}", i++), uniformRandom)));
+        inverseTemplate.AddArguments(Enumerable.Range(1, count).Select(x => expTemplate.Instantiate(string.Format("exp{0}", i++), uniformRandom)));
+      }
+
       template.AddArguments(Enumerable.Range(1, count).Select(x => inverseTemplate.Instantiate(string.Format("inv{0}", i++), uniformRandom)));
-
       return template.Instantiate("polynomial", uniformRandom);
     }