Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/10/22 10:15:25 (2 years ago)
Author:
dpiringe
Message:

#3138

  • merged trunk into branch
Location:
branches/3138_Shape_Constraints_Transformations
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3138_Shape_Constraints_Transformations

  • branches/3138_Shape_Constraints_Transformations/HeuristicLab.Problems.DataAnalysis.Symbolic.Views

  • branches/3138_Shape_Constraints_Transformations/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.Designer.cs

    r17430 r18180  
    5454      this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
    5555      this.btnSimplify = new System.Windows.Forms.Button();
    56       this.btnOptimizeConstants = new System.Windows.Forms.Button();
     56      this.btnOptimizeParameters = new System.Windows.Forms.Button();
    5757      this.grpViewHost = new System.Windows.Forms.GroupBox();
    5858      this.treeChart = new HeuristicLab.Problems.DataAnalysis.Symbolic.Views.InteractiveSymbolicExpressionTreeChart();
     
    132132            | System.Windows.Forms.AnchorStyles.Right)));
    133133      this.flowLayoutPanel.Controls.Add(this.btnSimplify);
    134       this.flowLayoutPanel.Controls.Add(this.btnOptimizeConstants);
     134      this.flowLayoutPanel.Controls.Add(this.btnOptimizeParameters);
    135135      this.flowLayoutPanel.Location = new System.Drawing.Point(6, 370);
    136136      this.flowLayoutPanel.Name = "flowLayoutPanel";
     
    153153      this.btnSimplify.Click += new System.EventHandler(this.btnSimplify_Click);
    154154      //
    155       // btnOptimizeConstants
    156       //
    157       this.btnOptimizeConstants.AutoSize = true;
    158       this.btnOptimizeConstants.Enabled = false;
    159       this.btnOptimizeConstants.Image = HeuristicLab.Common.Resources.VSImageLibrary.Performance;
    160       this.btnOptimizeConstants.Location = new System.Drawing.Point(89, 3);
    161       this.btnOptimizeConstants.Name = "btnOptimizeConstants";
    162       this.btnOptimizeConstants.Size = new System.Drawing.Size(80, 24);
    163       this.btnOptimizeConstants.TabIndex = 2;
    164       this.btnOptimizeConstants.Text = "Optimize";
    165       this.btnOptimizeConstants.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
    166       this.toolTip.SetToolTip(this.btnOptimizeConstants, "Optimizes the numerical constants of the model. \r\nIf the algorithm converges, opt" +
     155      // btnOptimizeParameters
     156      //
     157      this.btnOptimizeParameters.AutoSize = true;
     158      this.btnOptimizeParameters.Enabled = false;
     159      this.btnOptimizeParameters.Image = HeuristicLab.Common.Resources.VSImageLibrary.Performance;
     160      this.btnOptimizeParameters.Location = new System.Drawing.Point(89, 3);
     161      this.btnOptimizeParameters.Name = "btnOptimizeParameters";
     162      this.btnOptimizeParameters.Size = new System.Drawing.Size(80, 24);
     163      this.btnOptimizeParameters.TabIndex = 2;
     164      this.btnOptimizeParameters.Text = "Optimize";
     165      this.btnOptimizeParameters.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
     166      this.toolTip.SetToolTip(this.btnOptimizeParameters, "Optimizes the parameters of the model. \r\nIf the algorithm converges, opt" +
    167167        "imization is stopped.");
    168       this.btnOptimizeConstants.UseVisualStyleBackColor = true;
    169       this.btnOptimizeConstants.Click += new System.EventHandler(this.btnOptimizeConstants_Click);
     168      this.btnOptimizeParameters.UseVisualStyleBackColor = true;
     169      this.btnOptimizeParameters.Click += new System.EventHandler(this.btnOptimizeParameters_Click);
    170170      //
    171171      // grpViewHost
     
    228228    private System.Windows.Forms.Button btnSimplify;
    229229    private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel;
    230     protected System.Windows.Forms.Button btnOptimizeConstants;
     230    protected System.Windows.Forms.Button btnOptimizeParameters;
    231231    private System.Windows.Forms.Label treeStatusValue;
    232232    private System.Windows.Forms.ToolTip toolTip;
Note: See TracChangeset for help on using the changeset viewer.