Changeset 4226 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs

Timestamp:

08/16/10 10:08:29 (14 years ago)

Author:

gkronber

Message:

added comments to simplifier. #1026

File:

• branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs (modified) (5 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs

@@ -114 +114 @@
       return original.Symbol is Logarithm;
     }
+    private bool IsIfThenElse(SymbolicExpressionTreeNode original) {
+      return original.Symbol is IfThenElse;
+    }
     #endregion
 
@@ -135 +138 @@
         return SimplifyAverage(original);
       } else if (IsLog(original)) {
-        // TODO simplify logarditm
+        // TODO simplify logarithm
+        return SimplifyAny(original);
+      } else if (IsIfThenElse(original)) {
+        // TODO simplify conditionals
         return SimplifyAny(original);
       } else if (IsAverage(original)) {
@@ -238 +244 @@
 
     #region low level tree restructuring
-    // each make* method must return a simplified tree
+    // MakeFraction, MakeProduct and MakeSum take two already simplified trees and create a new simplified tree
 
     private SymbolicExpressionTreeNode MakeFraction(SymbolicExpressionTreeNode a, SymbolicExpressionTreeNode b) {
@@ -341 +347 @@
     }
 
+    // makes sure variable symbols in sums are combined
+    // possible improvment: combine sums of products where the products only reference the same variable
     private void MergeVariablesInSum(SymbolicExpressionTreeNode sum) {
       var subtrees = new List<SymbolicExpressionTreeNode>(sum.SubTrees);
@@ -415 +423 @@
     #endregion
 
+    // helper to combine the constant factors in products and to combine variables (powers of 2, 3...)
     private void MergeVariablesAndConstantsInProduct(SymbolicExpressionTreeNode prod) {
       var subtrees = new List<SymbolicExpressionTreeNode>(prod.SubTrees);