Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8032


Ignore:
Timestamp:
06/18/12 11:18:51 (12 years ago)
Author:
sforsten
Message:

#1758:

  • merged trunk r7330:8022 into branch
  • importButton shows a message, if clicked and it can't be used
Location:
branches/ChangeDatasetOfRegressionModel
Files:
2 deleted
34 edited
2 copied

Legend:

Unmodified
Added
Removed

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Viewsmergedeligible
      /branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views6917-7005
      /branches/CloningRefactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views5815-6180
      /branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views4458-4459,​4462,​4464
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views5060
      /branches/NET40/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views5138-5162
      /branches/ParallelEngine/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views5175-5192
      /branches/QAPAlgorithms/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views6828
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views5370-5682
      /branches/Trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views6829-6865
      /branches/VNS/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views5594-5752
      /branches/histogram/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views5959-6341

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj

    r7404 r8032  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    9595    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    9696      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
     97      <Private>False</Private>
    9798    </Reference>
    9899    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    99100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     101      <Private>False</Private>
    100102    </Reference>
    101103    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     105      <Private>False</Private>
    103106    </Reference>
    104107    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     109      <Private>False</Private>
    106110    </Reference>
    107111    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     113      <Private>False</Private>
    109114    </Reference>
    110115    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    111116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     117      <Private>False</Private>
    112118    </Reference>
    113119    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    114120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     121      <Private>False</Private>
    115122    </Reference>
    116123    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    117124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views-3.4.dll</HintPath>
     125      <Private>False</Private>
    118126    </Reference>
    119127    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    120128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     129      <Private>False</Private>
    121130    </Reference>
    122131    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    123132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     133      <Private>False</Private>
    124134    </Reference>
    125135    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    126136      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
     137      <Private>False</Private>
    127138    </Reference>
    128139    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    129140      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     141      <Private>False</Private>
    130142    </Reference>
    131143    <Reference Include="HeuristicLab.Optimization.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    132144      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     145      <Private>False</Private>
    133146    </Reference>
    134147    <Reference Include="HeuristicLab.Parameters.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    135148      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters.Views-3.3.dll</HintPath>
     149      <Private>False</Private>
    136150    </Reference>
    137151    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    138152      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     153      <Private>False</Private>
    139154    </Reference>
    140155    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    141156      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     157      <Private>False</Private>
    142158    </Reference>
    143159    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    144160      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     161      <Private>False</Private>
    145162    </Reference>
    146163    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    147164      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
     165      <Private>False</Private>
    148166    </Reference>
    149167    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    150168      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
     169      <Private>False</Private>
    151170    </Reference>
    152171    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    153172      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.dll</HintPath>
     173      <Private>False</Private>
    154174    </Reference>
    155175    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    156176      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     177      <Private>False</Private>
    157178    </Reference>
    158179    <Reference Include="System" />

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.Designer.cs

    r6256 r8032  
    5050      //
    5151      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    52       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     52      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    5353      this.Name = "InteractiveSymbolicRegressionSolutionSimplifierView";
    5454      this.Size = new System.Drawing.Size(564, 348);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.Designer.cs

    r6642 r8032  
    3434      //
    3535      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    36       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     36      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    3737      this.Name = "SymbolicRegressionSolutionErrorCharacteristicsCurveView";
    3838      ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionResponseFunctionView.Designer.cs

    r7122 r8032  
    147147      //
    148148      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    149       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     149      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    150150      this.Controls.Add(this.freeVariableLabel);
    151151      this.Controls.Add(this.comboBox);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/VariableTrackbar.Designer.cs

    r7028 r8032  
    114114      //
    115115      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    116       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     116      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    117117      this.Controls.Add(this.groupBox);
    118118      this.Name = "VariableTrackbar";

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.Designer.cs

    r7259 r8032  
    7171      //
    7272      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    73       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     73      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    7474      this.Controls.Add(this.SamplesComboBox);
    7575      this.Name = "ClassificationEnsembleSolutionEstimatedClassValuesView";

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionModelView.Designer.cs

    r7259 r8032  
    5050      //
    5151      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    52       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     52      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    5353      this.Name = "RegressionEnsembleSolutionModelView";
    5454      this.ResumeLayout(false);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.Designer.cs

    r5829 r8032  
    6565      //
    6666      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    67       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     67      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    6868      this.Controls.Add(this.label1);
    6969      this.Controls.Add(this.cmbSamples);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionEstimatedClassValuesView.Designer.cs

    r7259 r8032  
    5050      this.AllowDrop = true;
    5151      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    52       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     52      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    5353      this.Name = "EstimatedValuesView";
    5454      this.Size = new System.Drawing.Size(310, 285);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.Designer.cs

    r5829 r8032  
    7676      //
    7777      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    78       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     78      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    7979      this.Controls.Add(this.label1);
    8080      this.Controls.Add(this.cmbSamples);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionEstimatedClassValuesView.Designer.cs

    r7259 r8032  
    5050      this.AllowDrop = true;
    5151      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    52       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     52      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    5353      this.Name = "EstimatedValuesView";
    5454      this.Size = new System.Drawing.Size(310, 285);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.Designer.cs

    r5829 r8032  
    8080      //
    8181      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    82       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     82      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    8383      this.Controls.Add(this.label1);
    8484      this.Controls.Add(this.JitterTrackBar);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionEstimatedClusterView.Designer.cs

    r7259 r8032  
    5050      this.AllowDrop = true;
    5151      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    52       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     52      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    5353      this.Name = "EstimatedValuesView";
    5454      this.Size = new System.Drawing.Size(310, 285);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisSolutionEvaluationView.Designer.cs

    r7259 r8032  
    4646    private void InitializeComponent() {
    4747      components = new System.ComponentModel.Container();
    48       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     48      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    4949    }
    5050

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r7487 r8032  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    9595    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    9696      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     97      <Private>False</Private>
    9798    </Reference>
    9899    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    99100      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     101      <Private>False</Private>
    100102    </Reference>
    101103    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102104      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     105      <Private>False</Private>
    103106    </Reference>
    104107    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105108      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     109      <Private>False</Private>
    106110    </Reference>
    107111    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    108112      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     113      <Private>False</Private>
    109114    </Reference>
    110115    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    111116      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     117      <Private>False</Private>
    112118    </Reference>
    113119    <Reference Include="HeuristicLab.Data.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    114120      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
     121      <Private>False</Private>
    115122    </Reference>
    116123    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    117124      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     125      <Private>False</Private>
    118126    </Reference>
    119127    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    120128      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     129      <Private>False</Private>
    121130    </Reference>
    122131    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    123132      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     133      <Private>False</Private>
    124134    </Reference>
    125135    <Reference Include="HeuristicLab.Optimization.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    126136      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     137      <Private>False</Private>
    127138    </Reference>
    128139    <Reference Include="HeuristicLab.Optimizer-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    129140      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
     141      <Private>False</Private>
    130142    </Reference>
    131143    <Reference Include="HeuristicLab.Parameters.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    132144      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters.Views-3.3.dll</HintPath>
     145      <Private>False</Private>
    133146    </Reference>
    134147    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    135148      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     149      <Private>False</Private>
    136150    </Reference>
    137151    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    138152      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     153      <Private>False</Private>
    139154    </Reference>
    140155    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    141156      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     157      <Private>False</Private>
    142158    </Reference>
    143159    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    144160      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
    145     </Reference>
    146     <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL" />
     161      <Private>False</Private>
     162    </Reference>
     163    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.4.369, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
     164      <Private>False</Private>
     165    </Reference>
    147166    <Reference Include="System" />
    148167    <Reference Include="System.Core">
    … …  
    181200    </Compile>
    182201    <Compile Include="Plugin.cs" />
     202    <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
     203      <SubType>UserControl</SubType>
     204    </Compile>
     205    <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
     206      <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     207    </Compile>
    183208    <Compile Include="Regression\RegressionSolutionErrorCharacteristicsCurveView.cs">
    184209      <SubType>UserControl</SubType>
    … …  
    187212      <DependentUpon>RegressionSolutionErrorCharacteristicsCurveView.cs</DependentUpon>
    188213    </Compile>
    189     <Compile Include="Regression\RegressionEnsembleSolutionModelView.cs">
    190       <SubType>UserControl</SubType>
    191     </Compile>
    192     <Compile Include="Regression\RegressionEnsembleSolutionModelView.Designer.cs">
    193       <DependentUpon>RegressionEnsembleSolutionModelView.cs</DependentUpon>
     214    <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
     215      <SubType>UserControl</SubType>
     216    </Compile>
     217    <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs">
     218      <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon>
     219    </Compile>
     220    <Compile Include="Regression\RegressionSolutionLineChartView.cs">
     221      <SubType>UserControl</SubType>
     222    </Compile>
     223    <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs">
     224      <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon>
     225    </Compile>
     226    <Compile Include="Regression\RegressionSolutionResidualHistogram.cs">
     227      <SubType>UserControl</SubType>
     228    </Compile>
     229    <Compile Include="Regression\RegressionSolutionResidualHistogram.Designer.cs">
     230      <DependentUpon>RegressionSolutionResidualHistogram.cs</DependentUpon>
     231    </Compile>
     232    <Compile Include="Regression\RegressionSolutionScatterPlotView.cs">
     233      <SubType>UserControl</SubType>
     234    </Compile>
     235    <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">
     236      <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
    194237    </Compile>
    195238    <Compile Include="Solution Views\ClassificationSolutionView.cs">
    … …  
    285328      <DependentUpon>RegressionSolutionView.cs</DependentUpon>
    286329    </Compile>
    287     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
    288       <SubType>UserControl</SubType>
    289     </Compile>
    290     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.Designer.cs">
    291       <DependentUpon>RegressionSolutionEstimatedValuesView.cs</DependentUpon>
    292     </Compile>
    293     <Compile Include="Regression\RegressionSolutionLineChartView.cs">
    294       <SubType>UserControl</SubType>
    295     </Compile>
    296     <Compile Include="Regression\RegressionSolutionLineChartView.Designer.cs">
    297       <DependentUpon>RegressionSolutionLineChartView.cs</DependentUpon>
    298     </Compile>
    299     <Compile Include="Regression\RegressionSolutionScatterPlotView.cs">
    300       <SubType>UserControl</SubType>
    301     </Compile>
    302     <Compile Include="Regression\RegressionSolutionScatterPlotView.Designer.cs">
    303       <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
    304     </Compile>
    305330    <None Include="HeuristicLab.snk" />
    306331    <None Include="Plugin.cs.frame" />
    307332    <None Include="Properties\AssemblyInfo.cs.frame" />
    308     <Compile Include="DataAnalysisProblemView.cs">
    309       <SubType>UserControl</SubType>
    310     </Compile>
    311     <Compile Include="DataAnalysisProblemView.Designer.cs">
    312       <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>
    313     </Compile>
    314333    <Compile Include="Properties\AssemblyInfo.cs" />
    315334  </ItemGroup>
    … …  
    331350    </BootstrapperPackage>
    332351  </ItemGroup>
     352  <ItemGroup>
     353    <Folder Include="obj\" />
     354  </ItemGroup>
    333355  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    334356  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/MenuItems/CreateEnsembleMenuItem.cs

    r7259 r8032  
    7373              .First()
    7474              .ProblemData.Clone();
    75             var ensemble = new RegressionEnsembleSolution(Enumerable.Empty<IRegressionModel>(), problemData);
     75            var ensemble = new RegressionEnsembleSolution(problemData);
    7676            ensemble.Name = group.Key + " ensemble";
    7777            var nestedSolutions = group.OfType<RegressionEnsembleSolution>().SelectMany(e => e.RegressionSolutions);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionEnsembleSolutionModelView.Designer.cs

    r7259 r8032  
    5050      //
    5151      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    52       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     52      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    5353      this.Name = "RegressionEnsembleSolutionModelView";
    5454      this.ResumeLayout(false);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.Designer.cs

    r7043 r8032  
    4949      this.chart.TabIndex = 0;
    5050      this.chart.Text = "chart";
    51       this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);
     51      this.chart.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.Chart_MouseDoubleClick);
     52      this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
    5253      //
    5354      // label1
    … …  
    7374      //
    7475      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    75       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     76      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    7677      this.Controls.Add(this.label1);
    7778      this.Controls.Add(this.cmbSamples);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

    r7259 r8032  
    2727using HeuristicLab.MainForm;
    2828using HeuristicLab.MainForm.WindowsForms;
     29
    2930namespace HeuristicLab.Problems.DataAnalysis.Views {
    3031  [View("Error Characteristics Curve")]
    … …  
    104105      var originalValues = GetOriginalValues().ToList();
    105106      constantModel = CreateConstantModel();
    106       var meanModelEstimatedValues = GetEstimatedValues(constantModel);
    107       var meanModelResiduals = GetResiduals(originalValues, meanModelEstimatedValues);
    108 
    109       meanModelResiduals.Sort();
    110       chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(meanModelResiduals.Last());
    111       chart.ChartAreas[0].CursorX.Interval = meanModelResiduals.First() / 100;
    112 
    113       Series meanModelSeries = new Series("Mean Model");
    114       meanModelSeries.ChartType = SeriesChartType.FastLine;
    115       UpdateSeries(meanModelResiduals, meanModelSeries);
    116       meanModelSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(meanModelSeries);
    117       meanModelSeries.Tag = constantModel;
    118       chart.Series.Add(meanModelSeries);
     107      var baselineEstimatedValues = GetEstimatedValues(constantModel);
     108      var baselineResiduals = GetResiduals(originalValues, baselineEstimatedValues);
     109
     110      baselineResiduals.Sort();
     111      chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(baselineResiduals.Last());
     112      chart.ChartAreas[0].CursorX.Interval = baselineResiduals.First() / 100;
     113
     114      Series baselineSeries = new Series("Baseline");
     115      baselineSeries.ChartType = SeriesChartType.FastLine;
     116      UpdateSeries(baselineResiduals, baselineSeries);
     117      baselineSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(baselineSeries);
     118      baselineSeries.Tag = constantModel;
     119      chart.Series.Add(baselineSeries);
    119120
    120121      AddRegressionSolution(Content);
    … …  
    200201    }
    201202
    202     protected IEnumerable<double> GetMeanModelEstimatedValues(IEnumerable<double> originalValues) {
     203    protected IEnumerable<double> GetbaselineEstimatedValues(IEnumerable<double> originalValues) {
    203204      double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).Average();
    204205      return Enumerable.Repeat(averageTrainingTarget, originalValues.Count());
    … …  
    229230    }
    230231
    231     #region Mean Model
    232     private void chart_MouseDown(object sender, MouseEventArgs e) {
    233       if (e.Clicks < 2) return;
     232    #region Baseline
     233    private void Chart_MouseDoubleClick(object sender, MouseEventArgs e) {
    234234      HitTestResult result = chart.HitTest(e.X, e.Y);
    235235      if (result.ChartElementType != ChartElementType.LegendItem) return;
    236       if (result.Series.Name != constantModel.Name) return;
    237236
    238237      MainFormManager.MainForm.ShowContent((IRegressionSolution)result.Series.Tag);
    … …  
    242241      double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).Average();
    243242      var solution = new ConstantRegressionModel(averageTrainingTarget).CreateRegressionSolution(ProblemData);
    244       solution.Name = "Mean Model";
     243      solution.Name = "Baseline";
    245244      return solution;
    246245    }
    247246    #endregion
     247
     248    private void chart_MouseMove(object sender, MouseEventArgs e) {
     249      HitTestResult result = chart.HitTest(e.X, e.Y);
     250      if (result.ChartElementType == ChartElementType.LegendItem)
     251        Cursor = Cursors.Hand;
     252      else
     253        Cursor = Cursors.Default;
     254    }
    248255  }
    249256}

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionEstimatedValuesView.Designer.cs

    r7259 r8032  
    5050      this.AllowDrop = true;
    5151      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    52       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     52      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    5353      this.Name = "EstimatedValuesView";
    5454      this.Size = new System.Drawing.Size(310, 285);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.Designer.cs

    r7259 r8032  
    7272      this.AllowDrop = true;
    7373      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    74       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     74      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    7575      this.Controls.Add(this.chart);
    7676      this.Name = "RegressionSolutionLineChartView";

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs

    r7327 r8032  
    2626using System.Windows.Forms.DataVisualization.Charting;
    2727using HeuristicLab.MainForm;
    28 using HeuristicLab.MainForm.WindowsForms;
    2928
    3029namespace HeuristicLab.Problems.DataAnalysis.Views {
    … …  
    7271        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].LegendText = ESTIMATEDVALUES_TRAINING_SERIES_NAME;
    7372        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].ChartType = SeriesChartType.FastLine;
     73        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].EmptyPointStyle.Color = this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Color;
    7474        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Points.DataBindXY(Content.ProblemData.TrainingIndizes.ToArray(), Content.EstimatedTrainingValues.ToArray());
     75        this.InsertEmptyPoints(this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME]);
    7576        this.chart.Series[ESTIMATEDVALUES_TRAINING_SERIES_NAME].Tag = Content;
    7677        // test series
    … …  
    7980        this.chart.Series[ESTIMATEDVALUES_TEST_SERIES_NAME].ChartType = SeriesChartType.FastLine;
    8081        this.chart.Series[ESTIMATEDVALUES_TEST_SERIES_NAME].Points.DataBindXY(Content.ProblemData.TestIndizes.ToArray(), Content.EstimatedTestValues.ToArray());
     82        this.InsertEmptyPoints(this.chart.Series[ESTIMATEDVALUES_TEST_SERIES_NAME]);
    8183        this.chart.Series[ESTIMATEDVALUES_TEST_SERIES_NAME].Tag = Content;
    8284        // series of remaining points
    … …  
    8486        var estimatedValues = Content.EstimatedValues.ToArray();
    8587        List<double> allEstimatedValues = allIndizes.Select(index => estimatedValues[index]).ToList();
    86 
    8788        this.chart.Series.Add(ESTIMATEDVALUES_ALL_SERIES_NAME);
    8889        this.chart.Series[ESTIMATEDVALUES_ALL_SERIES_NAME].LegendText = ESTIMATEDVALUES_ALL_SERIES_NAME;
    8990        this.chart.Series[ESTIMATEDVALUES_ALL_SERIES_NAME].ChartType = SeriesChartType.FastLine;
    9091        this.chart.Series[ESTIMATEDVALUES_ALL_SERIES_NAME].Points.DataBindXY(allIndizes, allEstimatedValues);
     92        this.InsertEmptyPoints(this.chart.Series[ESTIMATEDVALUES_ALL_SERIES_NAME]);
    9193        this.chart.Series[ESTIMATEDVALUES_ALL_SERIES_NAME].Tag = Content;
    9294        this.ToggleSeriesData(this.chart.Series[ESTIMATEDVALUES_ALL_SERIES_NAME]);
    … …  
    9496        UpdateCursorInterval();
    9597        this.UpdateStripLines();
     98      }
     99    }
     100
     101    private void InsertEmptyPoints(Series series) {
     102      int i = 0;
     103      while (i < series.Points.Count - 1) {
     104        if (series.Points[i].IsEmpty) {
     105          ++i;
     106          continue;
     107        }
     108
     109        var p1 = series.Points[i];
     110        var p2 = series.Points[i + 1];
     111        // check for consecutive indices
     112        if ((int)p2.XValue - (int)p1.XValue != 1) {
     113          // insert an empty point between p1 and p2 so that the line will be invisible (transparent)
     114          var p = new DataPoint((int)((p1.XValue + p2.XValue) / 2), 0.0) { IsEmpty = true };
     115          series.Points.Insert(i + 1, p);
     116        }
     117        ++i;
    96118      }
    97119    }
    … …  
    196218      if (series.Points.Count > 0) {  //checks if series is shown
    197219        if (this.chart.Series.Any(s => s != series && s.Points.Count > 0)) {
    198           series.Points.Clear();
     220          ClearPointsQuick(series.Points);
    199221        }
    200222      } else if (Content != null) {
    … …  
    219241        }
    220242        series.Points.DataBindXY(indizes, predictedValues);
    221         chart.DataManipulator.InsertEmptyPoints(1, IntervalType.Number, series.Name);
     243        this.InsertEmptyPoints(series);
    222244        chart.Legends[series.Legend].ForeColor = Color.Black;
    223245        UpdateCursorInterval();
    224246        chart.Refresh();
    225247      }
     248    }
     249
     250    // workaround as per http://stackoverflow.com/questions/5744930/datapointcollection-clear-performance
     251    private static void ClearPointsQuick(DataPointCollection points) {
     252      points.SuspendUpdates();
     253      while (points.Count > 0)
     254        points.RemoveAt(points.Count - 1);
     255      points.ResumeUpdates();
    226256    }
    227257

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionScatterPlotView.cs

    r7259 r8032  
    119119      this.chart.ChartAreas[0].CursorX.Interval = zoomInterval;
    120120      this.chart.ChartAreas[0].CursorY.Interval = zoomInterval;
     121
     122      this.chart.ChartAreas[0].AxisX.ScaleView.SmallScrollSize = zoomInterval;
     123      this.chart.ChartAreas[0].AxisY.ScaleView.SmallScrollSize = zoomInterval;
     124
     125      this.chart.ChartAreas[0].AxisX.ScaleView.SmallScrollMinSizeType = DateTimeIntervalType.Number;
     126      this.chart.ChartAreas[0].AxisX.ScaleView.SmallScrollMinSize = zoomInterval;
     127      this.chart.ChartAreas[0].AxisY.ScaleView.SmallScrollMinSizeType = DateTimeIntervalType.Number;
     128      this.chart.ChartAreas[0].AxisY.ScaleView.SmallScrollMinSize = zoomInterval;
     129
     130      if (digits < 0) {
     131        this.chart.ChartAreas[0].AxisX.LabelStyle.Format = "F" + (int)Math.Abs(digits);
     132        this.chart.ChartAreas[0].AxisY.LabelStyle.Format = "F" + (int)Math.Abs(digits);
     133      } else {
     134        this.chart.ChartAreas[0].AxisX.LabelStyle.Format = "F0";
     135        this.chart.ChartAreas[0].AxisY.LabelStyle.Format = "F0";
     136      }
    121137    }
    122138

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/ClassificationEnsembleSolutionView.Designer.cs

    r7259 r8032  
    4545    private void InitializeComponent() {
    4646      components = new System.ComponentModel.Container();
    47       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     47      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    4848    }
    4949

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/ClassificationSolutionView.Designer.cs

    r7259 r8032  
    4646    private void InitializeComponent() {
    4747      components = new System.ComponentModel.Container();
    48       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     48      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    4949      this.itemsGroupBox.Text = "Classification Solution";
    5050    }

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/ClusteringSolutionView.Designer.cs

    r7259 r8032  
    7171      //
    7272      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    73       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     73      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    7474      this.Name = "ClusteringSolutionView";
    7575      this.splitContainer.Panel1.ResumeLayout(false);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DataAnalysisSolutionView.Designer.cs

    r7259 r8032  
    7070      //
    7171      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    72       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     72      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    7373      this.Name = "DataAnalysisSolutionView";
    7474      this.splitContainer.Panel1.ResumeLayout(false);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DiscriminantFunctionClassificationSolutionView.Designer.cs

    r7259 r8032  
    4646    private void InitializeComponent() {
    4747      components = new System.ComponentModel.Container();
    48       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     48      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    4949    }
    5050

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/NamedDataAnalysisSolutionView.Designer.cs

    r6652 r8032  
    4646      //
    4747      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    48       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     48      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    4949      this.Controls.Add(this.panel);
    5050      this.Name = "NamedDataAnalysisSolutionView";

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionEnsembleSolutionView.Designer.cs

    r7259 r8032  
    4545    private void InitializeComponent() {
    4646      components = new System.ComponentModel.Container();
    47       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     47      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    4848    }
    4949

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.Designer.cs

    r7468 r8032  
    7474      this.toolTip.SetToolTip(this.removeButton, "Remove");
    7575      //
    76       // btnImport
     76      // importButton
    7777      //
    7878      this.importButton.Location = new System.Drawing.Point(3, 4);
    79       this.importButton.Name = "btnImport";
     79      this.importButton.Name = "importButton";
    8080      this.importButton.Size = new System.Drawing.Size(75, 23);
    8181      this.importButton.TabIndex = 7;
    … …  
    9191      // RegressionSolutionView
    9292      //
    93       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    94       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     93      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
    9594      this.Name = "RegressionSolutionView";
    9695      this.splitContainer.Panel1.ResumeLayout(false);

  • branches/ChangeDatasetOfRegressionModel/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs

    r7487 r8032  
    4545    }
    4646
    47     protected override void SetEnabledStateOfControls() {
    48       base.SetEnabledStateOfControls();
    49       importButton.Enabled = !Locked && !ReadOnly && Content != null;
    50     }
    51 
    5247    #region drag and drop
    5348    protected override void itemsListView_DragEnter(object sender, DragEventArgs e) {
    … …  
    6560
    6661    protected void importButton_Click(object sender, EventArgs e) {
     62      if (Locked || ReadOnly || Content == null) {
     63        MessageBox.Show("The Regression Solution is read-only or locked. Save the solution and open it again or use " +
     64          "the 'Simplify' button to get a copy of the current solution. Import will then be enabled.");
     65        return;
     66      }
    6767      if (openFileDialog.ShowDialog(this) != DialogResult.OK) return;
    6868      ImportProblemData(openFileDialog.FileName);
Note: See TracChangeset for help on using the changeset viewer.