Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 12:45:26 (11 years ago)
Author:
mkommend
Message:

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
6 deleted
6 edited
4 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources

    • Property svn:ignore
      •  

        old new  
         1*.docstates
         2*.psess
        13*.resharper
        24*.suo
         5*.vsp
        36Google.ProtocolBuffers-0.9.1.dll
         7HeuristicLab 3.3.5.1.ReSharper.user
         8HeuristicLab 3.3.6.0.ReSharper.user
        49HeuristicLab.4.5.resharper.user
        510HeuristicLab.resharper.user
         
        813_ReSharper.HeuristicLab
        914_ReSharper.HeuristicLab 3.3
         15_ReSharper.HeuristicLab.ExtLibs
         16bin
        1017protoc.exe
        11 HeuristicLab 3.3.5.1.ReSharper.user
        12 *.psess
        13 *.vsp
        14 *.docstates
        15 bin
        16 HeuristicLab 3.3.6.0.ReSharper.user
         18HeuristicLab.ExtLibs.6.0.ReSharper.user
    • Property svn:mergeinfo changed
      /branches/Restructure trunk solution (added)merged: 6828
      /branches/Trunk (added)merged: 6829,​6831-6833,​6842-6848,​6850,​6865
  • trunk/sources/HeuristicLab.Problems.DataAnalysis

  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3

    • Property svn:ignore
      •  

        old new  
        44obj
        55*.vs10x
         6Plugin.cs
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

    r5467 r6866  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    9393  </PropertyGroup>
    9494  <ItemGroup>
     95    <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <HintPath>..\..\bin\LibSVM-1.6.3.dll</HintPath>
     97    </Reference>
    9598    <Reference Include="System" />
    9699    <Reference Include="System.Core">
     
    108111  </ItemGroup>
    109112  <ItemGroup>
     113    <Compile Include="Plugin.cs" />
    110114    <Compile Include="Symbolic\Formatters\SymbolicExpressionTreeLatexFormatter.cs" />
    111115    <Compile Include="Symbolic\Formatters\SymbolicExpressionTreeMATLABFormatter.cs" />
     
    120124    <Compile Include="TableFileParser.cs" />
    121125    <None Include="HeuristicLab.snk" />
    122     <None Include="HeuristicLabProblemsDataAnalysisPlugin.cs.frame" />
    123     <None Include="Properties\AssemblyInfo.frame" />
     126    <None Include="Plugin.cs.frame" />
     127    <None Include="Properties\AssemblyInfo.cs.frame" />
    124128    <Compile Include="Evaluators\OnlineCovarianceEvaluator.cs" />
    125129    <Compile Include="Evaluators\OnlineMeanAndVarianceCalculator.cs" />
     
    140144    <Compile Include="Evaluators\SimpleRSquaredEvaluator.cs" />
    141145    <Compile Include="Evaluators\SimpleVarianceAccountedForEvaluator.cs" />
    142     <Compile Include="HeuristicLabProblemsDataAnalysisPlugin.cs" />
    143146    <Compile Include="Interfaces\ILaggedTreeNode.cs" />
    144147    <Compile Include="Interfaces\ISingleObjectiveDataAnalysisProblem.cs" />
     
    189192      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    190193      <Name>HeuristicLab.Collections-3.3</Name>
     194      <Private>False</Private>
    191195    </ProjectReference>
    192196    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    193197      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    194198      <Name>HeuristicLab.Common.Resources-3.3</Name>
     199      <Private>False</Private>
    195200    </ProjectReference>
    196201    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    197202      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    198203      <Name>HeuristicLab.Common-3.3</Name>
     204      <Private>False</Private>
    199205    </ProjectReference>
    200206    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    201207      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    202208      <Name>HeuristicLab.Core-3.3</Name>
     209      <Private>False</Private>
    203210    </ProjectReference>
    204211    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    205212      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    206213      <Name>HeuristicLab.Data-3.3</Name>
     214      <Private>False</Private>
    207215    </ProjectReference>
    208216    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    209217      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    210218      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    211     </ProjectReference>
    212     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    213       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    214       <Name>ALGLIB-3.1.0</Name>
    215     </ProjectReference>
    216     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    217       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    218       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
    219     </ProjectReference>
    220     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">
    221       <Project>{89B50302-9CEE-4D13-9779-633EADCAE624}</Project>
    222       <Name>HeuristicLab.LibSVM-1.6.3 %28HeuristicLab.ExtLibs\HeuristicLab.LibSVM\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3%29</Name>
    223     </ProjectReference>
    224     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\LibSVM-1.6.3\LibSVM-1.6.3.csproj">
    225       <Project>{A16F23B5-FB62-499E-A831-26953AA56FE2}</Project>
    226       <Name>LibSVM-1.6.3</Name>
     219      <Private>False</Private>
    227220    </ProjectReference>
    228221    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    229222      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    230223      <Name>HeuristicLab.Operators-3.3</Name>
     224      <Private>False</Private>
    231225    </ProjectReference>
    232226    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    233227      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    234228      <Name>HeuristicLab.Optimization-3.3</Name>
     229      <Private>False</Private>
    235230    </ProjectReference>
    236231    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    237232      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    238233      <Name>HeuristicLab.Parameters-3.3</Name>
     234      <Private>False</Private>
    239235    </ProjectReference>
    240236    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    241237      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    242238      <Name>HeuristicLab.Persistence-3.3</Name>
     239      <Private>False</Private>
    243240    </ProjectReference>
    244241    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    245242      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    246243      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     244      <Private>False</Private>
    247245    </ProjectReference>
    248246    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    249247      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    250248      <Name>HeuristicLab.Random-3.3</Name>
     249      <Private>False</Private>
    251250    </ProjectReference>
    252251  </ItemGroup>
     
    284283
    285284call PreBuildEvent.cmd
    286 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisPlugin.cs"</PreBuildEvent>
     285</PreBuildEvent>
    287286  </PropertyGroup>
    288287</Project>
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4

    • Property svn:ignore
      •  

        old new  
        44obj
        55*.vs10x
         6Plugin.cs
  • trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r6802 r6866  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
     
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
     
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
     
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
     
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
     
    185185    <Compile Include="OnlineCalculators\OnlineTheilsUStatisticCalculator.cs" />
    186186    <Compile Include="OnlineCalculators\OnlineWeightedDirectionalSymmetryCalculator.cs" />
     187    <Compile Include="Plugin.cs" />
    187188    <Compile Include="TableFileParser.cs" />
    188189    <Compile Include="Implementation\Classification\ThresholdCalculators\AccuracyMaximizationThresholdCalculator.cs" />
     
    190191    <Compile Include="Implementation\Classification\ThresholdCalculators\ThresholdCalculator.cs" />
    191192    <None Include="HeuristicLab.snk" />
    192     <None Include="HeuristicLabProblemsDataAnalysisPlugin.cs.frame" />
    193     <None Include="Properties\AssemblyInfo.frame" />
    194     <Compile Include="HeuristicLabProblemsDataAnalysisPlugin.cs" />
     193    <None Include="Plugin.cs.frame" />
     194    <None Include="Properties\AssemblyInfo.cs.frame" />
    195195    <Compile Include="Interfaces\IDataAnalysisModel.cs" />
    196196    <Compile Include="Interfaces\IDataAnalysisProblem.cs" />
     
    201201      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    202202      <Name>HeuristicLab.Collections-3.3</Name>
     203      <Private>False</Private>
    203204    </ProjectReference>
    204205    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    205206      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    206207      <Name>HeuristicLab.Common.Resources-3.3</Name>
     208      <Private>False</Private>
    207209    </ProjectReference>
    208210    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    209211      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    210212      <Name>HeuristicLab.Common-3.3</Name>
     213      <Private>False</Private>
    211214    </ProjectReference>
    212215    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    213216      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    214217      <Name>HeuristicLab.Core-3.3</Name>
     218      <Private>False</Private>
    215219    </ProjectReference>
    216220    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    217221      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    218222      <Name>HeuristicLab.Data-3.3</Name>
     223      <Private>False</Private>
    219224    </ProjectReference>
    220225    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    221226      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    222227      <Name>HeuristicLab.Optimization-3.3</Name>
     228      <Private>False</Private>
    223229    </ProjectReference>
    224230    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    225231      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    226232      <Name>HeuristicLab.Parameters-3.3</Name>
     233      <Private>False</Private>
    227234    </ProjectReference>
    228235    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    229236      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    230237      <Name>HeuristicLab.Persistence-3.3</Name>
     238      <Private>False</Private>
    231239    </ProjectReference>
    232240    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    233241      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    234242      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     243      <Private>False</Private>
    235244    </ProjectReference>
    236245  </ItemGroup>
     
    268277
    269278call PreBuildEvent.cmd
    270 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisPlugin.cs"</PreBuildEvent>
     279</PreBuildEvent>
    271280  </PropertyGroup>
    272281</Project>
Note: See TracChangeset for help on using the changeset viewer.