Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/02/13 17:04:43 (11 years ago)
Author:
gkronber
Message:

#1508: merged r9804:9805,r9808:9809,r9811:9812,r9822,r9824:9825,r9897,r9928,r9938:9941,r9964:9965,r9989,r9991:9992,r9995,r9997,r10004:10015 from trunk into stable branch.

Location:
stable
Files:
2 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Trading/3.4/HeuristicLab.Problems.DataAnalysis.Trading-3.4.csproj

    r9799 r10020  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     43    <OutputPath>..\..\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>..\..\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     60    <OutputPath>..\..\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>..\..\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     78    <OutputPath>..\..\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>..\..\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    9393  </PropertyGroup>
    9494  <ItemGroup>
    95     <Reference Include="HeuristicLab.Collections-3.3">
    96       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    97     </Reference>
    98     <Reference Include="HeuristicLab.Common-3.3">
    99       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    100     </Reference>
    101     <Reference Include="HeuristicLab.Core-3.3">
    102       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    103     </Reference>
    104     <Reference Include="HeuristicLab.Data-3.3">
    105       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    106     </Reference>
    107     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
    108       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    109     </Reference>
    110     <Reference Include="HeuristicLab.Operators-3.3">
    111       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
    112     </Reference>
    113     <Reference Include="HeuristicLab.Optimization-3.3">
    114       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    115     </Reference>
    116     <Reference Include="HeuristicLab.Parameters-3.3">
    117       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
    118     </Reference>
    119     <Reference Include="HeuristicLab.Persistence-3.3">
    120       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    121     </Reference>
    122     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
    123       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    124     </Reference>
    125     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4">
    126       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    127     </Reference>
    128     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
    129       <HintPath>c:\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
    130     </Reference>
    131     <Reference Include="HeuristicLab.Problems.Instances-3.3">
    132       <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    133     </Reference>
    13495    <Reference Include="System" />
    13596    <Reference Include="System.Core">
    … …  
    13798    </Reference>
    13899    <Reference Include="System.Drawing" />
     100    <Reference Include="System.Xml" />
    139101  </ItemGroup>
    140102  <ItemGroup>
    141103    <Compile Include="Calculators\OnlineProfitCalculator.cs" />
    142104    <Compile Include="Calculators\OnlineSharpeRatioCalculator.cs" />
     105    <Compile Include="InstanceProviders\CsvProblemInstanceProvider.cs" />
     106    <Compile Include="InstanceProviders\EcbProblemInstanceProvider.cs" />
    143107    <Compile Include="Interfaces\IModel.cs" />
    144108    <Compile Include="Interfaces\IProblem.cs" />
    … …  
    146110    <Compile Include="Interfaces\ISolution.cs" />
    147111    <Compile Include="Plugin.cs" />
    148     <Compile Include="Problem.cs" />
    149112    <Compile Include="ProblemData.cs" />
    150113    <Compile Include="Solution.cs" />
    … …  
    183146    </BootstrapperPackage>
    184147  </ItemGroup>
    185   <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\3.3\HeuristicLab.Core-3.3.csproj">
     160      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     161      <Name>HeuristicLab.Core-3.3</Name>
     162      <Private>False</Private>
     163    </ProjectReference>
     164    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     165      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     166      <Name>HeuristicLab.Data-3.3</Name>
     167      <Private>False</Private>
     168    </ProjectReference>
     169    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     170      <Project>{06d4a186-9319-48a0-bade-a2058d462eea}</Project>
     171      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     172      <Private>False</Private>
     173    </ProjectReference>
     174    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     175      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     176      <Name>HeuristicLab.Operators-3.3</Name>
     177      <Private>False</Private>
     178    </ProjectReference>
     179    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     180      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     181      <Name>HeuristicLab.Optimization-3.3</Name>
     182      <Private>False</Private>
     183    </ProjectReference>
     184    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     185      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     186      <Name>HeuristicLab.Parameters-3.3</Name>
     187      <Private>False</Private>
     188    </ProjectReference>
     189    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     190      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     191      <Name>HeuristicLab.Persistence-3.3</Name>
     192      <Private>False</Private>
     193    </ProjectReference>
     194    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     195      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     196      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     197      <Private>False</Private>
     198    </ProjectReference>
     199    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     200      <Project>{3d28463f-ec96-4d82-afee-38be91a0ca00}</Project>
     201      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     202      <Private>False</Private>
     203    </ProjectReference>
     204    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     205      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
     206      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     207      <Private>False</Private>
     208    </ProjectReference>
     209    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances.DataAnalysis\3.3\HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj">
     210      <Project>{94C7714E-29D4-4D6D-B213-2C18D627AB75}</Project>
     211      <Name>HeuristicLab.Problems.Instances.DataAnalysis-3.3</Name>
     212    </ProjectReference>
     213    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     214      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     215      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     216      <Private>False</Private>
     217    </ProjectReference>
     218  </ItemGroup>
    186219  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    187220  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
    … …  
    193226  -->
    194227  <PropertyGroup>
    195     <PreBuildEvent>set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    196 set ProjectDir=$(ProjectDir)
    197 set SolutionDir=$(SolutionDir)
    198 set Outdir=$(Outdir)
     228    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
     229      set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     230      set ProjectDir=$(ProjectDir)
     231      set SolutionDir=$(SolutionDir)
     232      set Outdir=$(Outdir)
    199233
    200 call PreBuildEvent.cmd
    201 </PreBuildEvent>
     234      call PreBuildEvent.cmd
     235    </PreBuildEvent>
     236    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     237      export ProjectDir=$(ProjectDir)
     238      export SolutionDir=$(SolutionDir)
     239
     240      $SolutionDir/PreBuildEvent.sh
     241    </PreBuildEvent>
    202242  </PropertyGroup>
    203243</Project>
Note: See TracChangeset for help on using the changeset viewer.