Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/23/10 17:12:30 (14 years ago)
Author:
gkronber
Message:

Merged r4458, r4459,r4462,r4464 from data analysis exploration branch into trunk. #1142

Location:
trunk/sources
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources

  • trunk/sources/HeuristicLab.Problems.DataAnalysis

  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Tests/SymbolicSimplifierTest.cs

    r4239 r4477  
    4040  [TestClass()]
    4141  public class SymbolicSimplifierTest {
    42     [TestMethod()]
    4342    [DeploymentItem(@"RegressionSolution01.hl")]
    4443    [DeploymentItem(@"RegressionSolution02.hl")]
     
    4746    [DeploymentItem(@"RegressionSolution05.hl")]
    4847    [DeploymentItem(@"RegressionSolution06.hl")]
     48    [TestMethod]
    4949    public void SimplifyRegressionSolutionsTest() {
    5050      ContentManager.Initialize(new PersistenceContentManager());
     
    9898    private SymbolicRegressionSolution SimplifySolution(SymbolicRegressionSolution original) {
    9999      SymbolicSimplifier simplifier = new SymbolicSimplifier();
    100       SymbolicExpressionTree simplifiedExpression = simplifier.Simplify(original.Model.SymbolicExpressionTree);
    101       SymbolicExpressionTreeNode root = new ProgramRootSymbol().CreateTreeNode();
    102       SymbolicExpressionTreeNode start = new StartSymbol().CreateTreeNode();
    103       root.AddSubTree(start);
    104       start.AddSubTree(simplifiedExpression.Root);
    105       SymbolicExpressionTree simplifiedTree = new SymbolicExpressionTree(root);
     100      SymbolicExpressionTree simplifiedTree = simplifier.Simplify(original.Model.SymbolicExpressionTree);
    106101      SymbolicRegressionModel simplifiedModel = new SymbolicRegressionModel(original.Model.Interpreter, simplifiedTree);
    107102      return new SymbolicRegressionSolution(original.ProblemData, simplifiedModel, original.LowerEstimationLimit, original.UpperEstimationLimit);
Note: See TracChangeset for help on using the changeset viewer.