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.Symbolic.Regression/3.4

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj

    r6256 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>
    9598    <Reference Include="System" />
    9699    <Reference Include="System.Core">
    … …  
    109112  <ItemGroup>
    110113    <Compile Include="MultiObjective\SymbolicRegressionMultiObjectiveValidationBestSolutionAnalyzer.cs" />
     114    <Compile Include="Plugin.cs" />
    111115    <Compile Include="SingleObjective\SymbolicRegressionConstantOptimizationEvaluator.cs" />
    112116    <Compile Include="SingleObjective\SymbolicRegressionSingleObjectiveOverfittingAnalyzer.cs" />
    … …  
    130134    <Compile Include="SymbolicRegressionSolution.cs" />
    131135    <None Include="HeuristicLab.snk" />
    132     <None Include="HeuristicLabProblemsDataAnalysisSymbolicRegressionPlugin.cs.frame" />
    133     <None Include="Properties\AssemblyInfo.frame" />
    134     <Compile Include="HeuristicLabProblemsDataAnalysisSymbolicRegressionPlugin.cs" />
     136    <None Include="Plugin.cs.frame" />
     137    <None Include="Properties\AssemblyInfo.cs.frame" />
    135138    <Compile Include="Properties\AssemblyInfo.cs" />
    136139  </ItemGroup>
    … …  
    139142      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    140143      <Name>HeuristicLab.Analysis-3.3</Name>
     144      <Private>False</Private>
    141145    </ProjectReference>
    142146    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    143147      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    144148      <Name>HeuristicLab.Collections-3.3</Name>
     149      <Private>False</Private>
    145150    </ProjectReference>
    146151    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    147152      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    148153      <Name>HeuristicLab.Common-3.3</Name>
     154      <Private>False</Private>
    149155    </ProjectReference>
    150156    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    151157      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    152158      <Name>HeuristicLab.Core-3.3</Name>
     159      <Private>False</Private>
    153160    </ProjectReference>
    154161    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    155162      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    156163      <Name>HeuristicLab.Data-3.3</Name>
     164      <Private>False</Private>
    157165    </ProjectReference>
    158166    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
    159167      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
    160168      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
    161     </ProjectReference>
    162     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\ALGLIB-3.1.0\ALGLIB-3.1.0.csproj">
    163       <Project>{FC841674-62A7-4055-BE91-E41944B6C606}</Project>
    164       <Name>ALGLIB-3.1.0</Name>
    165     </ProjectReference>
    166     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\3.1.0\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0.csproj">
    167       <Project>{DE69A359-A5B8-4D3D-BA8D-D5780D7F96D6}</Project>
    168       <Name>HeuristicLab.ALGLIB-3.1.0 %28HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\HeuristicLab.ALGLIB-3.1.0\HeuristicLab.ALGLIB-3.1.0%29</Name>
     169      <Private>False</Private>
    169170    </ProjectReference>
    170171    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    171172      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    172173      <Name>HeuristicLab.Operators-3.3</Name>
     174      <Private>False</Private>
    173175    </ProjectReference>
    174176    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    175177      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    176178      <Name>HeuristicLab.Optimization-3.3</Name>
     179      <Private>False</Private>
    177180    </ProjectReference>
    178181    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    179182      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    180183      <Name>HeuristicLab.Parameters-3.3</Name>
     184      <Private>False</Private>
    181185    </ProjectReference>
    182186    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    183187      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    184188      <Name>HeuristicLab.Persistence-3.3</Name>
     189      <Private>False</Private>
    185190    </ProjectReference>
    186191    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    187192      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    188193      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     194      <Private>False</Private>
    189195    </ProjectReference>
    190196    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    191197      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    192198      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     199      <Private>False</Private>
    193200    </ProjectReference>
    194201    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    195202      <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    196203      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     204      <Private>False</Private>
    197205    </ProjectReference>
    198206  </ItemGroup>
    … …  
    230238
    231239call PreBuildEvent.cmd
    232 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicRegressionPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsDataAnalysisSymbolicRegressionPlugin.cs"</PreBuildEvent>
     240</PreBuildEvent>
    233241  </PropertyGroup>
    234242</Project>
Note: See TracChangeset for help on using the changeset viewer.