Changeset 15242 for stable/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj
- Timestamp:
- 07/14/17 10:29:51 (7 years ago)
- Location:
- stable
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 15110,15119,15210
- Property svn:mergeinfo changed
-
stable/HeuristicLab.DataPreprocessing
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing merged eligible /branches/crossvalidation-2434/HeuristicLab.DataPreprocessing merged eligible /trunk/sources/HeuristicLab.DataPreprocessing merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing 5516-5520 /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing 6917-7005 /branches/CloningRefactoring/HeuristicLab.DataPreprocessing 4656-4721 /branches/CodeEditor/HeuristicLab.DataPreprocessing 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing 5815-6180 /branches/DataAnalysis/HeuristicLab.DataPreprocessing 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.DataPreprocessing 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing 5060 /branches/HLScript/HeuristicLab.DataPreprocessing 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing 11130-12721 /branches/HiveStatistics/sources/HeuristicLab.DataPreprocessing 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing 10202-10483 /branches/NET40/sources/HeuristicLab.DataPreprocessing 5138-5162 /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing 12033-12122 /branches/ParallelEngine/HeuristicLab.DataPreprocessing 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing 7568-7810 /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing 6350-6627 /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing 6828 /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing 7787-8333 /branches/SlaveShutdown/HeuristicLab.DataPreprocessing 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing 5370-5682 /branches/Trunk/HeuristicLab.DataPreprocessing 6829-6865 /branches/UnloadJobs/HeuristicLab.DataPreprocessing 9168-9215 /branches/VNS/HeuristicLab.DataPreprocessing 5594-5752 /branches/histogram/HeuristicLab.DataPreprocessing 5959-6341 /branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing 14232-14825 /trunk/sources/HeuristicLab.Problems.TestFunctions.MultiObjective/HeuristicLab.DataPreprocessing 14175
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
stable/HeuristicLab.DataPreprocessing/3.4
- Property svn:mergeinfo changed
-
stable/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj
r14960 r15242 18 18 <DebugType>full</DebugType> 19 19 <Optimize>false</Optimize> 20 <OutputPath> ..\..\bin\</OutputPath>20 <OutputPath>$(SolutionDir)\bin\</OutputPath> 21 21 <DefineConstants>DEBUG;TRACE</DefineConstants> 22 22 <ErrorReport>prompt</ErrorReport> … … 28 28 <DebugType>pdbonly</DebugType> 29 29 <Optimize>true</Optimize> 30 <OutputPath> ..\..\bin\</OutputPath>30 <OutputPath>$(SolutionDir)\bin\</OutputPath> 31 31 <DefineConstants>TRACE</DefineConstants> 32 32 <ErrorReport>prompt</ErrorReport> … … 36 36 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> 37 37 <PlatformTarget>x64</PlatformTarget> 38 <OutputPath> ..\..\bin\</OutputPath>38 <OutputPath>$(SolutionDir)\bin\</OutputPath> 39 39 <DefineConstants>DEBUG;TRACE</DefineConstants> 40 40 <Prefer32Bit>false</Prefer32Bit> … … 42 42 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> 43 43 <PlatformTarget>x64</PlatformTarget> 44 <OutputPath> ..\..\bin\</OutputPath>44 <OutputPath>$(SolutionDir)\bin\</OutputPath> 45 45 <Optimize>true</Optimize> 46 46 <Prefer32Bit>false</Prefer32Bit> … … 48 48 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> 49 49 <DebugSymbols>true</DebugSymbols> 50 <OutputPath> ..\..\bin\</OutputPath>50 <OutputPath>$(SolutionDir)\bin\</OutputPath> 51 51 <DefineConstants>DEBUG;TRACE</DefineConstants> 52 52 <DebugType>full</DebugType> … … 57 57 </PropertyGroup> 58 58 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> 59 <OutputPath> ..\..\bin\</OutputPath>59 <OutputPath>$(SolutionDir)\bin\</OutputPath> 60 60 <DefineConstants>TRACE</DefineConstants> 61 61 <Optimize>true</Optimize> … … 78 78 </ItemGroup> 79 79 <ItemGroup> 80 <Compile Include="Content\MultiScatterPlotContent.cs" /> 81 <Compile Include="Content\SingleScatterPlotContent.cs" /> 80 82 <Compile Include="Content\ScatterPlotContent.cs" /> 81 83 <Compile Include="Content\DataCompletenessChartContent.cs" /> … … 84 86 <Compile Include="Content\PreprocessingChartContent.cs" /> 85 87 <Compile Include="Data\PreprocessingData.cs" /> 86 <Compile Include="Content\PreprocessingDataTable.cs" />87 <Compile Include="Content\IViewChartShortcut.cs" />88 88 <Compile Include="Data\IFilteredPreprocessingData.cs" /> 89 89 <Compile Include="Content\CorrelationMatrixContent.cs" /> … … 118 118 <ItemGroup> 119 119 <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj"> 120 <Project>{887425 b4-4348-49ed-a457-b7d2c26ddbf9}</Project>120 <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project> 121 121 <Name>HeuristicLab.Analysis-3.3</Name> 122 122 <Private>False</Private> 123 123 </ProjectReference> 124 124 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 125 <Project>{958 b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>125 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> 126 126 <Name>HeuristicLab.Collections-3.3</Name> 127 127 <Private>False</Private> 128 128 </ProjectReference> 129 129 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj"> 130 <Project>{0 e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>130 <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project> 131 131 <Name>HeuristicLab.Common.Resources-3.3</Name> 132 132 <Private>False</Private> 133 133 </ProjectReference> 134 134 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 135 <Project>{ a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>135 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> 136 136 <Name>HeuristicLab.Common-3.3</Name> 137 137 <Private>False</Private> 138 138 </ProjectReference> 139 139 <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj"> 140 <Project>{ c36bd924-a541-4a00-afa8-41701378ddc5}</Project>140 <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project> 141 141 <Name>HeuristicLab.Core-3.3</Name> 142 142 <Private>False</Private> 143 143 </ProjectReference> 144 144 <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj"> 145 <Project>{ bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>145 <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project> 146 146 <Name>HeuristicLab.Data-3.3</Name> 147 147 <Private>False</Private> 148 148 </ProjectReference> 149 149 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> 150 <Project>{14 ab8d24-25bc-400c-a846-4627aa945192}</Project>150 <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project> 151 151 <Name>HeuristicLab.Optimization-3.3</Name> 152 152 <Private>False</Private> … … 158 158 </ProjectReference> 159 159 <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj"> 160 <Project>{94186 a6a-5176-4402-ae83-886557b53cca}</Project>160 <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project> 161 161 <Name>HeuristicLab.PluginInfrastructure-3.3</Name> 162 162 <Private>False</Private> 163 163 </ProjectReference> 164 164 <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj"> 165 <Project>{ df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>165 <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project> 166 166 <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name> 167 167 <Private>False</Private> … … 170 170 <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project> 171 171 <Name>HeuristicLab.Random-3.3</Name> 172 <Private>False</Private> 173 </ProjectReference> 174 <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj"> 175 <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project> 176 <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name> 172 177 <Private>False</Private> 173 178 </ProjectReference>
Note: See TracChangeset
for help on using the changeset viewer.