Changeset 17928 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
- Timestamp:
- 04/06/21 13:13:32 (4 years ago)
- Location:
- branches/3026_IntegrationIntoSymSpace
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3026_IntegrationIntoSymSpace
- Property svn:mergeinfo changed
-
branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views
- Property svn:mergeinfo changed
/trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (added) merged: 17378,17380,17430,17488
- Property svn:mergeinfo changed
-
branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs
r17180 r17928 38 38 } 39 39 40 protected override void SetEnabledStateOfControls() { 41 base.SetEnabledStateOfControls(); 42 43 var tree = Content?.Model?.SymbolicExpressionTree; 44 btnOptimizeConstants.Enabled = tree != null && SymbolicRegressionConstantOptimizationEvaluator.CanOptimizeConstants(tree); 45 } 46 40 47 protected override void UpdateModel(ISymbolicExpressionTree tree) { 41 48 var model = new SymbolicRegressionModel(Content.ProblemData.TargetVariable, tree, Content.Model.Interpreter, Content.Model.LowerEstimationLimit, Content.Model.UpperEstimationLimit); … … 46 53 protected override ISymbolicExpressionTree OptimizeConstants(ISymbolicExpressionTree tree, IProgress progress) { 47 54 const int constOptIterations = 50; 48 const int maxRepetitions = 1000; 55 const int maxRepetitions = 100; 56 const double minimumImprovement = 1e-10; 49 57 var regressionProblemData = Content.ProblemData; 50 58 var model = Content.Model; 51 59 progress.CanBeStopped = true; 52 var prevResult = 0.0;60 double prevResult = 0.0, improvement = 0.0; 53 61 var result = 0.0; 54 62 int reps = 0; … … 59 67 applyLinearScaling: true, maxIterations: constOptIterations, updateVariableWeights: true, lowerEstimationLimit: model.LowerEstimationLimit, upperEstimationLimit: model.UpperEstimationLimit, 60 68 iterationCallback: (args, func, obj) => { 61 double newProgressValue = progress.ProgressValue + 1.0 / (constOptIterations + 2); // (maxIterations + 2) iterations are reported69 double newProgressValue = progress.ProgressValue + (1.0 / (constOptIterations + 2) / maxRepetitions); // (constOptIterations + 2) iterations are reported 62 70 progress.ProgressValue = Math.Min(newProgressValue, 1.0); 63 71 }); 64 72 reps++; 65 } while (prevResult < result && reps < maxRepetitions && 73 improvement = result - prevResult; 74 } while (improvement > minimumImprovement && reps < maxRepetitions && 66 75 progress.ProgressState != ProgressState.StopRequested && 67 76 progress.ProgressState != ProgressState.CancelRequested); -
branches/3026_IntegrationIntoSymSpace/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs
r17180 r17928 75 75 this.btnSimplify.UseVisualStyleBackColor = true; 76 76 this.btnSimplify.Click += new System.EventHandler(this.btn_SimplifyModel_Click); 77 this.toolTip.SetToolTip(this.btnSimplify, " Simplify solution");77 this.toolTip.SetToolTip(this.btnSimplify, "Opens a new view for model simplification and manipulation."); 78 78 // 79 79 // exportButton
Note: See TracChangeset
for help on using the changeset viewer.