Changeset 18016 for stable

Timestamp:

07/17/21 18:16:11 (3 years ago)

Author:

gkronber

Message:

#3105: merged r17922, r17929 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionPythonFormatter.cs (copied) (copied from trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionPythonFormatter.cs) (12 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4 (modified) (1 prop)
• HeuristicLab.Tests (modified) (1 prop)

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Formatters/SymbolicDataAnalysisExpressionPythonFormatter.cs

@@ -58 +58 @@
     }
 
-    private string GenerateHeader(ISymbolicExpressionTree symbolicExpressionTree) {
+    private static string GenerateHeader(ISymbolicExpressionTree symbolicExpressionTree) {
       StringBuilder strBuilder = new StringBuilder();
 
@@ -102 +102 @@
     }
 
-    private string GenerateNecessaryImports(int mathLibCounter, int statisticLibCounter) {
+    private static string GenerateNecessaryImports(int mathLibCounter, int statisticLibCounter) {
       StringBuilder strBuilder = new StringBuilder();
       if (mathLibCounter > 0 || statisticLibCounter > 0) {
@@ -115 +115 @@
     }
 
-    private string GenerateIfThenElseSource(int evaluateIfCounter) {
+    private static string GenerateIfThenElseSource(int evaluateIfCounter) {
       StringBuilder strBuilder = new StringBuilder();
       if (evaluateIfCounter > 0) {
@@ -128 +128 @@
     }
 
-    private string GenerateModelEvaluationFunction(ISet<string> variables) {
+    private static string GenerateModelEvaluationFunction(ISet<string> variables) {
       StringBuilder strBuilder = new StringBuilder();
       strBuilder.Append("def evaluate(");
@@ -142 +142 @@
     }
 
-    private void FormatRecursively(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
+    private static void FormatRecursively(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
       ISymbol symbol = node.Symbol;
       if (symbol is ProgramRootSymbol)
@@ -208 +208 @@
     }
 
-    private string VariableName2Identifier(string variableName) => variableName.Replace(" ", "_");
-
-    private void FormatNode(ISymbolicExpressionTreeNode node, StringBuilder strBuilder, string prefixSymbol = "", string openingSymbol = "(", string closingSymbol = ")", string infixSymbol = ",") {
+    private static string VariableName2Identifier(string variableName) => variableName.Replace(" ", "_");
+
+    private static void FormatNode(ISymbolicExpressionTreeNode node, StringBuilder strBuilder, string prefixSymbol = "", string openingSymbol = "(", string closingSymbol = ")", string infixSymbol = ",") {
       strBuilder.Append($"{prefixSymbol}{openingSymbol}");
       foreach (var child in node.Subtrees) {
@@ -220 +220 @@
     }
 
-    private void FormatVariableTreeNode(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
+    private static void FormatVariableTreeNode(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
       var varNode = node as VariableTreeNode;
       var formattedVariable = VariableName2Identifier(varNode.VariableName);
@@ -227 +227 @@
     }
 
-    private void FormatConstantTreeNode(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
+    private static void FormatConstantTreeNode(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
       var constNode = node as ConstantTreeNode;
       strBuilder.Append(constNode.Value.ToString("g17", CultureInfo.InvariantCulture));
     }
 
-    private void FormatPower(ISymbolicExpressionTreeNode node, StringBuilder strBuilder, string exponent) {
+    private static void FormatPower(ISymbolicExpressionTreeNode node, StringBuilder strBuilder, string exponent) {
       strBuilder.Append("math.pow(");
       FormatRecursively(node.GetSubtree(0), strBuilder);
@@ -238 +238 @@
     }
 
-    private void FormatRoot(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
+    private static void FormatRoot(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
       strBuilder.Append("math.pow(");
       FormatRecursively(node.GetSubtree(0), strBuilder);
@@ -246 +246 @@
     }
 
-    private void FormatSubtraction(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
+    private static void FormatSubtraction(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
       if (node.SubtreeCount == 1) {
         strBuilder.Append("-");
@@ -256 +256 @@
     }
 
-    private void FormatDivision(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
+    private static void FormatDivision(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
       strBuilder.Append("(");
       if (node.SubtreeCount == 1) {
@@ -273 +273 @@
     }
 
-    private void FormatAnalyticQuotient(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
+    private static void FormatAnalyticQuotient(ISymbolicExpressionTreeNode node, StringBuilder strBuilder) {
       strBuilder.Append("(");
       FormatRecursively(node.GetSubtree(0), strBuilder);

stable/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj

@@ -152 +152 @@
     <Compile Include="Crossovers\SymbolicDataAnalysisExpressionDiversityPreservingCrossover.cs" />
     <Compile Include="Formatters\InfixExpressionFormatter.cs" />
+    <Compile Include="Formatters\SymbolicDataAnalysisExpressionPythonFormatter.cs" />
     <Compile Include="Formatters\TSQLExpressionFormatter.cs" />
     <Compile Include="Formatters\SymbolicDataAnalysisExpressionMathematicaFormatter.cs" />