Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/11/11 15:03:46 (13 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
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataCorrelationsView.cs

    r4484 r5275  
    5555            double[] var0 = ds.GetEnumeratedVariableValues(a).ToArray();
    5656            double[] var1 = ds.GetEnumeratedVariableValues(b).ToArray();
    57             double r = alglib.correlation.spearmanrankcorrelation(var0, var1, var0.Length);
     57            double r = alglib.spearmancorr2(var0, var1, var0.Length);
    5858            double bothtails, temp;
    5959            bothtails = temp = 0.0;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.cs

    r4068 r5275  
    4040    }
    4141
     42    protected override void SetEnabledStateOfControls() {
     43      base.SetEnabledStateOfControls();
     44      importButton.Enabled = Enabled && !ReadOnly && !Locked;
     45    }
     46
    4247    private void importButton_Click(object sender, EventArgs e) {
    4348      if (openFileDialog == null) openFileDialog = new OpenFileDialog();
    … …  
    4651        try {
    4752          Content.ImportFromFile(openFileDialog.FileName);
    48           importButton.Enabled = false;
    4953        }
    5054        catch (Exception ex) {
    … …  
    5357      }
    5458    }
     59
     60
    5561  }
    5662}

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisSolutionView.Designer.cs

    r3884 r5275  
    4545    private void InitializeComponent() {
    4646      this.dataTabPage = new System.Windows.Forms.TabPage();
     47      this.dataViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    4748      this.modelTabPage = new System.Windows.Forms.TabPage();
     49      this.modelViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    4850      this.tabControl = new System.Windows.Forms.TabControl();
    49       this.modelViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    50       this.viewHost1 = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    51       this.dataViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    5251      this.dataTabPage.SuspendLayout();
    5352      this.modelTabPage.SuspendLayout();
    … …  
    6665      this.dataTabPage.UseVisualStyleBackColor = true;
    6766      //
     67      // dataViewHost
     68      //
     69      this.dataViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     70                  | System.Windows.Forms.AnchorStyles.Left)
     71                  | System.Windows.Forms.AnchorStyles.Right)));
     72      this.dataViewHost.Caption = "DataAnalysisSolution Data View";
     73      this.dataViewHost.Content = null;
     74      this.dataViewHost.Enabled = false;
     75      this.dataViewHost.Location = new System.Drawing.Point(6, 6);
     76      this.dataViewHost.Name = "dataViewHost";
     77      this.dataViewHost.ReadOnly = false;
     78      this.dataViewHost.Size = new System.Drawing.Size(360, 224);
     79      this.dataViewHost.TabIndex = 2;
     80      this.dataViewHost.ViewType = null;
     81      //
    6882      // modelTabPage
    6983      //
    … …  
    7690      this.modelTabPage.Text = "Model";
    7791      this.modelTabPage.UseVisualStyleBackColor = true;
     92      //
     93      // modelViewHost
     94      //
     95      this.modelViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     96                  | System.Windows.Forms.AnchorStyles.Left)
     97                  | System.Windows.Forms.AnchorStyles.Right)));
     98      this.modelViewHost.Caption = "DataAnalysisSolution Model View";
     99      this.modelViewHost.Content = null;
     100      this.modelViewHost.Enabled = false;
     101      this.modelViewHost.Location = new System.Drawing.Point(6, 6);
     102      this.modelViewHost.Name = "modelViewHost";
     103      this.modelViewHost.ReadOnly = false;
     104      this.modelViewHost.Size = new System.Drawing.Size(360, 224);
     105      this.modelViewHost.TabIndex = 1;
     106      this.modelViewHost.ViewType = null;
    78107      //
    79108      // tabControl
    … …  
    89118      this.tabControl.Size = new System.Drawing.Size(380, 262);
    90119      this.tabControl.TabIndex = 1;
    91       //
    92       // modelViewHost
    93       //
    94       this.modelViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    95                   | System.Windows.Forms.AnchorStyles.Left)
    96                   | System.Windows.Forms.AnchorStyles.Right)));
    97       this.modelViewHost.Caption = "DataAnalysisSolution Model View";
    98       this.modelViewHost.Content = null;
    99       this.modelViewHost.Location = new System.Drawing.Point(6, 6);
    100       this.modelViewHost.Name = "modelViewHost";
    101       this.modelViewHost.ReadOnly = false;
    102       this.modelViewHost.Size = new System.Drawing.Size(360, 224);
    103       this.modelViewHost.TabIndex = 1;
    104       this.modelViewHost.ViewType = null;
    105       //
    106       // viewHost1
    107       //
    108       this.viewHost1.Caption = "View";
    109       this.viewHost1.Content = null;
    110       this.viewHost1.Location = new System.Drawing.Point(6, 6);
    111       this.viewHost1.Name = "viewHost1";
    112       this.viewHost1.ReadOnly = false;
    113       this.viewHost1.Size = new System.Drawing.Size(360, 224);
    114       this.viewHost1.TabIndex = 1;
    115       this.viewHost1.ViewType = null;
    116       //
    117       // dataViewHost
    118       //
    119       this.dataViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    120                   | System.Windows.Forms.AnchorStyles.Left)
    121                   | System.Windows.Forms.AnchorStyles.Right)));
    122       this.dataViewHost.Caption = "DataAnalysisSolution Data View";
    123       this.dataViewHost.Content = null;
    124       this.dataViewHost.Location = new System.Drawing.Point(6, 6);
    125       this.dataViewHost.Name = "dataViewHost";
    126       this.dataViewHost.ReadOnly = false;
    127       this.dataViewHost.Size = new System.Drawing.Size(360, 224);
    128       this.dataViewHost.TabIndex = 2;
    129       this.dataViewHost.ViewType = null;
    130120      //
    131121      // DataAnalysisSolutionView
    … …  
    149139    protected System.Windows.Forms.TabPage modelTabPage;
    150140    protected HeuristicLab.MainForm.WindowsForms.ViewHost dataViewHost;
    151     private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost1;
    152141    protected HeuristicLab.MainForm.WindowsForms.ViewHost modelViewHost;
    153142  }

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/EstimatedValuesView.cs

    r4068 r5275  
    4747      InitializeComponent();
    4848      matrixView = new StringConvertibleMatrixView();
     49      matrixView.ShowRowsAndColumnsTextBox = false;
     50      matrixView.ShowStatisticalInformation = false;
    4951      matrixView.Dock = DockStyle.Fill;
    5052      this.Controls.Add(matrixView);
    … …  
    8284        DoubleMatrix matrix = null;
    8385        if (Content != null) {
    84           double[,] values =
    85           MatrixExtensions<double>.Create(
    86             Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value),
    87             Content.EstimatedValues.ToArray());
     86          double[,] values = new double[Content.ProblemData.Dataset.Rows, 4];
     87
     88          double[] target = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value);
     89          double[] estimated = Content.EstimatedValues.ToArray();
     90          for (int row = 0; row < target.Length; row++) {
     91            values[row, 0] = target[row];
     92            values[row, 1] = estimated[row];
     93            values[row, 2] = estimated[row] - target[row];
     94            values[row, 3] = estimated[row] / target[row] - 1;
     95          }
     96
    8897          matrix = new DoubleMatrix(values);
    89           matrix.ColumnNames = new string[] { "Original", "Estimated" };
     98          matrix.ColumnNames = new string[] { "Original", "Estimated", "Error", "Rel. Error" };
    9099        }
    91100        matrixView.Content = matrix;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj

    r5265 r5275  
    9292  </PropertyGroup>
    9393  <ItemGroup>
    94     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" />
     94    <Reference Include="ALGLIB-3.1.0">
     95      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
     96    </Reference>
     97    <Reference Include="HeuristicLab.ALGLIB-3.1.0">
     98      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.ALGLIB-3.1.0.dll</HintPath>
     99    </Reference>
     100    <Reference Include="HeuristicLab.Analysis-3.3">
     101      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll</HintPath>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Collections-3.3">
     104      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Common-3.3">
     107      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     108    </Reference>
     109    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.2.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
     110      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     111    </Reference>
     112    <Reference Include="HeuristicLab.Core-3.3">
     113      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Core.Views-3.3">
     116      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Data-3.3">
     119      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     120    </Reference>
     121    <Reference Include="HeuristicLab.Data.Views-3.3">
     122      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll</HintPath>
     123    </Reference>
     124    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3">
     125      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.dll</HintPath>
     126    </Reference>
     127    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3">
     128      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.3.dll</HintPath>
     129    </Reference>
     130    <Reference Include="HeuristicLab.MainForm-3.3">
     131      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm-3.3.dll</HintPath>
     132    </Reference>
     133    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
     134      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     135    </Reference>
     136    <Reference Include="HeuristicLab.Operators-3.3">
     137      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     138    </Reference>
     139    <Reference Include="HeuristicLab.Optimization-3.3">
     140      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     141    </Reference>
     142    <Reference Include="HeuristicLab.Optimization.Views-3.3">
     143      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     144    </Reference>
     145    <Reference Include="HeuristicLab.Persistence-3.3">
     146      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     147    </Reference>
     148    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     149      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     150    </Reference>
     151    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3">
     152      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     153    </Reference>
    95154    <Reference Include="System" />
    96155    <Reference Include="System.Core">
    … …  
    99158    <Reference Include="System.Drawing" />
    100159    <Reference Include="System.Windows.Forms" />
    101     <Reference Include="System.Windows.Forms.DataVisualization, Version=3.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     160    <Reference Include="System.Windows.Forms.DataVisualization" />
    102161    <Reference Include="System.Xml.Linq">
    103162      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    113172    <None Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame" />
    114173    <None Include="Properties\AssemblyInfo.frame" />
    115     <Compile Include="RunCollectionValidationTrajectoryView.cs" />
     174    <Compile Include="RunCollectionValidationTrajectoryView.cs">
     175      <SubType>UserControl</SubType>
     176    </Compile>
    116177    <Compile Include="RunCollectionValidationTrajectoryView.Designer.cs">
    117178      <DependentUpon>RunCollectionValidationTrajectoryView.cs</DependentUpon>
    118179    </Compile>
    119     <Compile Include="RunCollectionValidationStatisticsView.cs" />
     180    <Compile Include="RunCollectionValidationStatisticsView.cs">
     181      <SubType>UserControl</SubType>
     182    </Compile>
    120183    <Compile Include="RunCollectionValidationStatisticsView.Designer.cs">
    121184      <DependentUpon>RunCollectionValidationStatisticsView.cs</DependentUpon>
    122185    </Compile>
    123     <Compile Include="DataAnalysisProblemDataCorrelationsView.cs" />
     186    <Compile Include="DataAnalysisProblemDataCorrelationsView.cs">
     187      <SubType>UserControl</SubType>
     188    </Compile>
    124189    <Compile Include="DataAnalysisProblemDataCorrelationsView.Designer.cs">
    125190      <DependentUpon>DataAnalysisProblemDataCorrelationsView.cs</DependentUpon>
    126191    </Compile>
    127     <Compile Include="RunCollectionMonteCarloVariableImpactView.cs" />
     192    <Compile Include="RunCollectionMonteCarloVariableImpactView.cs">
     193      <SubType>UserControl</SubType>
     194    </Compile>
    128195    <Compile Include="RunCollectionMonteCarloVariableImpactView.Designer.cs">
    129196      <DependentUpon>RunCollectionMonteCarloVariableImpactView.cs</DependentUpon>
    130197    </Compile>
    131     <Compile Include="RunCollectionWinklerVariableImpactView.cs" />
     198    <Compile Include="RunCollectionWinklerVariableImpactView.cs">
     199      <SubType>UserControl</SubType>
     200    </Compile>
    132201    <Compile Include="RunCollectionWinklerVariableImpactView.Designer.cs">
    133202      <DependentUpon>RunCollectionWinklerVariableImpactView.cs</DependentUpon>
    134203    </Compile>
    135     <Compile Include="DataAnalysisSolutionView.cs" />
     204    <Compile Include="DataAnalysisSolutionView.cs">
     205      <SubType>UserControl</SubType>
     206    </Compile>
    136207    <Compile Include="DataAnalysisSolutionView.Designer.cs">
    137208      <DependentUpon>DataAnalysisSolutionView.cs</DependentUpon>
    138209    </Compile>
    139     <Compile Include="ResultsView.cs" />
     210    <Compile Include="ResultsView.cs">
     211      <SubType>UserControl</SubType>
     212    </Compile>
    140213    <Compile Include="ResultsView.Designer.cs">
    141214      <DependentUpon>ResultsView.cs</DependentUpon>
    142215    </Compile>
    143     <Compile Include="RunCollectionVariableImpactView.cs" />
     216    <Compile Include="RunCollectionVariableImpactView.cs">
     217      <SubType>UserControl</SubType>
     218    </Compile>
    144219    <Compile Include="RunCollectionVariableImpactView.Designer.cs">
    145220      <DependentUpon>RunCollectionVariableImpactView.cs</DependentUpon>
    146221    </Compile>
    147     <Compile Include="SupportVectorRegressionSolutionView.cs" />
     222    <Compile Include="SupportVectorRegressionSolutionView.cs">
     223      <SubType>UserControl</SubType>
     224    </Compile>
    148225    <Compile Include="SupportVectorRegressionSolutionView.Designer.cs">
    149226      <DependentUpon>SupportVectorRegressionSolutionView.cs</DependentUpon>
    150227    </Compile>
    151     <Compile Include="SupportVectorMachineModelView.cs" />
     228    <Compile Include="SupportVectorMachineModelView.cs">
     229      <SubType>UserControl</SubType>
     230    </Compile>
    152231    <Compile Include="SupportVectorMachineModelView.Designer.cs">
    153232      <DependentUpon>SupportVectorMachineModelView.cs</DependentUpon>
    154233    </Compile>
    155     <Compile Include="EstimatedValuesView.cs" />
     234    <Compile Include="EstimatedValuesView.cs">
     235      <SubType>UserControl</SubType>
     236    </Compile>
    156237    <Compile Include="EstimatedValuesView.Designer.cs">
    157238      <DependentUpon>EstimatedValuesView.cs</DependentUpon>
    158239    </Compile>
    159     <Compile Include="DataAnalysisProblemDataView.cs" />
     240    <Compile Include="DataAnalysisProblemDataView.cs">
     241      <SubType>UserControl</SubType>
     242    </Compile>
    160243    <Compile Include="DataAnalysisProblemDataView.Designer.cs">
    161244      <DependentUpon>DataAnalysisProblemDataView.cs</DependentUpon>
    162245    </Compile>
    163246    <Compile Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs" />
    164     <Compile Include="LineChartView.cs" />
     247    <Compile Include="LineChartView.cs">
     248      <SubType>UserControl</SubType>
     249    </Compile>
    165250    <Compile Include="LineChartView.Designer.cs">
    166251      <DependentUpon>LineChartView.cs</DependentUpon>
    167252    </Compile>
    168253    <Compile Include="Properties\AssemblyInfo.cs" />
    169     <Compile Include="ScatterPlotView.cs" />
     254    <Compile Include="ScatterPlotView.cs">
     255      <SubType>UserControl</SubType>
     256    </Compile>
    170257    <Compile Include="ScatterPlotView.Designer.cs">
    171258      <DependentUpon>ScatterPlotView.cs</DependentUpon>
    172259    </Compile>
    173     <Compile Include="Symbolic\LatexSymbolicExpressionTreeView.cs" />
     260    <Compile Include="Symbolic\LatexSymbolicExpressionTreeView.cs">
     261      <SubType>UserControl</SubType>
     262    </Compile>
    174263    <Compile Include="Symbolic\LatexSymbolicExpressionTreeView.Designer.cs">
    175264      <DependentUpon>LatexSymbolicExpressionTreeView.cs</DependentUpon>
    176265    </Compile>
    177266    <Compile Include="Symbolic\SymbolicExpressionTreeLatexFormatter.cs" />
    178     <Compile Include="Symbolic\GraphvizSymbolicExpressionTreeView.cs" />
     267    <Compile Include="Symbolic\GraphvizSymbolicExpressionTreeView.cs">
     268      <SubType>UserControl</SubType>
     269    </Compile>
    179270    <Compile Include="Symbolic\GraphvizSymbolicExpressionTreeView.Designer.cs">
    180271      <DependentUpon>GraphvizSymbolicExpressionTreeView.cs</DependentUpon>
    181272    </Compile>
    182     <Compile Include="Symbolic\InteractiveSymbolicRegressionSolutionSimplifierView.cs" />
     273    <Compile Include="Symbolic\InteractiveSymbolicRegressionSolutionSimplifierView.cs">
     274      <SubType>UserControl</SubType>
     275    </Compile>
    183276    <Compile Include="Symbolic\InteractiveSymbolicRegressionSolutionSimplifierView.Designer.cs">
    184277      <DependentUpon>InteractiveSymbolicRegressionSolutionSimplifierView.cs</DependentUpon>
    185278    </Compile>
    186     <Compile Include="Symbolic\SimplifiedSymbolicExpressionModelView.cs" />
     279    <Compile Include="Symbolic\SimplifiedSymbolicExpressionModelView.cs">
     280      <SubType>UserControl</SubType>
     281    </Compile>
    187282    <Compile Include="Symbolic\SimplifiedSymbolicExpressionModelView.designer.cs">
    188283      <DependentUpon>SimplifiedSymbolicExpressionModelView.cs</DependentUpon>
    189284    </Compile>
    190     <Compile Include="Symbolic\SymbolicExpressionModelView.cs" />
     285    <Compile Include="Symbolic\SymbolicExpressionModelView.cs">
     286      <SubType>UserControl</SubType>
     287    </Compile>
    191288    <Compile Include="Symbolic\SymbolicExpressionModelView.designer.cs">
    192289      <DependentUpon>SymbolicExpressionModelView.cs</DependentUpon>
    193290    </Compile>
    194     <Compile Include="Symbolic\SymbolicRegressionSolutionView.cs" />
     291    <Compile Include="Symbolic\SymbolicRegressionSolutionView.cs">
     292      <SubType>UserControl</SubType>
     293    </Compile>
    195294    <Compile Include="Symbolic\SymbolicRegressionSolutionView.Designer.cs">
    196295      <DependentUpon>SymbolicRegressionSolutionView.cs</DependentUpon>
    197296    </Compile>
    198     <Compile Include="Symbolic\Symbols\ConstantView.cs" />
     297    <Compile Include="Symbolic\Symbols\ConstantView.cs">
     298      <SubType>UserControl</SubType>
     299    </Compile>
    199300    <Compile Include="Symbolic\Symbols\ConstantView.Designer.cs">
    200301      <DependentUpon>ConstantView.cs</DependentUpon>
    201302    </Compile>
    202     <Compile Include="Symbolic\Symbols\LaggedVariableView.cs" />
     303    <Compile Include="Symbolic\Symbols\LaggedVariableView.cs">
     304      <SubType>UserControl</SubType>
     305    </Compile>
    203306    <Compile Include="Symbolic\Symbols\LaggedVariableView.Designer.cs">
    204307      <DependentUpon>LaggedVariableView.cs</DependentUpon>
    205308    </Compile>
    206309    <Compile Include="Symbolic\SymbolicExpressionTreeGraphvizFormatter.cs" />
    207     <Compile Include="Symbolic\Symbols\VariableView.cs" />
     310    <Compile Include="Symbolic\Symbols\VariableView.cs">
     311      <SubType>UserControl</SubType>
     312    </Compile>
    208313    <Compile Include="Symbolic\Symbols\VariableView.Designer.cs">
    209314      <DependentUpon>VariableView.cs</DependentUpon>

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame

    r3975 r5275  
    2828  [Plugin("HeuristicLab.Problems.DataAnalysis.Views","3.3.0.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Problems.DataAnalysis.Views-3.3.dll", PluginFileType.Assembly)]
    30     [PluginDependency("HeuristicLab.ALGLIB","2.5.0.0")]
     30    [PluginDependency("HeuristicLab.ALGLIB","3.1")]
    3131  [PluginDependency("HeuristicLab.Collections", "3.3.0.0")]
    3232  [PluginDependency("HeuristicLab.Common", "3.3.0.0")]

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/LineChartView.Designer.cs

    r3442 r5275  
    4646      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    4747      System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    48       this.chart = new System.Windows.Forms.DataVisualization.Charting.Chart();
     48      this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
    4949      ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
    5050      this.SuspendLayout();
    … …  
    6363      this.chart.Size = new System.Drawing.Size(358, 225);
    6464      this.chart.TabIndex = 0;
     65      this.chart.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.Chart_MouseDoubleClick);
    6566      //
    66       // QualityLineChart
     67      // LineChartView
    6768      //
    6869      this.AllowDrop = true;
    … …  
    7071      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    7172      this.Controls.Add(this.chart);
    72       this.Name = "QualityLineChart";
     73      this.Name = "LineChartView";
    7374      this.Size = new System.Drawing.Size(358, 225);
    7475      ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
    … …  
    7980    #endregion
    8081
    81     private System.Windows.Forms.DataVisualization.Charting.Chart chart;
     82    private HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart chart;
    8283  }
    8384}

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/LineChartView.cs

    r4068 r5275  
    4343      InitializeComponent();
    4444      //configure axis
     45      this.chart.CustomizeAllChartAreas();
    4546      this.chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
    4647      this.chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
    … …  
    120121      }
    121122    }
     123
     124    private void Chart_MouseDoubleClick(object sender, MouseEventArgs e) {
     125      HitTestResult result = chart.HitTest(e.X, e.Y);
     126      if (result.ChartArea != null && (result.ChartElementType == ChartElementType.PlottingArea ||
     127                                       result.ChartElementType == ChartElementType.Gridlines) ||
     128                                       result.ChartElementType == ChartElementType.StripLines) {
     129        foreach (var axis in result.ChartArea.Axes)
     130          axis.ScaleView.ZoomReset(int.MaxValue);
     131      }
     132    }
    122133    #endregion
    123134

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/ResultsView.cs

    r4068 r5275  
    3131  [View("Results View")]
    3232  public partial class ResultsView : AsynchronousContentView {
    33     private List<string> rowNames = new List<string>() { "MeanSquaredError", "CoefficientOfDetermination", "MeanAbsolutePercentageError" };
     33    private List<string> rowNames = new List<string>() { "Mean squared error", "Pearson's R²", "Average relative error" };
    3434    private List<string> columnNames = new List<string>() { "Training", "Test" };
    3535
    … …  
    7777        matrix.SortableView = false;
    7878
    79         IEnumerable<double> originalTrainingValues = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value, Content.ProblemData.TrainingSamplesStart.Value, Content.ProblemData.TrainingSamplesEnd.Value);
    80         IEnumerable<double> originalTestValues = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value, Content.ProblemData.TestSamplesStart.Value, Content.ProblemData.TestSamplesEnd.Value);
     79        IEnumerable<double> originalTrainingValues = Content.ProblemData.Dataset.GetEnumeratedVariableValues(Content.ProblemData.TargetVariable.Value, Content.ProblemData.TrainingIndizes);
     80        IEnumerable<double> originalTestValues = Content.ProblemData.Dataset.GetEnumeratedVariableValues(Content.ProblemData.TargetVariable.Value, Content.ProblemData.TestIndizes);
    8181        matrix[0, 0] = SimpleMSEEvaluator.Calculate(originalTrainingValues, Content.EstimatedTrainingValues);
    8282        matrix[0, 1] = SimpleMSEEvaluator.Calculate(originalTestValues, Content.EstimatedTestValues);

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/RunCollectionMonteCarloVariableImpactView.cs

    r5010 r5275  
    2323using System.Linq;
    2424using System.Windows.Forms;
    25 using alglib;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Data;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/RunCollectionValidationStatisticsView.cs

    r4197 r5275  
    2323using System.Linq;
    2424using System.Windows.Forms;
    25 using alglib;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Data;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/RunCollectionValidationTrajectoryView.cs

    r4197 r5275  
    2323using System.Linq;
    2424using System.Windows.Forms;
    25 using alglib;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Data;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/RunCollectionVariableImpactView.cs

    r5010 r5275  
    2020#endregion
    2121
     22using System;
    2223using System.Collections.Generic;
    2324using System.Linq;
    2425using System.Windows.Forms;
    25 using alglib;
    2626using HeuristicLab.Common;
    2727using HeuristicLab.Data;
    … …  
    2929using HeuristicLab.MainForm.WindowsForms;
    3030using HeuristicLab.Optimization;
    31 using System;
    3231
    3332namespace HeuristicLab.Problems.DataAnalysis.Views {
    3433  [Content(typeof(RunCollection), false)]
    3534  [View("RunCollection Variable Impact View")]
    36   public partial class RunCollectionVariableImpactView : AsynchronousContentView {
     35  public sealed partial class RunCollectionVariableImpactView : AsynchronousContentView {
    3736    private const string variableImpactResultName = "Integrated variable frequencies";
    3837    public RunCollectionVariableImpactView() {
    … …  
    4544    }
    4645
     46    #region events
    4747    protected override void RegisterContentEvents() {
    4848      base.RegisterContentEvents();
    49       this.Content.ItemsAdded += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_ItemsAdded);
    50       this.Content.ItemsRemoved += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved);
    51       this.Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
     49      Content.UpdateOfRunsInProgressChanged += new EventHandler(Content_UpdateOfRunsInProgressChanged);
     50      Content.ItemsAdded += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_ItemsAdded);
     51      Content.ItemsRemoved += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved);
     52      Content.CollectionReset += new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
     53      RegisterRunEvents(Content);
    5254    }
    5355    protected override void DeregisterContentEvents() {
    5456      base.RegisterContentEvents();
    55       this.Content.ItemsAdded -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_ItemsAdded);
    56       this.Content.ItemsRemoved -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved);
    57       this.Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
    58     }
     57      Content.UpdateOfRunsInProgressChanged -= new EventHandler(Content_UpdateOfRunsInProgressChanged);
     58      Content.ItemsAdded -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_ItemsAdded);
     59      Content.ItemsRemoved -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_ItemsRemoved);
     60      Content.CollectionReset -= new HeuristicLab.Collections.CollectionItemsChangedEventHandler<IRun>(Content_CollectionReset);
     61      DeregisterRunEvents(Content);
     62    }
     63    private void RegisterRunEvents(IEnumerable<IRun> runs) {
     64      foreach (IRun run in runs)
     65        run.Changed += new EventHandler(Run_Changed);
     66    }
     67    private void DeregisterRunEvents(IEnumerable<IRun> runs) {
     68      foreach (IRun run in runs)
     69        run.Changed -= new EventHandler(Run_Changed);
     70    }
     71    private void Content_ItemsAdded(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
     72      RegisterRunEvents(e.Items);
     73      UpdateData();
     74    }
     75    private void Content_ItemsRemoved(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
     76      DeregisterRunEvents(e.Items);
     77      UpdateData();
     78    }
     79    private void Content_CollectionReset(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
     80      DeregisterRunEvents(e.OldItems);
     81      RegisterRunEvents(e.Items);
     82      UpdateData();
     83    }
     84    private void Content_UpdateOfRunsInProgressChanged(object sender, EventArgs e) {
     85      if (!Content.UpdateOfRunsInProgress) UpdateData();
     86    }
     87    private void Run_Changed(object sender, EventArgs e) {
     88      if (!Content.UpdateOfRunsInProgress) UpdateData();
     89    }
     90    #endregion
    5991
    6092    protected override void OnContentChanged() {
    … …  
    6294      this.UpdateData();
    6395    }
    64     private void Content_ItemsAdded(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
    65       this.UpdateData();
    66     }
    67     private void Content_ItemsRemoved(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
    68       this.UpdateData();
    69     }
    70     private void Content_CollectionReset(object sender, HeuristicLab.Collections.CollectionItemsChangedEventArgs<IRun> e) {
    71       this.UpdateData();
    72     }
    7396
    7497    private void UpdateData() {
    … …  
    7699    }
    77100
    78     public DoubleMatrix CalculateVariableImpactMatrix() {
     101    private DoubleMatrix CalculateVariableImpactMatrix() {
    79102      DoubleMatrix matrix = null;
    80103      if (Content != null) {
    81         List<IRun> runsWithVariables = Content.Where(r => r.Results.ContainsKey(variableImpactResultName)).ToList();
     104        List<IRun> runsWithVariables = Content.Where(r => r.Visible && r.Results.ContainsKey(variableImpactResultName)).ToList();
    82105        IEnumerable<DoubleMatrix> allVariableImpacts = (from run in runsWithVariables
    83106                                                        select run.Results[variableImpactResultName]).Cast<DoubleMatrix>();

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/RunCollectionWinklerVariableImpactView.cs

    r5010 r5275  
    2323using System.Linq;
    2424using System.Windows.Forms;
    25 using alglib;
    2625using HeuristicLab.Common;
    2726using HeuristicLab.Data;
    … …  
    140139            z[i] = rowValues[i] - referenceValues[i];
    141140          }
    142           alglib.wsr.wilcoxonsignedranktest(z, z.Length, 0.0, ref bothTails, ref leftTail, ref rightTail);
     141          alglib.wilcoxonsignedranktest(z, z.Length, 0.0, out bothTails, out leftTail, out rightTail);
    143142          matrix[row, columnIndex + 3] = bothTails;
    144143        }

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/ScatterPlotView.Designer.cs

    r3442 r5275  
    4747      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
    4848      System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
    49       this.chart = new System.Windows.Forms.DataVisualization.Charting.Chart();
     49      this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
    5050      ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
    5151      this.SuspendLayout();
    … …  
    8282    #endregion
    8383
    84     private System.Windows.Forms.DataVisualization.Charting.Chart chart;
     84    private HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart chart;
    8585  }
    8686}

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Views/3.3/ScatterPlotView.cs

    r4068 r5275  
    6161      this.chart.AxisViewChanged += new EventHandler<System.Windows.Forms.DataVisualization.Charting.ViewEventArgs>(chart_AxisViewChanged);
    6262
    63       //configure axis                 
     63      //configure axis
     64      this.chart.CustomizeAllChartAreas();
    6465      this.chart.ChartAreas[0].AxisX.Title = "Estimated Values";
    6566      this.chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
    … …  
    127128        string targetVariableName = Content.ProblemData.TargetVariable.Value;
    128129        Dataset dataset = Content.ProblemData.Dataset;
    129         int trainingStart = Content.ProblemData.TrainingSamplesStart.Value;
    130         int trainingEnd = Content.ProblemData.TrainingSamplesEnd.Value;
    131         int testStart = Content.ProblemData.TestSamplesStart.Value;
    132         int testEnd = Content.ProblemData.TestSamplesEnd.Value;
    133130        if (this.chart.Series[ALL_SERIES].Points.Count > 0)
    134131          this.chart.Series[ALL_SERIES].Points.DataBindXY(Content.EstimatedValues.ToArray(), "",
    … …  
    136133        if (this.chart.Series[TRAINING_SERIES].Points.Count > 0)
    137134          this.chart.Series[TRAINING_SERIES].Points.DataBindXY(Content.EstimatedTrainingValues.ToArray(), "",
    138             dataset.GetVariableValues(targetVariableName, trainingStart, trainingEnd), "");
     135            dataset.GetEnumeratedVariableValues(targetVariableName, Content.ProblemData.TrainingIndizes).ToArray(), "");
    139136        if (this.chart.Series[TEST_SERIES].Points.Count > 0)
    140137          this.chart.Series[TEST_SERIES].Points.DataBindXY(Content.EstimatedTestValues.ToArray(), "",
    141             dataset.GetVariableValues(targetVariableName, testStart, testEnd), "");
     138           dataset.GetEnumeratedVariableValues(targetVariableName, Content.ProblemData.TestIndizes).ToArray(), "");
    142139
    143140        double max = Math.Max(Content.EstimatedValues.Max(), dataset.GetVariableValues(targetVariableName).Max());
    144141        double min = Math.Min(Content.EstimatedValues.Min(), dataset.GetVariableValues(targetVariableName).Min());
    145142
    146         max = Math.Ceiling(max) * 1.2;
    147         min = Math.Floor(min) * 0.8;
     143        max = max + 0.2 * Math.Abs(max);
     144        min = min - 0.2 * Math.Abs(min);
     145
     146        double interestingValuesRange = max - min;
     147        int digits = Math.Max(0, 3 - (int)Math.Log10(interestingValuesRange));
     148
     149        max = Math.Round(max, digits);
     150        min = Math.Round(min, digits);
    148151
    149152        this.chart.ChartAreas[0].AxisX.Maximum = max;
    … …  
    168171      } else if (Content != null) {
    169172        string targetVariableName = Content.ProblemData.TargetVariable.Value;
    170         Dataset dataset = Content.ProblemData.Dataset;
    171         int trainingStart = Content.ProblemData.TrainingSamplesStart.Value;
    172         int trainingEnd = Content.ProblemData.TrainingSamplesEnd.Value;
    173         int testStart = Content.ProblemData.TestSamplesStart.Value;
    174         int testEnd = Content.ProblemData.TestSamplesEnd.Value;
    175173
    176174        IEnumerable<double> predictedValues = null;
    … …  
    178176        switch (series.Name) {
    179177          case ALL_SERIES:
    180             predictedValues = Content.EstimatedValues;
    181             targetValues = dataset.GetVariableValues(targetVariableName);
     178            predictedValues = Content.EstimatedValues.ToArray();
     179            targetValues = Content.ProblemData.Dataset.GetVariableValues(targetVariableName);
    182180            break;
    183181          case TRAINING_SERIES:
    184             predictedValues = Content.EstimatedTrainingValues;
    185             targetValues = dataset.GetVariableValues(targetVariableName, trainingStart, trainingEnd);
     182            predictedValues = Content.EstimatedTrainingValues.ToArray();
     183            targetValues = Content.ProblemData.Dataset.GetEnumeratedVariableValues(targetVariableName, Content.ProblemData.TrainingIndizes).ToArray();
    186184            break;
    187185          case TEST_SERIES:
    188             predictedValues = Content.EstimatedTestValues;
    189             targetValues = dataset.GetVariableValues(targetVariableName, testStart, testEnd);
     186            predictedValues = Content.EstimatedTestValues.ToArray();
     187            targetValues = Content.ProblemData.Dataset.GetEnumeratedVariableValues(targetVariableName, Content.ProblemData.TestIndizes).ToArray();
    190188            break;
    191189        }

  • 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.