Changeset 15421 for branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/SymbolicDataAnalysisVariableImpactsAnalyzer.cs

Timestamp:

10/17/17 13:13:04 (7 years ago)

Author:

bburlacu

Message:

#2288: Sync with trunk + Minor refactor.

File:

• branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/SymbolicDataAnalysisVariableImpactsAnalyzer.cs (modified) (5 diffs)

branches/HeuristicLab.VariableInteractionNetworks/HeuristicLab.VariableInteractionNetworks/3.3/SymbolicDataAnalysisVariableImpactsAnalyzer.cs

@@ -58 +58 @@
     #endregion
 
-    private SymbolicDataAnalysisExpressionTreeSimplifier simplifier;
     private SymbolicRegressionSolutionImpactValuesCalculator impactsCalculator;
 
@@ -136 +135 @@
 
       impactsCalculator = new SymbolicRegressionSolutionImpactValuesCalculator();
-      simplifier = new SymbolicDataAnalysisExpressionTreeSimplifier();
     }
 
@@ -145 +143 @@
     private void AfterDeserialization() {
       impactsCalculator = new SymbolicRegressionSolutionImpactValuesCalculator();
-      simplifier = new SymbolicDataAnalysisExpressionTreeSimplifier();
 
       if (!Parameters.ContainsKey(EvaluatorParameterName))
@@ -154 +151 @@
         : base(original, cloner) {
       impactsCalculator = new SymbolicRegressionSolutionImpactValuesCalculator();
-      simplifier = new SymbolicDataAnalysisExpressionTreeSimplifier();
     }
 
@@ -210 +206 @@
       var bestTrees = trees.Take(nTrees).Select(x => (ISymbolicExpressionTree)x.Clone()).ToList();
       // simplify trees before doing anything else
-      var simplifiedTrees = bestTrees.Select(x => simplifier.Simplify(x)).ToList();
+      var simplifiedTrees = bestTrees.Select(x => TreeSimplifier.Simplify(x)).ToList();
 
       if (optimizeConstants) {