Changeset 16057 for branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs
- Timestamp:
- 08/06/18 18:15:29 (6 years ago)
- Location:
- branches/2839_HiveProjectManagement
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2839_HiveProjectManagement
- Property svn:mergeinfo changed
-
branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Symbolic.Views
- Property svn:mergeinfo changed
/stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Views merged: 15587 /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views (added) merged: 15400,15581,15583,15589
- Property svn:mergeinfo changed
-
branches/2839_HiveProjectManagement/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs
r15371 r16057 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 183 183 treeChart.Tree = tree.Root.SubtreeCount > 1 ? new SymbolicExpressionTree(tree.Root) : new SymbolicExpressionTree(tree.Root.GetSubtree(0).GetSubtree(0)); 184 184 185 progress.Start("Calculate Impact and Replacement Values ..." , 0);185 progress.Start("Calculate Impact and Replacement Values ..."); 186 186 var impactAndReplacementValues = await Task.Run(() => CalculateImpactAndReplacementValues(tree)); 187 187 await Task.Delay(500); // wait for progressbar to finish animation … … 209 209 protected abstract void UpdateModel(ISymbolicExpressionTree tree); 210 210 211 protected virtual ISymbolicExpressionTree OptimizeConstants(ISymbolic DataAnalysisModel model, IDataAnalysisProblemData problemData, IProgress progress) {212 return model.SymbolicExpressionTree;211 protected virtual ISymbolicExpressionTree OptimizeConstants(ISymbolicExpressionTree tree, IProgress progress) { 212 return tree; 213 213 } 214 214 … … 298 298 299 299 private async void btnOptimizeConstants_Click(object sender, EventArgs e) { 300 progress.Start("Optimizing Constants ...", 0); 301 var newTree = await Task.Run(() => OptimizeConstants(Content.Model, Content.ProblemData, progress)); 300 progress.Start("Optimizing Constants ..."); 301 var tree = (ISymbolicExpressionTree)Content.Model.SymbolicExpressionTree.Clone(); 302 var newTree = await Task.Run(() => OptimizeConstants(tree, progress)); 302 303 await Task.Delay(500); // wait for progressbar to finish animation 303 304 UpdateModel(newTree); // UpdateModel calls Progress.Finish (via Content_Changed)
Note: See TracChangeset
for help on using the changeset viewer.