Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/16/12 14:30:54 (11 years ago)
Author:
bburlacu
Message:

#1763: Added HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views and HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views to the branch. Removed prune button, minor functionality improvements.

Location:
branches/HeuristicLab.TreeSimplifier
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.TreeSimplifier

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views5700-5808

  • branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj

    r8636 r8916  
    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>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     52    <OutputPath>..\..\..\..\Trunk\sources\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    9393  </PropertyGroup>
    9494  <ItemGroup>
     95    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <SpecificVersion>False</SpecificVersion>
     97      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     98    </Reference>
     99    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     100      <SpecificVersion>False</SpecificVersion>
     101      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     104      <SpecificVersion>False</SpecificVersion>
     105      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     106    </Reference>
     107    <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     108      <SpecificVersion>False</SpecificVersion>
     109      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     110    </Reference>
     111    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     112      <SpecificVersion>False</SpecificVersion>
     113      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
     116      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     117    </Reference>
     118    <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     119      <SpecificVersion>False</SpecificVersion>
     120      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     123      <SpecificVersion>False</SpecificVersion>
     124      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     125    </Reference>
     126    <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     127      <SpecificVersion>False</SpecificVersion>
     128      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     129    </Reference>
     130    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     131      <SpecificVersion>False</SpecificVersion>
     132      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     133    </Reference>
     134    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     135      <SpecificVersion>False</SpecificVersion>
     136      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     137    </Reference>
     138    <Reference Include="HeuristicLab.Problems.DataAnalysis.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     139      <SpecificVersion>False</SpecificVersion>
     140      <HintPath>..\..\..\..\Trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Views-3.4.dll</HintPath>
     141    </Reference>
    95142    <Reference Include="System" />
    96143    <Reference Include="System.Core">
    … …  
    99146    <Reference Include="System.Drawing" />
    100147    <Reference Include="System.Windows.Forms" />
    101     <Reference Include="System.Windows.Forms.DataVisualization" />
    102     <Reference Include="System.Xml.Linq">
    103       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    104     </Reference>
    105     <Reference Include="System.Data.DataSetExtensions">
    106       <RequiredTargetFramework>3.5</RequiredTargetFramework>
    107     </Reference>
    108     <Reference Include="System.Data" />
    109     <Reference Include="System.Xml" />
    110148  </ItemGroup>
    111149  <ItemGroup>
    … …  
    145183    </Compile>
    146184    <Compile Include="Properties\AssemblyInfo.cs" />
    147   </ItemGroup>
    148   <ItemGroup>
    149     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    150       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    151       <Name>HeuristicLab.Collections-3.3</Name>
    152       <Private>False</Private>
    153     </ProjectReference>
    154     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    155       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    156       <Name>HeuristicLab.Common-3.3</Name>
    157       <Private>False</Private>
    158     </ProjectReference>
    159     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    160       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    161       <Name>HeuristicLab.Core.Views-3.3</Name>
    162       <Private>False</Private>
    163     </ProjectReference>
    164     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    165       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    166       <Name>HeuristicLab.Core-3.3</Name>
    167       <Private>False</Private>
    168     </ProjectReference>
    169     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    170       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    171       <Name>HeuristicLab.Data-3.3</Name>
    172       <Private>False</Private>
    173     </ProjectReference>
    174     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    175       <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    176       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    177       <Private>False</Private>
    178     </ProjectReference>
    179     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    180       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    181       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    182       <Private>False</Private>
    183     </ProjectReference>
    184     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    185       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    186       <Name>HeuristicLab.MainForm-3.3</Name>
    187       <Private>False</Private>
    188     </ProjectReference>
    189     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    190       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    191       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    192       <Private>False</Private>
    193     </ProjectReference>
    194     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    195       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    196       <Name>HeuristicLab.Optimization-3.3</Name>
    197       <Private>False</Private>
    198     </ProjectReference>
    199     <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">
    200       <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project>
    201       <Name>HeuristicLab.Parameters.Views-3.3</Name>
    202       <Private>False</Private>
    203     </ProjectReference>
    204     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    205       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    206       <Name>HeuristicLab.Persistence-3.3</Name>
    207       <Private>False</Private>
    208     </ProjectReference>
    209     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    210       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    211       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    212       <Private>False</Private>
    213     </ProjectReference>
    214     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj">
    215       <Project>{05BAE4E1-A9FA-4644-AA77-42558720159E}</Project>
    216       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name>
    217       <Private>False</Private>
    218     </ProjectReference>
    219     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj">
    220       <Project>{7A2531CE-3F7C-4F13-BCCA-ED6DC27A7086}</Project>
    221       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4</Name>
    222       <Private>False</Private>
    223     </ProjectReference>
    224     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    225       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    226       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    227       <Private>False</Private>
    228     </ProjectReference>
    229     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
    230       <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
    231       <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
    232       <Private>False</Private>
    233     </ProjectReference>
    234     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    235       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    236       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    237       <Private>False</Private>
    238     </ProjectReference>
    239185  </ItemGroup>
    240186  <ItemGroup>
    … …  
    254200      <Install>true</Install>
    255201    </BootstrapperPackage>
     202  </ItemGroup>
     203  <ItemGroup>
     204    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4.csproj">
     205      <Project>{05bae4e1-a9fa-4644-aa77-42558720159e}</Project>
     206      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4</Name>
     207    </ProjectReference>
     208    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj">
     209      <Project>{7a2531ce-3f7c-4f13-bcca-ed6dc27a7086}</Project>
     210      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4</Name>
     211    </ProjectReference>
     212    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     213      <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project>
     214      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     215    </ProjectReference>
    256216  </ItemGroup>
    257217  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.