Ignore:
Timestamp:
07/07/14 15:33:56 (8 years ago)
Author:
mkommend
Message:

#2206: Merged data preprocessing into the trunk.

Location:
trunk/sources
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources

  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/CheckedFilterCollectionView.cs

    r10813 r11114  
    33using System.ComponentModel;
    44using System.Drawing;
    5 using System.Data;
    65using System.Linq;
    76using System.Text;
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj

    r11068 r11114  
    3939  </PropertyGroup>
    4040  <ItemGroup>
    41     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    42       <SpecificVersion>False</SpecificVersion>
    43       <HintPath>..\..\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    44       <Private>False</Private>
    45     </Reference>
    46     <Reference Include="HeuristicLab.Problems.ExternalEvaluation-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    47       <SpecificVersion>False</SpecificVersion>
    48       <HintPath>..\..\bin\HeuristicLab.Problems.ExternalEvaluation-3.3.dll</HintPath>
    49       <Private>False</Private>
    50     </Reference>
    51     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    52       <SpecificVersion>False</SpecificVersion>
    53       <HintPath>..\..\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    54       <Private>False</Private>
    55     </Reference>
    56     <Reference Include="HeuristicLab.Problems.Instances.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    57       <SpecificVersion>False</SpecificVersion>
    58       <HintPath>..\..\bin\HeuristicLab.Problems.Instances.Views-3.3.dll</HintPath>
    59       <Private>False</Private>
    60     </Reference>
    6141    <Reference Include="System" />
    6242    <Reference Include="System.Core" />
     
    207187  <ItemGroup>
    208188    <ProjectReference Include="..\..\HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj">
    209       <Project>{76945D76-CA61-4147-9DC2-0ACDCDDF87F9}</Project>
     189      <Project>{76945d76-ca61-4147-9dc2-0acdcddf87f9}</Project>
    210190      <Name>HeuristicLab.Analysis.Views-3.3</Name>
    211191      <Private>False</Private>
    212192    </ProjectReference>
    213193    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    214       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     194      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
    215195      <Name>HeuristicLab.Analysis-3.3</Name>
    216196      <Private>False</Private>
     
    226206    </ProjectReference>
    227207    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    228       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     208      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
    229209      <Name>HeuristicLab.Common-3.3</Name>
    230210      <Private>False</Private>
    231211    </ProjectReference>
    232212    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    233       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
     213      <Project>{e226881d-315f-423d-b419-a766fe0d8685}</Project>
    234214      <Name>HeuristicLab.Core.Views-3.3</Name>
    235215      <Private>False</Private>
    236216    </ProjectReference>
    237217    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    238       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     218      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
    239219      <Name>HeuristicLab.Core-3.3</Name>
    240220      <Private>False</Private>
    241221    </ProjectReference>
    242222    <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    243       <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
     223      <Project>{72104a0b-90e7-42f3-9abe-9bbbadd4b943}</Project>
    244224      <Name>HeuristicLab.Data.Views-3.3</Name>
    245225      <Private>False</Private>
     
    251231    </ProjectReference>
    252232    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    253       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     233      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
    254234      <Name>HeuristicLab.Data-3.3</Name>
    255235      <Private>False</Private>
    256236    </ProjectReference>
    257237    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    258       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     238      <Project>{ab687bbe-1bfe-476b-906d-44237135431d}</Project>
    259239      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    260240      <Private>False</Private>
    261241    </ProjectReference>
    262242    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    263       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
     243      <Project>{3bd61258-31da-4b09-89c0-4f71fef5f05a}</Project>
    264244      <Name>HeuristicLab.MainForm-3.3</Name>
    265245      <Private>False</Private>
    266246    </ProjectReference>
    267     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    268       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    269       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    270       <Private>False</Private>
    271     </ProjectReference>
    272247    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    273       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     248      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
    274249      <Name>HeuristicLab.Optimization-3.3</Name>
    275250      <Private>False</Private>
     
    281256    </ProjectReference>
    282257    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
    283       <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
     258      <Project>{3e9e8944-44ff-40bb-a622-3a4a7dd0f198}</Project>
    284259      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
    285260      <Private>False</Private>
    286261    </ProjectReference>
    287262    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    288       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
     263      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
    289264      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    290265      <Private>False</Private>
    291266    </ProjectReference>
    292     <ProjectReference Include="..\..\HeuristicLab.Problems.ExternalEvaluation.Views\3.3\HeuristicLab.Problems.ExternalEvaluation.Views-3.3.csproj">
    293       <Project>{3081630C-9521-47D7-8075-1777C12F212C}</Project>
    294       <Name>HeuristicLab.Problems.ExternalEvaluation.Views-3.3</Name>
    295       <Private>False</Private>
    296     </ProjectReference>
    297267    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    298       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
     268      <Project>{315bda09-3f4f-49b3-9790-b37cfc1c5750}</Project>
    299269      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    300270      <Private>False</Private>
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/Plugin.cs.frame

    r11068 r11114  
    2828  [Plugin("HeuristicLab.DataPreprocessing.Views", "3.4.0.$WCREV$")]
    2929  [PluginFile("HeuristicLab.DataPreprocessing.Views-3.4.dll", PluginFileType.Assembly)]
     30  [PluginDependency("HeuristicLab.Analysis", "3.3")]
     31  [PluginDependency("HeuristicLab.Analysis.Views", "3.3")]
     32  [PluginDependency("HeuristicLab.Collections", "3.3")]
     33  [PluginDependency("HeuristicLab.Common", "3.3")]
     34  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
     35  [PluginDependency("HeuristicLab.Core", "3.3")]
     36  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
     37  [PluginDependency("HeuristicLab.Data","3.3")]
     38  [PluginDependency("HeuristicLab.Data.Views","3.3")]
    3039  [PluginDependency("HeuristicLab.DataPreprocessing", "3.4")]
    31   [PluginDependency("HeuristicLab.Data.Views","3.3")]
    32   [PluginDependency("HeuristicLab.Data","3.3")]
    3340  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3441  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    35   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views","3.4")]
     42  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     43  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
     44  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Views", "3.4")]
     45  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
    3646  public class HeuristicLabDataPreprocessingViewPlugin : PluginBase {
    3747  }
  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs

  • trunk/sources/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs

Note: See TracChangeset for help on using the changeset viewer.