Free cookie consent management tool by TermsFeed Policy Generator

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

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
2 deleted
3 edited
2 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.Regression/3.3

    • Property svn:ignore

      •  

        old new  
        44obj
        55*.vs10x
         6Plugin.cs

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj

    r6739 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="ALGLIB-3.1.0, Version=3.1.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     96      <HintPath>..\..\bin\ALGLIB-3.1.0.dll</HintPath>
     97    </Reference>
     98    <Reference Include="LibSVM-1.6.3, Version=1.6.3.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     99      <HintPath>..\..\bin\LibSVM-1.6.3.dll</HintPath>
     100    </Reference>
    95101    <Reference Include="System" />
    96102    <Reference Include="System.Core">
    … …  
    109115  <ItemGroup>
    110116    <None Include="HeuristicLab.snk" />
    111     <None Include="HeuristicLabProblemsDataAnalysisRegressionPlugin.cs.frame" />
    112     <None Include="Properties\AssemblyInfo.frame" />
     117    <None Include="Plugin.cs.frame" />
     118    <None Include="Properties\AssemblyInfo.cs.frame" />
    113119    <Compile Include="Analyzers\RegressionSolutionAnalyzer.cs">
    114120      <SubType>Code</SubType>
    115121    </Compile>
    116     <Compile Include="HeuristicLabProblemsDataAnalysisRegressionPlugin.cs" />
    117122    <Compile Include="LinearRegression\LinearRegressionSolutionCreator.cs" />
    118123    <Compile Include="LinearRegression\LinearRegressionUtil.cs" />
     124    <Compile Include="Plugin.cs" />
    119125    <Compile Include="Properties\AssemblyInfo.cs" />
    120126    <Compile Include="SupportVectorRegression\BestSupportVectorRegressionSolutionAnalyzer.cs" />
    … …  
    159165      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    160166      <Name>HeuristicLab.Analysis-3.3</Name>
     167      <Private>False</Private>
    161168    </ProjectReference>
    162169    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    163170      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    164171      <Name>HeuristicLab.Collections-3.3</Name>
     172      <Private>False</Private>
    165173    </ProjectReference>
    166174    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    167175      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    168176      <Name>HeuristicLab.Common.Resources-3.3</Name>
     177      <Private>False</Private>
    169178    </ProjectReference>
    170179    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    171180      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    172181      <Name>HeuristicLab.Common-3.3</Name>
     182      <Private>False</Private>
    173183    </ProjectReference>
    174184    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    175185      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    176186      <Name>HeuristicLab.Core-3.3</Name>
     187      <Private>False</Private>
    177188    </ProjectReference>
    178189    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    179190      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    180191      <Name>HeuristicLab.Data-3.3</Name>
     192      <Private>False</Private>
    181193    </ProjectReference>
    182194    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    183195      <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    184196      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    185     </ProjectReference>
    186     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    187       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    188       <Name>ALGLIB-3.1.0</Name>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    191       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    192       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
    193     </ProjectReference>
    194     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">
    195       <Project>{89B50302-9CEE-4D13-9779-633EADCAE624}</Project>
    196       <Name>HeuristicLab.LibSVM-1.6.3 %28HeuristicLab.ExtLibs\HeuristicLab.LibSVM\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3%29</Name>
    197     </ProjectReference>
    198     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\LibSVM-1.6.3\LibSVM-1.6.3.csproj">
    199       <Project>{A16F23B5-FB62-499E-A831-26953AA56FE2}</Project>
    200       <Name>LibSVM-1.6.3</Name>
     197      <Private>False</Private>
    201198    </ProjectReference>
    202199    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    203200      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    204201      <Name>HeuristicLab.Operators-3.3</Name>
     202      <Private>False</Private>
    205203    </ProjectReference>
    206204    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    207205      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    208206      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     207      <Private>False</Private>
    209208    </ProjectReference>
    210209    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    211210      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    212211      <Name>HeuristicLab.Optimization-3.3</Name>
     212      <Private>False</Private>
    213213    </ProjectReference>
    214214    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    215215      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    216216      <Name>HeuristicLab.Parameters-3.3</Name>
     217      <Private>False</Private>
    217218    </ProjectReference>
    218219    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    219220      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    220221      <Name>HeuristicLab.Persistence-3.3</Name>
     222      <Private>False</Private>
    221223    </ProjectReference>
    222224    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    223225      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    224226      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     227      <Private>False</Private>
    225228    </ProjectReference>
    226229    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.3\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
    227230      <Project>{70DFD984-B1D9-46FE-8EB7-4DE92D71A9FC}</Project>
    228231      <Name>HeuristicLab.Problems.DataAnalysis-3.3</Name>
     232      <Private>False</Private>
    229233    </ProjectReference>
    230234    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    231235      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    232236      <Name>HeuristicLab.Random-3.3</Name>
     237      <Private>False</Private>
    233238    </ProjectReference>
    234239  </ItemGroup>
    … …  
    266271
    267272call PreBuildEvent.cmd
    268 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisRegressionPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisRegressionPlugin.cs"</PreBuildEvent>
     273</PreBuildEvent>
    269274  </PropertyGroup>
    270275</Project>
Note: See TracChangeset for help on using the changeset viewer.