Changeset 17860 for branches/3105_PythonFormatter

Timestamp:

03/08/21 16:20:24 (4 years ago)

Author:

dpiringe

Message:

#3105

• added usage checks for imports and helper functions (the formatter only includes necessary stuff)

File:

• branches/3105_PythonFormatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionPythonFormatter.cs (modified) (8 diffs)

branches/3105_PythonFormatter/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionPythonFormatter.cs

@@ -36 +36 @@
 
     private int VariableCounter { get; set; } = 0;
-    private IDictionary<string, string> VariableMap = new Dictionary<string, string>();
+    private IDictionary<string, string> VariableMap { get; } = new Dictionary<string, string>();
+    private int MathLibCounter { get; set; } = 0;
+    private int StatisticLibCounter { get; set; } = 0;
+    private int EvaluateIfCounter { get; set; } = 0;
 
     [StorableConstructor]
@@ -65 +68 @@
 
     private void GenerateImports(StringBuilder strBuilder) {
-      strBuilder.AppendLine("# imports");
-      strBuilder.AppendLine("import math");
-      strBuilder.AppendLine("import statistics");
+      if(MathLibCounter > 0 || StatisticLibCounter > 0)
+        strBuilder.AppendLine("# imports");
+      if(MathLibCounter > 0)
+        strBuilder.AppendLine("import math");
+      if(StatisticLibCounter > 0)
+        strBuilder.AppendLine("import statistics");
     }
 
     private void GenerateIfThenElseSource(StringBuilder strBuilder) {
-      strBuilder.AppendLine("# condition helper function");
-      strBuilder.AppendLine("def evaluate_if(condition, then_path, else_path): ");
-      strBuilder.AppendLine("\tif condition:");
-      strBuilder.AppendLine("\t\treturn then_path");
-      strBuilder.AppendLine("\telse:");
-      strBuilder.AppendLine("\t\treturn else_path");
+      if(EvaluateIfCounter > 0) {
+        strBuilder.AppendLine("# condition helper function");
+        strBuilder.AppendLine("def evaluate_if(condition, then_path, else_path): ");
+        strBuilder.AppendLine("\tif condition:");
+        strBuilder.AppendLine("\t\treturn then_path");
+        strBuilder.AppendLine("\telse:");
+        strBuilder.AppendLine("\t\treturn else_path");
+      }
     }
 
@@ -110 +118 @@
         FormatNode(node, strBuilder, infixSymbol: " and ");
       } else if (symbol is Average) {
+        StatisticLibCounter++;
         FormatNode(node, strBuilder, prefixSymbol: "statistics.mean", openingSymbol: "([", closingSymbol: "])");
       } else if (symbol is Cosine) {
+        MathLibCounter++;
         FormatNode(node, strBuilder, "math.cos");
       } else if (symbol is Division) {
         FormatDivision(node, strBuilder);
       } else if (symbol is Exponential) {
+        MathLibCounter++;
         FormatNode(node, strBuilder, "math.exp");
       } else if (symbol is GreaterThan) {
         FormatNode(node, strBuilder, infixSymbol: " > ");
       } else if (symbol is IfThenElse) {
+        EvaluateIfCounter++;
         FormatNode(node, strBuilder, "evaluate_if");
       } else if (symbol is LessThan) {
         FormatNode(node, strBuilder, infixSymbol: " < ");
       } else if (symbol is Logarithm) {
+        MathLibCounter++;
         FormatNode(node, strBuilder, "math.log");
       } else if (symbol is Multiplication) {
@@ -134 +147 @@
         FormatNode(node, strBuilder, infixSymbol: " ^ ");
       } else if (symbol is Sine) {
+        MathLibCounter++;
         FormatNode(node, strBuilder, "math.sin");
       } else if (symbol is Subtraction) {
         FormatSubtraction(node, strBuilder);
       } else if (symbol is Tangent) {
+        MathLibCounter++;
         FormatNode(node, strBuilder, "math.tan");
       } else if (symbol is HyperbolicTangent) {
+        MathLibCounter++;
         FormatNode(node, strBuilder, "math.tanh");
       } else if (symbol is Square) {
         FormatPower(node, strBuilder, "2");
       } else if (symbol is SquareRoot) {
+        MathLibCounter++;
         FormatNode(node, strBuilder, "math.sqrt");
       } else if (symbol is Cube) {
@@ -150 +167 @@
         FormatNode(node, strBuilder, closingSymbol: " ** (1. / 3))");
       } else if (symbol is Power) {
+        MathLibCounter++;
         FormatNode(node, strBuilder, "math.pow");
       } else if (symbol is Root) {
@@ -156 +174 @@
         FormatNode(node, strBuilder, "abs");
       } else if (symbol is AnalyticQuotient) {
+        MathLibCounter++;
         strBuilder.Append("(");
         FormatRecursively(node.GetSubtree(0), strBuilder);
@@ -188 +207 @@
 
     private void FormatPower(ISymbolicExpressionTreeNode node, StringBuilder strBuilder, string exponent) {
+      MathLibCounter++;
       strBuilder.Append("math.pow(");
       FormatRecursively(node.GetSubtree(0), strBuilder);
@@ -194 +214 @@
 
     private void FormatRoot(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
+      MathLibCounter++;
       strBuilder.Append("math.pow(");
       FormatRecursively(node.GetSubtree(0), strBuilder);