Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/11/11 15:03:46 (14 years ago)
Author:
gkronber
Message:

Merged changes from trunk to data analysis exploration branch and added fractional distance metric evaluator. #1142

Location:
branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SymbolicRegressionSolutionView.Designer.cs

    r3915 r5275  
    6363      this.modelTabPage.Size = new System.Drawing.Size(372, 207);
    6464      //
     65      // dataViewHost
     66      //
     67      this.dataViewHost.Size = new System.Drawing.Size(360, 195);
     68      //
    6569      // modelViewHost
    6670      //

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/ConstantView.Designer.cs

    r3915 r5275  
    5454      this.valueChangeSigmaTextBox = new System.Windows.Forms.TextBox();
    5555      this.meanWeightChangeLabel = new System.Windows.Forms.Label();
    56       this.valueChangeNuTextBox = new System.Windows.Forms.TextBox();
     56      this.valueChangeMuTextBox = new System.Windows.Forms.TextBox();
    5757      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5858      this.initializationGroupBox.SuspendLayout();
    … …  
    146146      this.mutationGroupBox.Controls.Add(this.valueChangeSigmaTextBox);
    147147      this.mutationGroupBox.Controls.Add(this.meanWeightChangeLabel);
    148       this.mutationGroupBox.Controls.Add(this.valueChangeNuTextBox);
     148      this.mutationGroupBox.Controls.Add(this.valueChangeMuTextBox);
    149149      this.mutationGroupBox.Location = new System.Drawing.Point(3, 158);
    150150      this.mutationGroupBox.Name = "mutationGroupBox";
    … …  
    183183      this.meanWeightChangeLabel.Location = new System.Drawing.Point(6, 22);
    184184      this.meanWeightChangeLabel.Name = "meanWeightChangeLabel";
    185       this.meanWeightChangeLabel.Size = new System.Drawing.Size(97, 13);
     185      this.meanWeightChangeLabel.Size = new System.Drawing.Size(99, 13);
    186186      this.meanWeightChangeLabel.TabIndex = 6;
    187       this.meanWeightChangeLabel.Text = "Value change (nu):";
    188       this.toolTip.SetToolTip(this.meanWeightChangeLabel, "The nu (mean) parameter for the normal distribution to sample the value change.");
    189       //
    190       // valueChangeNuTextBox
    191       //
    192       this.valueChangeNuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    193                   | System.Windows.Forms.AnchorStyles.Right)));
    194       this.errorProvider.SetIconAlignment(this.valueChangeNuTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    195       this.valueChangeNuTextBox.Location = new System.Drawing.Point(136, 19);
    196       this.valueChangeNuTextBox.Name = "valueChangeNuTextBox";
    197       this.valueChangeNuTextBox.Size = new System.Drawing.Size(178, 20);
    198       this.valueChangeNuTextBox.TabIndex = 7;
    199       this.toolTip.SetToolTip(this.valueChangeNuTextBox, "The nu (mean) parameter for the normal distribution to sample the value change.");
    200       this.valueChangeNuTextBox.TextChanged += new System.EventHandler(this.valueChangeNuTextBox_TextChanged);
     187      this.meanWeightChangeLabel.Text = "Value change (mu):";
     188      this.toolTip.SetToolTip(this.meanWeightChangeLabel, "The mu (mean) parameter for the normal distribution to sample the value change.");
     189      //
     190      // valueChangeMuTextBox
     191      //
     192      this.valueChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     193                  | System.Windows.Forms.AnchorStyles.Right)));
     194      this.errorProvider.SetIconAlignment(this.valueChangeMuTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
     195      this.valueChangeMuTextBox.Location = new System.Drawing.Point(136, 19);
     196      this.valueChangeMuTextBox.Name = "valueChangeMuTextBox";
     197      this.valueChangeMuTextBox.Size = new System.Drawing.Size(178, 20);
     198      this.valueChangeMuTextBox.TabIndex = 7;
     199      this.toolTip.SetToolTip(this.valueChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the value change.");
     200      this.valueChangeMuTextBox.TextChanged += new System.EventHandler(this.valueChangeMuTextBox_TextChanged);
    201201      //
    202202      // ConstantView
    … …  
    237237    private System.Windows.Forms.TextBox valueChangeSigmaTextBox;
    238238    private System.Windows.Forms.Label meanWeightChangeLabel;
    239     private System.Windows.Forms.TextBox valueChangeNuTextBox;
     239    private System.Windows.Forms.TextBox valueChangeMuTextBox;
    240240
    241241  }

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/ConstantView.cs

    r4068 r5275  
    5858      base.SetEnabledStateOfControls();
    5959      minValueTextBox.Enabled = Content != null;
     60      minValueTextBox.ReadOnly = ReadOnly;
    6061      maxValueTextBox.Enabled = Content != null;
    61       valueChangeNuTextBox.Enabled = Content != null;
     62      maxValueTextBox.ReadOnly = ReadOnly;
     63      valueChangeMuTextBox.Enabled = Content != null;
     64      valueChangeMuTextBox.ReadOnly = ReadOnly;
    6265      valueChangeSigmaTextBox.Enabled = Content != null;
     66      valueChangeSigmaTextBox.ReadOnly = ReadOnly;
    6367    }
    6468
    … …  
    8993    }
    9094
    91     private void valueChangeNuTextBox_TextChanged(object sender, EventArgs e) {
     95    private void valueChangeMuTextBox_TextChanged(object sender, EventArgs e) {
    9296      double nu;
    93       if (double.TryParse(valueChangeNuTextBox.Text, out nu)) {
    94         Content.ManipulatorNu = nu;
    95         errorProvider.SetError(valueChangeNuTextBox, string.Empty);
     97      if (double.TryParse(valueChangeMuTextBox.Text, out nu)) {
     98        Content.ManipulatorMu = nu;
     99        errorProvider.SetError(valueChangeMuTextBox, string.Empty);
    96100      } else {
    97         errorProvider.SetError(valueChangeNuTextBox, "Invalid value");
     101        errorProvider.SetError(valueChangeMuTextBox, "Invalid value");
    98102      }
    99103    }
    … …  
    120124        minValueTextBox.Text = Content.MinValue.ToString();
    121125        maxValueTextBox.Text = Content.MaxValue.ToString();
    122         valueChangeNuTextBox.Text = Content.ManipulatorNu.ToString();
     126        valueChangeMuTextBox.Text = Content.ManipulatorMu.ToString();
    123127        valueChangeSigmaTextBox.Text = Content.ManipulatorSigma.ToString();
    124128      }

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/LaggedVariableView.cs

    r4068 r5275  
    5757      base.SetEnabledStateOfControls();
    5858      minTimeOffsetTextBox.Enabled = Content != null;
     59      minTimeOffsetTextBox.ReadOnly = ReadOnly;
    5960      maxTimeOffsetTextBox.Enabled = Content != null;
     61      maxTimeOffsetTextBox.ReadOnly = ReadOnly;
    6062    }
    6163

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/VariableView.Designer.cs

    r3915 r5275  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.weightNuLabel = new System.Windows.Forms.Label();
    48       this.weightNuTextBox = new System.Windows.Forms.TextBox();
     47      this.weightMuLabel = new System.Windows.Forms.Label();
     48      this.weightMuTextBox = new System.Windows.Forms.TextBox();
    4949      this.initializationGroupBox = new System.Windows.Forms.GroupBox();
    5050      this.weightSigmaLabel = new System.Windows.Forms.Label();
    … …  
    5454      this.weightChangeSigmaTextBox = new System.Windows.Forms.TextBox();
    5555      this.meanWeightChangeLabel = new System.Windows.Forms.Label();
    56       this.weightChangeNuTextBox = new System.Windows.Forms.TextBox();
     56      this.weightChangeMuTextBox = new System.Windows.Forms.TextBox();
    5757      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5858      this.initializationGroupBox.SuspendLayout();
    … …  
    6666      // initialFrequencyTextBox
    6767      //
     68      this.errorProvider.SetIconAlignment(this.initialFrequencyTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    6869      this.initialFrequencyTextBox.Size = new System.Drawing.Size(203, 20);
    6970      //
    … …  
    7677      // descriptionTextBox
    7778      //
     79      this.errorProvider.SetIconAlignment(this.descriptionTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    7880      this.descriptionTextBox.Size = new System.Drawing.Size(203, 20);
    7981      //
    80       // weightNuLabel
    81       //
    82       this.weightNuLabel.AutoSize = true;
    83       this.weightNuLabel.Location = new System.Drawing.Point(6, 22);
    84       this.weightNuLabel.Name = "weightNuLabel";
    85       this.weightNuLabel.Size = new System.Drawing.Size(65, 13);
    86       this.weightNuLabel.TabIndex = 6;
    87       this.weightNuLabel.Text = "Weight (nu):";
    88       this.toolTip.SetToolTip(this.weightNuLabel, "The nu (mean) parameter of the normal distribution to use for initial weights.");
    89       //
    90       // weightNuTextBox
    91       //
    92       this.weightNuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    93                   | System.Windows.Forms.AnchorStyles.Right)));
    94       this.weightNuTextBox.Location = new System.Drawing.Point(92, 19);
    95       this.weightNuTextBox.Name = "weightNuTextBox";
    96       this.weightNuTextBox.Size = new System.Drawing.Size(201, 20);
    97       this.weightNuTextBox.TabIndex = 7;
    98       this.toolTip.SetToolTip(this.weightNuTextBox, "The nu (mean) parameter of the normal distribution from which to sample the initi" +
     82      // weightMuLabel
     83      //
     84      this.weightMuLabel.AutoSize = true;
     85      this.weightMuLabel.Location = new System.Drawing.Point(6, 22);
     86      this.weightMuLabel.Name = "weightMuLabel";
     87      this.weightMuLabel.Size = new System.Drawing.Size(67, 13);
     88      this.weightMuLabel.TabIndex = 6;
     89      this.weightMuLabel.Text = "Weight (mu):";
     90      this.toolTip.SetToolTip(this.weightMuLabel, "The mu (mean) parameter of the normal distribution to use for initial weights.");
     91      //
     92      // weightMuTextBox
     93      //
     94      this.weightMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     95                  | System.Windows.Forms.AnchorStyles.Right)));
     96      this.weightMuTextBox.Location = new System.Drawing.Point(92, 19);
     97      this.weightMuTextBox.Name = "weightMuTextBox";
     98      this.weightMuTextBox.Size = new System.Drawing.Size(201, 20);
     99      this.weightMuTextBox.TabIndex = 7;
     100      this.toolTip.SetToolTip(this.weightMuTextBox, "The mu (mean) parameter of the normal distribution from which to sample the initi" +
    99101              "al weights.");
    100       this.weightNuTextBox.TextChanged += new System.EventHandler(this.weightNuTextBox_TextChanged);
     102      this.weightMuTextBox.TextChanged += new System.EventHandler(this.weightMuTextBox_TextChanged);
    101103      //
    102104      // initializationGroupBox
    … …  
    106108      this.initializationGroupBox.Controls.Add(this.weightSigmaLabel);
    107109      this.initializationGroupBox.Controls.Add(this.weightSigmaTextBox);
    108       this.initializationGroupBox.Controls.Add(this.weightNuLabel);
    109       this.initializationGroupBox.Controls.Add(this.weightNuTextBox);
     110      this.initializationGroupBox.Controls.Add(this.weightMuLabel);
     111      this.initializationGroupBox.Controls.Add(this.weightMuTextBox);
    110112      this.initializationGroupBox.Location = new System.Drawing.Point(3, 79);
    111113      this.initializationGroupBox.Name = "initializationGroupBox";
    … …  
    144146      this.mutationGroupBox.Controls.Add(this.weightChangeSigmaTextBox);
    145147      this.mutationGroupBox.Controls.Add(this.meanWeightChangeLabel);
    146       this.mutationGroupBox.Controls.Add(this.weightChangeNuTextBox);
     148      this.mutationGroupBox.Controls.Add(this.weightChangeMuTextBox);
    147149      this.mutationGroupBox.Location = new System.Drawing.Point(3, 158);
    148150      this.mutationGroupBox.Name = "mutationGroupBox";
    … …  
    180182      this.meanWeightChangeLabel.Location = new System.Drawing.Point(6, 22);
    181183      this.meanWeightChangeLabel.Name = "meanWeightChangeLabel";
    182       this.meanWeightChangeLabel.Size = new System.Drawing.Size(104, 13);
     184      this.meanWeightChangeLabel.Size = new System.Drawing.Size(106, 13);
    183185      this.meanWeightChangeLabel.TabIndex = 6;
    184       this.meanWeightChangeLabel.Text = "Weight change (nu):";
     186      this.meanWeightChangeLabel.Text = "Weight change (mu):";
    185187      this.toolTip.SetToolTip(this.meanWeightChangeLabel, "The nu (mean) parameter for the normal distribution to sample the change in weigh" +
    186188              "t.");
    187189      //
    188       // weightChangeNuTextBox
    189       //
    190       this.weightChangeNuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    191                   | System.Windows.Forms.AnchorStyles.Right)));
    192       this.weightChangeNuTextBox.Location = new System.Drawing.Point(131, 19);
    193       this.weightChangeNuTextBox.Name = "weightChangeNuTextBox";
    194       this.weightChangeNuTextBox.Size = new System.Drawing.Size(162, 20);
    195       this.weightChangeNuTextBox.TabIndex = 7;
    196       this.toolTip.SetToolTip(this.weightChangeNuTextBox, "The nu (mean) parameter for the normal distribution to sample the change in weigh" +
     190      // weightChangeMuTextBox
     191      //
     192      this.weightChangeMuTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     193                  | System.Windows.Forms.AnchorStyles.Right)));
     194      this.weightChangeMuTextBox.Location = new System.Drawing.Point(131, 19);
     195      this.weightChangeMuTextBox.Name = "weightChangeMuTextBox";
     196      this.weightChangeMuTextBox.Size = new System.Drawing.Size(162, 20);
     197      this.weightChangeMuTextBox.TabIndex = 7;
     198      this.toolTip.SetToolTip(this.weightChangeMuTextBox, "The mu (mean) parameter for the normal distribution to sample the change in weigh" +
    197199              "t.");
    198       this.weightChangeNuTextBox.TextChanged += new System.EventHandler(this.weightChangeNuTextBox_TextChanged);
     200      this.weightChangeMuTextBox.TextChanged += new System.EventHandler(this.weightChangeMuTextBox_TextChanged);
    199201      //
    200202      // VariableView
    … …  
    226228    #endregion
    227229
    228     private System.Windows.Forms.Label weightNuLabel;
    229     private System.Windows.Forms.TextBox weightNuTextBox;
     230    private System.Windows.Forms.Label weightMuLabel;
     231    private System.Windows.Forms.TextBox weightMuTextBox;
    230232    protected System.Windows.Forms.GroupBox initializationGroupBox;
    231233    private System.Windows.Forms.Label weightSigmaLabel;
    … …  
    235237    private System.Windows.Forms.TextBox weightChangeSigmaTextBox;
    236238    private System.Windows.Forms.Label meanWeightChangeLabel;
    237     private System.Windows.Forms.TextBox weightChangeNuTextBox;
     239    private System.Windows.Forms.TextBox weightChangeMuTextBox;
    238240
    239241  }

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/Symbols/VariableView.cs

    r4068 r5275  
    5757    protected override void SetEnabledStateOfControls() {
    5858      base.SetEnabledStateOfControls();
    59       weightNuTextBox.Enabled = Content != null;
     59      weightMuTextBox.Enabled = Content != null;
     60      weightMuTextBox.ReadOnly = ReadOnly;
    6061      weightSigmaTextBox.Enabled = Content != null;
    61       weightChangeNuTextBox.Enabled = Content != null;
     62      weightSigmaTextBox.ReadOnly = ReadOnly;
     63      weightChangeMuTextBox.Enabled = Content != null;
     64      weightChangeMuTextBox.ReadOnly = ReadOnly;
    6265      weightChangeSigmaTextBox.Enabled = Content != null;
     66      weightChangeSigmaTextBox.ReadOnly = ReadOnly;
    6367    }
    6468
    … …  
    7074
    7175    #region control event handlers
    72     private void weightNuTextBox_TextChanged(object sender, EventArgs e) {
     76    private void weightMuTextBox_TextChanged(object sender, EventArgs e) {
    7377      double nu;
    74       if (double.TryParse(weightNuTextBox.Text, out nu)) {
    75         Content.WeightNu = nu;
    76         errorProvider.SetError(weightNuTextBox, string.Empty);
     78      if (double.TryParse(weightMuTextBox.Text, out nu)) {
     79        Content.WeightMu = nu;
     80        errorProvider.SetError(weightMuTextBox, string.Empty);
    7781      } else {
    78         errorProvider.SetError(weightNuTextBox, "Invalid value");
     82        errorProvider.SetError(weightMuTextBox, "Invalid value");
    7983      }
    8084    }
    … …  
    8993    }
    9094
    91     private void weightChangeNuTextBox_TextChanged(object sender, EventArgs e) {
     95    private void weightChangeMuTextBox_TextChanged(object sender, EventArgs e) {
    9296      double nu;
    93       if (double.TryParse(weightChangeNuTextBox.Text, out nu)) {
    94         Content.WeightManipulatorNu = nu;
    95         errorProvider.SetError(weightChangeNuTextBox, string.Empty);
     97      if (double.TryParse(weightChangeMuTextBox.Text, out nu)) {
     98        Content.WeightManipulatorMu = nu;
     99        errorProvider.SetError(weightChangeMuTextBox, string.Empty);
    96100      } else {
    97         errorProvider.SetError(weightChangeNuTextBox, "Invalid value");
     101        errorProvider.SetError(weightChangeMuTextBox, "Invalid value");
    98102      }
    99103    }
    … …  
    113117    private void UpdateControl() {
    114118      if (Content == null) {
    115         weightNuTextBox.Text = string.Empty;
     119        weightMuTextBox.Text = string.Empty;
    116120        weightSigmaTextBox.Text = string.Empty;
    117         weightNuTextBox.Text = string.Empty;
     121        weightMuTextBox.Text = string.Empty;
    118122        weightChangeSigmaTextBox.Text = string.Empty;
    119123      } else {
    120         weightNuTextBox.Text = Content.WeightNu.ToString();
     124        weightMuTextBox.Text = Content.WeightMu.ToString();
    121125        weightSigmaTextBox.Text = Content.WeightSigma.ToString();
    122         weightChangeNuTextBox.Text = Content.WeightManipulatorNu.ToString();
     126        weightChangeMuTextBox.Text = Content.WeightManipulatorMu.ToString();
    123127        weightChangeSigmaTextBox.Text = Content.WeightManipulatorSigma.ToString();
    124128      }
Note: See TracChangeset for help on using the changeset viewer.