Changeset 7664


Ignore:
Timestamp:
03/27/12 10:05:59 (10 years ago)
Author:
sforsten
Message:

#1784:

  • added Keijzer, Korns, Vladislavleva und Nguyen regression problem instances
  • changes have been made in the ProblemView. Some parts have been replaced with views from Problems.Instances.Views
Location:
branches/ProblemInstancesRegressionAndClassification
Files:
61 added
2 deleted
25 edited

Legend:

Unmodified
Added
Removed
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab 3.3.sln

    r7610 r7664  
    2020Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization.Views-3.3", "HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj", "{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}"
    2121EndProject
     22Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Views-3.4", "HeuristicLab.Problems.Instances.Views\3.4\HeuristicLab.Problems.Instances.Views-3.4.csproj", "{1BFDCC58-E228-46DE-A36E-8503194B434D}"
     23EndProject
    2224Global
    2325  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    2426    Debug|Any CPU = Debug|Any CPU
     27    Debug|Mixed Platforms = Debug|Mixed Platforms
    2528    Debug|x64 = Debug|x64
    2629    Debug|x86 = Debug|x86
    2730    Release|Any CPU = Release|Any CPU
     31    Release|Mixed Platforms = Release|Mixed Platforms
    2832    Release|x64 = Release|x64
    2933    Release|x86 = Release|x86
     
    3236    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    3337    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Any CPU.Build.0 = Debug|Any CPU
     38    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     39    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|Mixed Platforms.Build.0 = Debug|x86
    3440    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x64.ActiveCfg = Debug|x64
    3541    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Debug|x64.Build.0 = Debug|x64
     
    3844    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Any CPU.ActiveCfg = Release|Any CPU
    3945    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Any CPU.Build.0 = Release|Any CPU
     46    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Mixed Platforms.ActiveCfg = Release|x86
     47    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|Mixed Platforms.Build.0 = Release|x86
    4048    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x64.ActiveCfg = Release|x64
    4149    {DF87C13E-A889-46FF-8153-66DCAA8C5674}.Release|x64.Build.0 = Release|x64
     
    4452    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    4553    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Debug|Any CPU.Build.0 = Debug|Any CPU
     54    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     55    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Debug|Mixed Platforms.Build.0 = Debug|x86
    4656    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Debug|x64.ActiveCfg = Debug|x64
    4757    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Debug|x64.Build.0 = Debug|x64
     
    5060    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Release|Any CPU.ActiveCfg = Release|Any CPU
    5161    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Release|Any CPU.Build.0 = Release|Any CPU
     62    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Release|Mixed Platforms.ActiveCfg = Release|x86
     63    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Release|Mixed Platforms.Build.0 = Release|x86
    5264    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Release|x64.ActiveCfg = Release|x64
    5365    {3E9E8944-44FF-40BB-A622-3A4A7DD0F198}.Release|x64.Build.0 = Release|x64
     
    5668    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    5769    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|Any CPU.Build.0 = Debug|Any CPU
     70    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     71    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|Mixed Platforms.Build.0 = Debug|x86
    5872    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|x64.ActiveCfg = Debug|x64
    5973    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Debug|x64.Build.0 = Debug|x64
     
    6276    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|Any CPU.ActiveCfg = Release|Any CPU
    6377    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|Any CPU.Build.0 = Release|Any CPU
     78    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|Mixed Platforms.ActiveCfg = Release|x86
     79    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|Mixed Platforms.Build.0 = Release|x86
    6480    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|x64.ActiveCfg = Release|x64
    6581    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|x64.Build.0 = Release|x64
     
    6884    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    6985    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
     86    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     87    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    7088    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|x64.ActiveCfg = Debug|Any CPU
    7189    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|x86.ActiveCfg = Debug|Any CPU
    7290    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
    7391    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|Any CPU.Build.0 = Release|Any CPU
     92    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     93    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    7494    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|x64.ActiveCfg = Release|Any CPU
    7595    {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|x86.ActiveCfg = Release|Any CPU
    7696    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    7797    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Any CPU.Build.0 = Debug|Any CPU
     98    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     99    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
    78100    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|x64.ActiveCfg = Debug|Any CPU
    79101    {1CC61973-7706-42DC-8023-310F591AB02B}.Debug|x86.ActiveCfg = Debug|Any CPU
    80102    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Any CPU.ActiveCfg = Release|Any CPU
    81103    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Any CPU.Build.0 = Release|Any CPU
     104    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     105    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
    82106    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|x64.ActiveCfg = Release|Any CPU
    83107    {1CC61973-7706-42DC-8023-310F591AB02B}.Release|x86.ActiveCfg = Release|Any CPU
    84108    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    85109    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|Any CPU.Build.0 = Debug|Any CPU
     110    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
     111    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|Mixed Platforms.Build.0 = Debug|x64
    86112    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|x64.ActiveCfg = Debug|x64
    87113    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Debug|x64.Build.0 = Debug|x64
     
    90116    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|Any CPU.ActiveCfg = Release|Any CPU
    91117    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|Any CPU.Build.0 = Release|Any CPU
     118    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|Mixed Platforms.ActiveCfg = Release|x64
     119    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|Mixed Platforms.Build.0 = Release|x64
    92120    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|x64.ActiveCfg = Release|x64
    93121    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|x64.Build.0 = Release|x64
    94122    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|x86.ActiveCfg = Release|x86
    95123    {662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}.Release|x86.Build.0 = Release|x86
     124    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Debug|Any CPU.ActiveCfg = Debug|x86
     125    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     126    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Debug|Mixed Platforms.Build.0 = Debug|x86
     127    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Debug|x64.ActiveCfg = Debug|x86
     128    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Debug|x86.ActiveCfg = Debug|x86
     129    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Debug|x86.Build.0 = Debug|x86
     130    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Release|Any CPU.ActiveCfg = Release|Any CPU
     131    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Release|Any CPU.Build.0 = Release|Any CPU
     132    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Release|Mixed Platforms.ActiveCfg = Release|x86
     133    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Release|Mixed Platforms.Build.0 = Release|x86
     134    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Release|x64.ActiveCfg = Release|x86
     135    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Release|x86.ActiveCfg = Release|x86
     136    {1BFDCC58-E228-46DE-A36E-8503194B434D}.Release|x86.Build.0 = Release|x86
    96137  EndGlobalSection
    97138  GlobalSection(SolutionProperties) = preSolution
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj

    r7610 r7664  
    188188      <SubType>UserControl</SubType>
    189189    </Compile>
    190     <Compile Include="ProblemView.designer.cs">
     190    <Compile Include="ProblemView.Designer.cs">
    191191      <DependentUpon>ProblemView.cs</DependentUpon>
    192192    </Compile>
     
    305305      <DependentUpon>EngineAlgorithmView.cs</DependentUpon>
    306306    </Compile>
    307     <Compile Include="HeuristicOptimizationProblemView.cs">
    308       <SubType>UserControl</SubType>
    309     </Compile>
    310     <Compile Include="HeuristicOptimizationProblemView.Designer.cs">
    311       <DependentUpon>HeuristicOptimizationProblemView.cs</DependentUpon>
    312     </Compile>
    313307    <Compile Include="Properties\AssemblyInfo.cs" />
    314308    <Compile Include="ResultCollectionView.cs">
     
    330324  </ItemGroup>
    331325  <ItemGroup>
     326    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.Views\3.4\HeuristicLab.Problems.Instances.Views-3.4.csproj">
     327      <Project>{1BFDCC58-E228-46DE-A36E-8503194B434D}</Project>
     328      <Name>HeuristicLab.Problems.Instances.Views-3.4</Name>
     329    </ProjectReference>
    332330    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
    333331      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
    334332      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     333      <Private>False</Private>
    335334    </ProjectReference>
    336335  </ItemGroup>
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/ProblemInstanceProviderView.cs

    r7610 r7664  
    4949      toolTip.SetToolTip(exportButton, "Export a " + GetProblemType() + " instance to a file.");
    5050      loadButton.Text = String.Empty;
    51       loadButton.Image = VSImageLibrary.Checkout;
     51      loadButton.Image = VSImageLibrary.RefreshDocument;
    5252      toolTip.SetToolTip(loadButton, "Load the selected instance.");
    5353    }
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/ProblemView.Designer.cs

    r7259 r7664  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.problemInstanceSplitContainer = new System.Windows.Forms.SplitContainer();
     48      this.problemInstanceConsumerView = new HeuristicLab.Problems.Instances.Views.ProblemInstanceConsumerView();
    4749      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
     50      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
     51      this.problemInstanceSplitContainer.Panel1.SuspendLayout();
     52      this.problemInstanceSplitContainer.Panel2.SuspendLayout();
     53      this.problemInstanceSplitContainer.SuspendLayout();
    4854      this.SuspendLayout();
     55      //
     56      // parameterCollectionView
     57      //
     58      this.parameterCollectionView.Location = new System.Drawing.Point(6, 27);
     59      this.parameterCollectionView.Size = new System.Drawing.Size(501, 303);
    4960      //
    5061      // nameTextBox
     
    5263      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    5364      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
     65      this.nameTextBox.Location = new System.Drawing.Point(47, 1);
     66      this.nameTextBox.Size = new System.Drawing.Size(438, 20);
     67      //
     68      // nameLabel
     69      //
     70      this.nameLabel.Location = new System.Drawing.Point(3, 6);
     71      //
     72      // infoLabel
     73      //
     74      this.infoLabel.Location = new System.Drawing.Point(491, 4);
     75      //
     76      // problemInstanceSplitContainer
     77      //
     78      this.problemInstanceSplitContainer.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     79                  | System.Windows.Forms.AnchorStyles.Left)
     80                  | System.Windows.Forms.AnchorStyles.Right)));
     81      this.problemInstanceSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
     82      this.problemInstanceSplitContainer.IsSplitterFixed = true;
     83      this.problemInstanceSplitContainer.Location = new System.Drawing.Point(0, 0);
     84      this.problemInstanceSplitContainer.Name = "problemInstanceSplitContainer";
     85      this.problemInstanceSplitContainer.Orientation = System.Windows.Forms.Orientation.Horizontal;
     86      //
     87      // problemInstanceSplitContainer.Panel1
     88      //
     89      this.problemInstanceSplitContainer.Panel1.Controls.Add(this.problemInstanceConsumerView);
     90      this.problemInstanceSplitContainer.Panel1MinSize = 10;
     91      //
     92      // problemInstanceSplitContainer.Panel2
     93      //
     94      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.nameLabel);
     95      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.nameTextBox);
     96      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.parameterCollectionView);
     97      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.infoLabel);
     98      this.problemInstanceSplitContainer.Size = new System.Drawing.Size(511, 363);
     99      this.problemInstanceSplitContainer.SplitterDistance = 26;
     100      this.problemInstanceSplitContainer.TabIndex = 13;
     101      //
     102      // problemInstanceConsumerView
     103      //
     104      this.problemInstanceConsumerView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     105                  | System.Windows.Forms.AnchorStyles.Left)
     106                  | System.Windows.Forms.AnchorStyles.Right)));
     107      this.problemInstanceConsumerView.Caption = "ProblemInstanceProviderView";
     108      this.problemInstanceConsumerView.Content = null;
     109      this.problemInstanceConsumerView.Location = new System.Drawing.Point(0, 0);
     110      this.problemInstanceConsumerView.Name = "problemInstanceConsumerView";
     111      this.problemInstanceConsumerView.ReadOnly = false;
     112      this.problemInstanceConsumerView.Size = new System.Drawing.Size(511, 25);
     113      this.problemInstanceConsumerView.TabIndex = 0;
    54114      //
    55115      // ProblemView
     
    57117      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    58118      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     119      this.Controls.Add(this.problemInstanceSplitContainer);
    59120      this.Name = "ProblemView";
     121      this.Size = new System.Drawing.Size(511, 363);
    60122      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
     123      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
     124      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
     125      this.problemInstanceSplitContainer.Panel2.PerformLayout();
     126      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).EndInit();
     127      this.problemInstanceSplitContainer.ResumeLayout(false);
    61128      this.ResumeLayout(false);
    62       this.PerformLayout();
    63129
    64130    }
     
    66132    #endregion
    67133
    68 
     134    protected System.Windows.Forms.SplitContainer problemInstanceSplitContainer;
     135    protected HeuristicLab.Problems.Instances.Views.ProblemInstanceConsumerView problemInstanceConsumerView;
    69136  }
    70137}
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Optimization.Views/3.3/ProblemView.cs

    r7259 r7664  
    2020#endregion
    2121
     22using System.Windows.Forms;
    2223using HeuristicLab.Core.Views;
    2324using HeuristicLab.MainForm;
     25using HeuristicLab.Problems.Instances;
    2426
    2527namespace HeuristicLab.Optimization.Views {
     
    4446    protected override void OnContentChanged() {
    4547      base.OnContentChanged();
     48      //Check if IProblem implements IProblemInstancesConsumer interface
     49      problemInstanceConsumerView.Content = (IProblemInstanceConsumer)Content;
     50      problemInstanceSplitContainer.Panel1Collapsed = !problemInstanceConsumerView.ContainsProviders();
     51      SetEnabledStateOfControls();
     52    }
     53
     54    protected override void SetEnabledStateOfControls() {
     55      base.SetEnabledStateOfControls();
    4656    }
    4757  }
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.Designer.cs

    r7259 r7664  
    4545    /// </summary>
    4646    private void InitializeComponent() {
     47      this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
    4748      this.ImportButton = new System.Windows.Forms.Button();
    48       this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
     49      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).BeginInit();
     50      this.problemInstanceSplitContainer.Panel1.SuspendLayout();
     51      this.problemInstanceSplitContainer.Panel2.SuspendLayout();
     52      this.problemInstanceSplitContainer.SuspendLayout();
    4953      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5054      this.SuspendLayout();
    5155      //
     56      // problemInstanceSplitContainer
     57      //
     58      //
     59      // problemInstanceSplitContainer.Panel2
     60      //
     61      this.problemInstanceSplitContainer.Panel2.Controls.Add(this.ImportButton);
     62      //
    5263      // parameterCollectionView
    5364      //
    54       this.parameterCollectionView.Location = new System.Drawing.Point(3, 55);
    55       this.parameterCollectionView.Size = new System.Drawing.Size(490, 279);
    56       this.parameterCollectionView.TabIndex = 4;
     65      this.parameterCollectionView.Location = new System.Drawing.Point(6, 56);
     66      this.parameterCollectionView.Size = new System.Drawing.Size(501, 274);
    5767      //
    5868      // nameTextBox
     
    6070      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
    6171      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
    62       this.nameTextBox.Size = new System.Drawing.Size(409, 20);
    63       //
    64       // infoLabel
    65       //
    66       this.infoLabel.Location = new System.Drawing.Point(474, 3);
    67       //
    68       // ImportButton
    69       //
    70       this.ImportButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    71                   | System.Windows.Forms.AnchorStyles.Right)));
    72       this.ImportButton.Location = new System.Drawing.Point(0, 26);
    73       this.ImportButton.Name = "ImportButton";
    74       this.ImportButton.Size = new System.Drawing.Size(493, 23);
    75       this.ImportButton.TabIndex = 3;
    76       this.ImportButton.Text = "Import from CSV file";
    77       this.ImportButton.UseVisualStyleBackColor = true;
    78       this.ImportButton.Click += new System.EventHandler(this.ImportButton_Click);
    7972      //
    8073      // openFileDialog
     
    8376      this.openFileDialog.Title = "Import data...";
    8477      //
     78      // ImportButton
     79      //
     80      this.ImportButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     81                  | System.Windows.Forms.AnchorStyles.Right)));
     82      this.ImportButton.Location = new System.Drawing.Point(6, 27);
     83      this.ImportButton.Name = "ImportButton";
     84      this.ImportButton.Size = new System.Drawing.Size(501, 23);
     85      this.ImportButton.TabIndex = 14;
     86      this.ImportButton.Text = "Import from CSV file";
     87      this.ImportButton.UseVisualStyleBackColor = true;
     88      this.ImportButton.Click += new System.EventHandler(this.ImportButton_Click);
     89      //
    8590      // DataAnalysisProblemView
    8691      //
    8792      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    8893      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    89       this.Controls.Add(this.ImportButton);
    9094      this.Name = "DataAnalysisProblemView";
    91       this.Size = new System.Drawing.Size(493, 334);
    92       this.Controls.SetChildIndex(this.ImportButton, 0);
    93       this.Controls.SetChildIndex(this.infoLabel, 0);
    94       this.Controls.SetChildIndex(this.nameTextBox, 0);
    95       this.Controls.SetChildIndex(this.nameLabel, 0);
    96       this.Controls.SetChildIndex(this.parameterCollectionView, 0);
     95      this.problemInstanceSplitContainer.Panel1.ResumeLayout(false);
     96      this.problemInstanceSplitContainer.Panel1.PerformLayout();
     97      this.problemInstanceSplitContainer.Panel2.ResumeLayout(false);
     98      this.problemInstanceSplitContainer.Panel2.PerformLayout();
     99      ((System.ComponentModel.ISupportInitialize)(this.problemInstanceSplitContainer)).EndInit();
     100      this.problemInstanceSplitContainer.ResumeLayout(false);
    97101      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
    98102      this.ResumeLayout(false);
    99       this.PerformLayout();
    100103
    101104    }
     
    103106    #endregion
    104107
     108    private System.Windows.Forms.OpenFileDialog openFileDialog;
    105109    private System.Windows.Forms.Button ImportButton;
    106     private System.Windows.Forms.OpenFileDialog openFileDialog;
    107110  }
    108111}
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r7610 r7664  
    308308      <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
    309309    </Compile>
     310    <Compile Include="DataAnalysisProblemView.cs">
     311      <SubType>UserControl</SubType>
     312    </Compile>
     313    <Compile Include="DataAnalysisProblemView.Designer.cs">
     314      <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>
     315    </Compile>
    310316    <None Include="HeuristicLab.snk" />
    311317    <None Include="Plugin.cs.frame" />
    312318    <None Include="Properties\AssemblyInfo.cs.frame" />
    313     <Compile Include="DataAnalysisProblemView.cs">
    314       <SubType>UserControl</SubType>
    315     </Compile>
    316     <Compile Include="DataAnalysisProblemView.Designer.cs">
    317       <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>
    318     </Compile>
    319319    <Compile Include="Properties\AssemblyInfo.cs" />
    320320  </ItemGroup>
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionProblemView.cs

    r7610 r7664  
    2727  [View("Regression Problem View")]
    2828  [Content(typeof(RegressionProblem), true)]
    29   public partial class RegressionProblemView : HeuristicOptimizationProblemView {
     29  public partial class RegressionProblemView : ProblemView {
    3030    public new RegressionProblem Content {
    3131      get { return (RegressionProblem)base.Content; }
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

    r7610 r7664  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Linq;
    2225using HeuristicLab.Common;
    2326using HeuristicLab.Core;
     
    3033  [Creatable("Problems")]
    3134  public class RegressionProblem : DataAnalysisProblem<IRegressionProblemData>, IRegressionProblem, IStorableContent,
    32     IProblemInstanceConsumer<RegressionData> {
     35    IProblemInstanceConsumer<RegressionData>, IProblemInstanceExporter<RegressionData>, IProblemInstanceConsumer {
    3336    public string Filename { get; set; }
    3437
     
    5962      OnReset();
    6063    }
     64
     65    public RegressionData Export() {
     66      if (!ProblemData.InputVariables.Count.Equals(ProblemData.Dataset.DoubleVariables.Count()))
     67        throw new ArgumentException("Not all input variables are double variables! (Export only works with double variables)");
     68
     69      RegressionData regData = new RegressionData();
     70      regData.Name = Name;
     71      regData.Description = Description;
     72      regData.TargetVariable = ProblemData.TargetVariable;
     73      regData.InputVariables = ProblemData.InputVariables.Select(x => x.Value);
     74      regData.AllowedInputVariables = ProblemData.AllowedInputVariables;
     75      regData.TrainingPartitionStart = ProblemData.TrainingPartition.Start;
     76      regData.TrainingPartitionEnd = ProblemData.TrainingPartition.End;
     77      regData.TestPartitionStart = ProblemData.TestPartition.Start;
     78      regData.TestPartitionEnd = ProblemData.TestPartition.End;
     79
     80      List<List<double>> data = new List<List<double>>();
     81      foreach (var variable in ProblemData.Dataset.DoubleVariables) {
     82        data.Add(ProblemData.Dataset.GetDoubleValues(variable).ToList());
     83      }
     84      regData.Values = Transformation(data);
     85
     86      return regData;
     87    }
     88
     89    public static double[,] Transformation(List<List<double>> data) {
     90      if (!data.All(x => x.Count.Equals(data.First().Count)))
     91        throw new ArgumentException("Can't create jagged array.");
     92      double[,] values = new double[data.First().Count, data.Count];
     93      for (int i = 0; i < values.GetLength(0); i++) {
     94        for (int j = 0; j < values.GetLength(1); j++) {
     95          values[i, j] = data[j][i];
     96        }
     97      }
     98      return values;
     99    }
    61100  }
    62101}
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression.Views/3.4/HeuristicLab.Problems.Instances.Regression.Views-3.4.csproj

    r7610 r7664  
    3838  </PropertyGroup>
    3939  <ItemGroup>
    40     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    41     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    42     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    43     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     40    <Reference Include="HeuristicLab.Common-3.3">
     41      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     42    </Reference>
     43    <Reference Include="HeuristicLab.MainForm-3.3">
     44      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     45    </Reference>
     46    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
     47      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     48    </Reference>
     49    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     50      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     51    </Reference>
    4452    <Reference Include="System" />
    4553    <Reference Include="System.Core" />
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression.Views/3.4/Properties/AssemblyInfo.cs

    r7610 r7664  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.4.0.0")]
    57 [assembly: AssemblyFileVersion("3.4.0.7603")]
     57[assembly: AssemblyFileVersion("3.4.0.7610")]
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionDataDescriptor.cs

    r7603 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionInstanceProvider.cs

    r7603 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/HeuristicLab.Problems.Instances.Regression-3.4.csproj

    r7610 r7664  
    3838  </PropertyGroup>
    3939  <ItemGroup>
    40     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    41     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    42     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    43     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    44     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     40    <Reference Include="HeuristicLab.Common-3.3">
     41      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     42    </Reference>
     43    <Reference Include="HeuristicLab.Core-3.3">
     44      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     45    </Reference>
     46    <Reference Include="HeuristicLab.Optimization-3.3">
     47      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     48    </Reference>
     49    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     50      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     51    </Reference>
     52    <Reference Include="HeuristicLab.Random-3.3">
     53      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
     54    </Reference>
    4555    <Reference Include="System" />
    4656    <Reference Include="System.Core" />
     
    5262  </ItemGroup>
    5363  <ItemGroup>
     64    <Compile Include="Keijzer\KeijzerFunctionTwelve.cs" />
     65    <Compile Include="Keijzer\KeijzerFunctionThirteen.cs" />
     66    <Compile Include="Keijzer\KeijzerFunctionSixteen.cs" />
     67    <Compile Include="Keijzer\KeijzerFunctionSix.cs" />
     68    <Compile Include="Keijzer\KeijzerFunctionSeven.cs" />
     69    <Compile Include="Keijzer\KeijzerFunctionFour.cs" />
     70    <Compile Include="Keijzer\KeijzerFunctionFifteen.cs" />
    5471    <Compile Include="Keijzer\KeijzerFunctionEight.cs" />
     72    <Compile Include="Korns\KornsFunctionTwo.cs" />
     73    <Compile Include="Korns\KornsFunctionTwelve.cs" />
     74    <Compile Include="Korns\KornsFunctionThree.cs" />
     75    <Compile Include="Korns\KornsFunctionThirteen.cs" />
     76    <Compile Include="Korns\KornsFunctionTen.cs" />
     77    <Compile Include="Korns\KornsFunctionSix.cs" />
     78    <Compile Include="Korns\KornsFunctionSeven.cs" />
     79    <Compile Include="Korns\KornsFunctionOne.cs" />
     80    <Compile Include="Korns\KornsFunctionNine.cs" />
     81    <Compile Include="Korns\KornsFunctionFourteen.cs" />
     82    <Compile Include="Korns\KornsFunctionFour.cs" />
     83    <Compile Include="Korns\KornsFunctionFiveteen.cs" />
     84    <Compile Include="Korns\KornsFunctionFive.cs" />
     85    <Compile Include="Korns\KornsFunctionEleven.cs" />
     86    <Compile Include="Korns\KornsFunctionEight.cs" />
     87    <Compile Include="Korns\KornsInstanceProvider.cs" />
     88    <Compile Include="Nguyen\NguyenFunctionTwo.cs" />
     89    <Compile Include="Nguyen\NguyenFunctionTwelve.cs" />
     90    <Compile Include="Nguyen\NguyenFunctionThree.cs" />
     91    <Compile Include="Nguyen\NguyenFunctionTen.cs" />
     92    <Compile Include="Nguyen\NguyenFunctionSix.cs" />
     93    <Compile Include="Nguyen\NguyenFunctionSeven.cs" />
     94    <Compile Include="Nguyen\NguyenFunctionOne.cs" />
     95    <Compile Include="Nguyen\NguyenFunctionNine.cs" />
     96    <Compile Include="Nguyen\NguyenFunctionFour.cs" />
     97    <Compile Include="Nguyen\NguyenFunctionFive.cs" />
     98    <Compile Include="Nguyen\NguyenFunctionEleven.cs" />
     99    <Compile Include="Nguyen\NguyenFunctionEight.cs" />
     100    <Compile Include="Nguyen\NguyenInstanceProvider.cs" />
    55101    <Compile Include="Plugin.cs" />
    56102    <Compile Include="ResourceRegressionInstanceProvider.cs" />
     
    62108    <Compile Include="RegressionInstanceProvider.cs" />
    63109    <Compile Include="ValueGenerator.cs" />
     110    <Compile Include="Vladislavleva\UnwrappedBallFunctionFiveDimensional.cs" />
     111    <Compile Include="Vladislavleva\SineCosineFunction.cs" />
     112    <Compile Include="Vladislavleva\SalutowiczFunctionTwoDimensional.cs" />
     113    <Compile Include="Vladislavleva\SalutowiczFunctionOneDimensional.cs" />
     114    <Compile Include="Vladislavleva\RippleFunction.cs" />
     115    <Compile Include="Vladislavleva\RationalPolynomialTwoDimensional.cs" />
     116    <Compile Include="Vladislavleva\RationalPolynomialThreeDimensional.cs" />
     117    <Compile Include="Vladislavleva\KotanchekFunction.cs" />
     118    <Compile Include="Vladislavleva\VladislavlevaInstanceProvider.cs" />
    64119  </ItemGroup>
    65120  <ItemGroup>
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionEight.cs

    r7603 r7664  
    1 using System;
     1#region License Information
     2/* HeuristicLab
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 *
     5 * This file is part of HeuristicLab.
     6 *
     7 * HeuristicLab is free software: you can redistribute it and/or modify
     8 * it under the terms of the GNU General Public License as published by
     9 * the Free Software Foundation, either version 3 of the License, or
     10 * (at your option) any later version.
     11 *
     12 * HeuristicLab is distributed in the hope that it will be useful,
     13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 * GNU General Public License for more details.
     16 *
     17 * You should have received a copy of the GNU General Public License
     18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
     19 */
     20#endregion
     21
     22using System;
    223using System.Collections.Generic;
    324
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerInstanceProvider.cs

    r7610 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2424
    2525namespace HeuristicLab.Problems.Instances.Regression {
    26   public class KeijzerInstanceProvider : ArtificialRegressionInstanceProvider, IProblemInstanceProvider<RegressionData> {
     26  public class KeijzerInstanceProvider : ArtificialRegressionInstanceProvider {
    2727    public override string Name {
    2828      get { return "Keijzer Benchmark Problems"; }
     
    4040    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    4141      List<IDataDescriptor> descriptorList = new List<IDataDescriptor>();
     42      descriptorList.Add(new KeijzerFunctionFour());
     43      descriptorList.Add(new KeijzerFunctionSix());
     44      descriptorList.Add(new KeijzerFunctionSeven());
    4245      descriptorList.Add(new KeijzerFunctionEight());
     46      descriptorList.Add(new KeijzerFunctionTwelve());
     47      descriptorList.Add(new KeijzerFunctionThirteen());
     48      descriptorList.Add(new KeijzerFunctionFifteen());
     49      descriptorList.Add(new KeijzerFunctionSixteen());
    4350      return descriptorList;
    4451    }
    45 
    46     /*#region delete after test
    47     public RegressionData LoadData(IDataDescriptor descriptor) {
    48       throw new NotImplementedException();
    49     }
    50 
    51     public RegressionData LoadData(string path) {
    52       TableFileParser csvFileParser = new TableFileParser();
    53       csvFileParser.Parse(path);
    54 
    55       RegressionData regData = new RegressionData();
    56       regData.Name = path;
    57       regData.InputVariables = new List<string>(csvFileParser.VariableNames);
    58       regData.TargetVariable = csvFileParser.VariableNames.Last();
    59       //convert to multidimensional array
    60       double[][] values = csvFileParser.Values.Cast<double[]>().ToArray();
    61       regData.Values = new double[values.GetLength(0), values.GetLength(1)];
    62       for (int i = 0; i < values.GetLength(0); i++) {
    63         for (int j = 0; j < values.GetLength(1); j++) {
    64           regData.Values[i, j] = values[i][j];
    65         }
    66       }
    67 
    68       int trainingPartEnd = csvFileParser.Rows * 2 / 3;
    69       regData.TrainingPartitionStart = 0;
    70       regData.TrainingPartitionEnd = trainingPartEnd;
    71       regData.TestPartitionStart = trainingPartEnd;
    72       regData.TestPartitionEnd = csvFileParser.Rows;
    73       return regData;
    74     }
    75 
    76     public void SaveData(RegressionData instance, string path) {
    77       StringBuilder strBuilder = new StringBuilder();
    78 
    79       foreach (var variable in instance.InputVariables) {
    80         strBuilder.Append(variable + ";");
    81       }
    82       strBuilder.Remove(strBuilder.Length - 1, 1);
    83       strBuilder.AppendLine();
    84 
    85       double[,] values = instance.Values;
    86 
    87       for (int i = 0; i < values.GetLength(0); i++) {
    88         for (int j = 0; j < values.GetLength(1); j++) {
    89           strBuilder.Append(values[i, j] + ";");
    90         }
    91         strBuilder.Remove(strBuilder.Length - 1, 1);
    92         strBuilder.AppendLine();
    93       }
    94 
    95       using (StreamWriter writer = new StreamWriter(path)) {
    96         writer.Write(strBuilder);
    97       }
    98     }
    99     #endregion
    100 
    101     #region IProblemInstanceProvider<RegressionData> Members
    102 
    103     public IProblemInstanceConsumer<RegressionData> Consumer {
    104       get {
    105         return new RegressionProblem();
    106       }
    107       set {
    108         throw new NotImplementedException();
    109       }
    110     }
    111 
    112     #endregion       */
    11352  }
    11453}
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Properties/AssemblyInfo.cs

    r7610 r7664  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.4.0.0")]
    57 [assembly: AssemblyFileVersion("3.4.0.7603")]
     57[assembly: AssemblyFileVersion("3.4.0.7610")]
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/RegressionInstanceProvider.cs

    r7610 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionDataDescriptor.cs

    r7603 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ResourceRegressionInstanceProvider.cs

    r7603 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ValueGenerator.cs

    r7610 r7664  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    3030
    3131    public static double[,] Transformation(List<List<double>> data) {
     32      if (!data.All(x => x.Count.Equals(data.First().Count)))
     33        throw new ArgumentException("Can't create jagged array.");
    3234      double[,] values = new double[data.First().Count, data.Count];
    3335      for (int i = 0; i < values.GetLength(0); i++) {
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

    r7603 r7664  
    113113  <ItemGroup>
    114114    <None Include="Plugin.cs.frame" />
     115    <Compile Include="IProblemInstanceExporter.cs" />
    115116    <Compile Include="IExportable.cs" />
    116117    <Compile Include="TableFileParser.cs" />
  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/IProblemInstanceConsumer.cs

    r7548 r7664  
    2020#endregion
    2121
     22using HeuristicLab.Common;
     23
    2224namespace HeuristicLab.Problems.Instances {
     25  public interface IProblemInstanceConsumer : IContent { }
     26
    2327  public interface IProblemInstanceConsumer<TData> {
    2428    /// <summary>
Note: See TracChangeset for help on using the changeset viewer.