Changeset 7849


Ignore:
Timestamp:
05/21/12 10:19:26 (7 years ago)
Author:
sforsten
Message:

#1784:

  • added project HeuristicLab.Problem.Instances.DataAnalysis and deleted HeuristicLab.Problem.Instances.Classification and HeuristicLab.Problem.Instances.Regression
  • buttons are now big enough for the icons
Location:
trunk/sources
Files:
87 added
3 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r7830 r7849  
    296296Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Views-3.3", "HeuristicLab.Problems.Instances.Views\3.3\HeuristicLab.Problems.Instances.Views-3.3.csproj", "{B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}"
    297297EndProject
    298 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Regression-3.3", "HeuristicLab.Problems.Instances.Regression\3.3\HeuristicLab.Problems.Instances.Regression-3.3.csproj", "{26BF13E1-C8B2-4ACE-862D-EBFD360116B3}"
    299 EndProject
    300 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.Classification-3.3", "HeuristicLab.Problems.Instances.Classification\3.3\HeuristicLab.Problems.Instances.Classification-3.3.csproj", "{1BBFCD5B-8A1C-4225-A682-ADEC7800E683}"
     298Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.DataAnalysis-3.3", "HeuristicLab.Problems.Instances.DataAnalysis\3.3\HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj", "{94C7714E-29D4-4D6D-B213-2C18D627AB75}"
    301299EndProject
    302300Global
     
    14491447    {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}.Release|x64.ActiveCfg = Release|Any CPU
    14501448    {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}.Release|x86.ActiveCfg = Release|Any CPU
    1451     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1452     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1453     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|x64.ActiveCfg = Debug|Any CPU
    1454     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Debug|x86.ActiveCfg = Debug|Any CPU
    1455     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1456     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|Any CPU.Build.0 = Release|Any CPU
    1457     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|x64.ActiveCfg = Release|Any CPU
    1458     {26BF13E1-C8B2-4ACE-862D-EBFD360116B3}.Release|x86.ActiveCfg = Release|Any CPU
    1459     {1BBFCD5B-8A1C-4225-A682-ADEC7800E683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1460     {1BBFCD5B-8A1C-4225-A682-ADEC7800E683}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1461     {1BBFCD5B-8A1C-4225-A682-ADEC7800E683}.Debug|x64.ActiveCfg = Debug|Any CPU
    1462     {1BBFCD5B-8A1C-4225-A682-ADEC7800E683}.Debug|x86.ActiveCfg = Debug|Any CPU
    1463     {1BBFCD5B-8A1C-4225-A682-ADEC7800E683}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1464     {1BBFCD5B-8A1C-4225-A682-ADEC7800E683}.Release|Any CPU.Build.0 = Release|Any CPU
    1465     {1BBFCD5B-8A1C-4225-A682-ADEC7800E683}.Release|x64.ActiveCfg = Release|Any CPU
    1466     {1BBFCD5B-8A1C-4225-A682-ADEC7800E683}.Release|x86.ActiveCfg = Release|Any CPU
     1449    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1450    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1451    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|x64.ActiveCfg = Debug|Any CPU
     1452    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Debug|x86.ActiveCfg = Debug|Any CPU
     1453    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1454    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|Any CPU.Build.0 = Release|Any CPU
     1455    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x64.ActiveCfg = Release|Any CPU
     1456    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x86.ActiveCfg = Release|Any CPU
    14671457  EndGlobalSection
    14681458  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3

    • Property svn:ignore
      •  

        old new  
        22obj
        33*.vs10x
         4*.user
  • trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3

    • Property svn:ignore
      •  

        old new  
        22obj
        33*.vs10x
         4*.user
  • trunk/sources/HeuristicLab.Clients.Hive.Views/3.3

    • Property svn:ignore
      •  

        old new  
        22Plugin.cs
        33*.vs10x
         4*.user
  • trunk/sources/HeuristicLab.Clients.Hive/3.3

    • Property svn:ignore
      •  

        old new  
        33bin
        44*.vs10x
         5*.user
  • trunk/sources/HeuristicLab.Hive/3.3

    • Property svn:ignore
      •  

        old new  
        22Plugin.cs
        33*.vs10x
         4*.user
  • trunk/sources/HeuristicLab.Operators.Programmable.Views/3.3

    • Property svn:ignore
      •  

        old new  
        22obj
        33Plugin.cs
         4*.user
  • trunk/sources/HeuristicLab.Problems.Instances.TSPLIB.Views/3.3

    • Property svn:ignore
      •  

        old new  
        22bin
        33obj
         4*.user
  • trunk/sources/HeuristicLab.Problems.Instances.Views/3.3/ProblemInstanceConsumerView.Designer.cs

    r7805 r7849  
    6767      this.libraryInfoButton.Location = new System.Drawing.Point(226, -1);
    6868      this.libraryInfoButton.Name = "libraryInfoButton";
    69       this.libraryInfoButton.Size = new System.Drawing.Size(26, 23);
     69      this.libraryInfoButton.Size = new System.Drawing.Size(24, 24);
    7070      this.libraryInfoButton.TabIndex = 17;
    7171      this.libraryInfoButton.Text = "Info";
     
    8585      //
    8686      this.problemInstanceProviderViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    87             | System.Windows.Forms.AnchorStyles.Right)));
     87                  | System.Windows.Forms.AnchorStyles.Right)));
    8888      this.problemInstanceProviderViewHost.Caption = "View";
    8989      this.problemInstanceProviderViewHost.Content = null;
     
    106106      this.Controls.Add(this.libraryLabel);
    107107      this.Name = "ProblemInstanceConsumerView";
    108       this.Size = new System.Drawing.Size(694, 21);
     108      this.Size = new System.Drawing.Size(694, 22);
    109109      this.ResumeLayout(false);
    110110      this.PerformLayout();
  • trunk/sources/HeuristicLab.Problems.Instances.Views/3.3/ProblemInstanceProviderViewGeneric.Designer.cs

    r7758 r7849  
    6666      this.loadButton.Location = new System.Drawing.Point(604, 0);
    6767      this.loadButton.Name = "loadButton";
    68       this.loadButton.Size = new System.Drawing.Size(26, 23);
     68      this.loadButton.Size = new System.Drawing.Size(24, 24);
    6969      this.loadButton.TabIndex = 6;
    7070      this.loadButton.Text = "Load";
     
    9898      this.importButton.Location = new System.Drawing.Point(636, 0);
    9999      this.importButton.Name = "importButton";
    100       this.importButton.Size = new System.Drawing.Size(26, 23);
     100      this.importButton.Size = new System.Drawing.Size(24, 24);
    101101      this.importButton.TabIndex = 6;
    102102      this.importButton.Text = "Import";
     
    114114      this.exportButton.Location = new System.Drawing.Point(-1, 0);
    115115      this.exportButton.Name = "exportButton";
    116       this.exportButton.Size = new System.Drawing.Size(26, 23);
     116      this.exportButton.Size = new System.Drawing.Size(24, 24);
    117117      this.exportButton.TabIndex = 8;
    118118      this.exportButton.Text = "Export";
  • trunk/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

    r7846 r7849  
    114114    <Compile Include="ProblemInstanceManager.cs" />
    115115    <Compile Include="IProblemInstanceExporter.cs" />
    116     <Compile Include="TableFileParser.cs" />
    117116    <Compile Include="Types\ATSPData.cs" />
    118117    <Compile Include="Types\CTAPData.cs" />
  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3

    • Property svn:ignore
      •  

        old new  
        33Plugin.cs
        44*.vs10x
         5*.user
  • trunk/sources/HeuristicLab.Tests/HeuristicLab-3.3/SamplesTest.cs

    r7823 r7849  
    4444using HeuristicLab.Problems.DataAnalysis.Symbolic.Classification;
    4545using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
     46using HeuristicLab.Problems.Instances.DataAnalysis;
    4647using HeuristicLab.Problems.Instances.TSPLIB;
    4748using HeuristicLab.Problems.Knapsack;
     
    5354using HeuristicLab.Selection;
    5455using Microsoft.VisualStudio.TestTools.UnitTesting;
    55 using classification = HeuristicLab.Problems.Instances.Classification;
    56 using regression = HeuristicLab.Problems.Instances.Regression;
    5756
    5857namespace HeuristicLab_33.Tests {
     
    250249      symbRegProblem.Name = "Tower Symbolic Regression Problem";
    251250      symbRegProblem.Description = "Tower Dataset (downloaded from: http://vanillamodeling.com/realproblems.html)";
    252       regression.RealWorldInstanceProvider provider = new regression.RealWorldInstanceProvider();
     251      RegressionRealWorldInstanceProvider provider = new RegressionRealWorldInstanceProvider();
    253252      var instance = provider.GetDataDescriptors().Where(x => x.Name.Equals("towerData")).Single();
    254253      var towerProblemData = (RegressionProblemData)provider.LoadData(instance);
     
    355354      symbClassProblem.Name = "Mammography Classification Problem";
    356355      symbClassProblem.Description = "Mammography dataset imported from the UCI machine learning repository (http://archive.ics.uci.edu/ml/datasets/Mammographic+Mass)";
    357       classification.RealWorldInstanceProvider provider = new classification.RealWorldInstanceProvider();
     356      ClassificationRealWorldInstanceProvider provider = new ClassificationRealWorldInstanceProvider();
    358357      var instance = provider.GetDataDescriptors().Where(x => x.Name.Equals("mammography")).Single();
    359358      var mammoData = (ClassificationProblemData)provider.LoadData(instance);
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis-3.4/TableFileParserTest.cs

    r7823 r7849  
    2323using System.Globalization;
    2424using System.IO;
    25 using HeuristicLab.Problems.Instances;
     25using HeuristicLab.Problems.Instances.DataAnalysis;
    2626using Microsoft.VisualStudio.TestTools.UnitTesting;
     27
    2728namespace HeuristicLab.Problems.DataAnalysis_3_4.Tests {
    2829
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r7835 r7849  
    595595      <Name>HeuristicLab.Problems.ExternalEvaluation-3.3</Name>
    596596    </ProjectReference>
    597     <ProjectReference Include="..\HeuristicLab.Problems.Instances.Classification\3.3\HeuristicLab.Problems.Instances.Classification-3.3.csproj">
    598       <Project>{1BBFCD5B-8A1C-4225-A682-ADEC7800E683}</Project>
    599       <Name>HeuristicLab.Problems.Instances.Classification-3.3</Name>
    600     </ProjectReference>
    601597    <ProjectReference Include="..\HeuristicLab.Problems.Instances.CordeauGQAP\3.3\HeuristicLab.Problems.Instances.CordeauGQAP-3.3.csproj">
    602598      <Project>{1F2718DA-BF13-40EE-A7FD-EEDB4912E64E}</Project>
    603599      <Name>HeuristicLab.Problems.Instances.CordeauGQAP-3.3</Name>
    604600    </ProjectReference>
     601    <ProjectReference Include="..\HeuristicLab.Problems.Instances.DataAnalysis\3.3\HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj">
     602      <Project>{94C7714E-29D4-4D6D-B213-2C18D627AB75}</Project>
     603      <Name>HeuristicLab.Problems.Instances.DataAnalysis-3.3</Name>
     604    </ProjectReference>
    605605    <ProjectReference Include="..\HeuristicLab.Problems.Instances.ElloumiCTAP\3.3\HeuristicLab.Problems.Instances.ElloumiCTAP-3.3.csproj">
    606606      <Project>{CCF61DA0-B226-4C0F-8052-29ACC6BDE6EE}</Project>
     
    610610      <Project>{73F29D43-5714-4069-8FAB-0D18FEB5F175}</Project>
    611611      <Name>HeuristicLab.Problems.Instances.QAPLIB-3.3</Name>
    612     </ProjectReference>
    613     <ProjectReference Include="..\HeuristicLab.Problems.Instances.Regression\3.3\HeuristicLab.Problems.Instances.Regression-3.3.csproj">
    614       <Project>{26BF13E1-C8B2-4ACE-862D-EBFD360116B3}</Project>
    615       <Name>HeuristicLab.Problems.Instances.Regression-3.3</Name>
    616612    </ProjectReference>
    617613    <ProjectReference Include="..\HeuristicLab.Problems.Instances.TSPLIB.Views\3.3\HeuristicLab.Problems.Instances.TSPLIB.Views-3.3.csproj">
Note: See TracChangeset for help on using the changeset viewer.