Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/14/17 10:29:51 (7 years ago)
Author:
pfleck
Message:

#2709 merged to stable

Location:
stable
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.DataPreprocessing

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessingmergedeligible
      /branches/crossvalidation-2434/HeuristicLab.DataPreprocessingmergedeligible
      /trunk/sources/HeuristicLab.DataPreprocessingmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing5516-5520
      /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing6917-7005
      /branches/CloningRefactoring/HeuristicLab.DataPreprocessing4656-4721
      /branches/CodeEditor/HeuristicLab.DataPreprocessing11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing5815-6180
      /branches/DataAnalysis/HeuristicLab.DataPreprocessing4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.DataPreprocessing10085-11101
      /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing5060
      /branches/HLScript/HeuristicLab.DataPreprocessing10331-10358
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing11570-12508
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing6123-9799
      /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing11130-12721
      /branches/HiveStatistics/sources/HeuristicLab.DataPreprocessing12440-12877
      /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing10202-10483
      /branches/NET40/sources/HeuristicLab.DataPreprocessing5138-5162
      /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing12033-12122
      /branches/ParallelEngine/HeuristicLab.DataPreprocessing5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing7568-7810
      /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing6350-6627
      /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing6828
      /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing7787-8333
      /branches/SlaveShutdown/HeuristicLab.DataPreprocessing8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing5370-5682
      /branches/Trunk/HeuristicLab.DataPreprocessing6829-6865
      /branches/UnloadJobs/HeuristicLab.DataPreprocessing9168-9215
      /branches/VNS/HeuristicLab.DataPreprocessing5594-5752
      /branches/histogram/HeuristicLab.DataPreprocessing5959-6341
      /branches/symbreg-factors-2650/HeuristicLab.DataPreprocessing14232-14825
      /trunk/sources/HeuristicLab.Problems.TestFunctions.MultiObjective/HeuristicLab.DataPreprocessing14175

  • stable/HeuristicLab.DataPreprocessing/3.4

  • stable/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj

    r14960 r15242  
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>..\..\bin\</OutputPath>
     20    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    … …  
    2828    <DebugType>pdbonly</DebugType>
    2929    <Optimize>true</Optimize>
    30     <OutputPath>..\..\bin\</OutputPath>
     30    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3131    <DefineConstants>TRACE</DefineConstants>
    3232    <ErrorReport>prompt</ErrorReport>
    … …  
    3636  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    3737    <PlatformTarget>x64</PlatformTarget>
    38     <OutputPath>..\..\bin\</OutputPath>
     38    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3939    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4040    <Prefer32Bit>false</Prefer32Bit>
    … …  
    4242  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    4343    <PlatformTarget>x64</PlatformTarget>
    44     <OutputPath>..\..\bin\</OutputPath>
     44    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4545    <Optimize>true</Optimize>
    4646    <Prefer32Bit>false</Prefer32Bit>
    … …  
    4848  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
    4949    <DebugSymbols>true</DebugSymbols>
    50     <OutputPath>..\..\bin\</OutputPath>
     50    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5151    <DefineConstants>DEBUG;TRACE</DefineConstants>
    5252    <DebugType>full</DebugType>
    … …  
    5757  </PropertyGroup>
    5858  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    59     <OutputPath>..\..\bin\</OutputPath>
     59    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6060    <DefineConstants>TRACE</DefineConstants>
    6161    <Optimize>true</Optimize>
    … …  
    7878  </ItemGroup>
    7979  <ItemGroup>
     80    <Compile Include="Content\MultiScatterPlotContent.cs" />
     81    <Compile Include="Content\SingleScatterPlotContent.cs" />
    8082    <Compile Include="Content\ScatterPlotContent.cs" />
    8183    <Compile Include="Content\DataCompletenessChartContent.cs" />
    … …  
    8486    <Compile Include="Content\PreprocessingChartContent.cs" />
    8587    <Compile Include="Data\PreprocessingData.cs" />
    86     <Compile Include="Content\PreprocessingDataTable.cs" />
    87     <Compile Include="Content\IViewChartShortcut.cs" />
    8888    <Compile Include="Data\IFilteredPreprocessingData.cs" />
    8989    <Compile Include="Content\CorrelationMatrixContent.cs" />
    … …  
    118118  <ItemGroup>
    119119    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    120       <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     120      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    121121      <Name>HeuristicLab.Analysis-3.3</Name>
    122122      <Private>False</Private>
    123123    </ProjectReference>
    124124    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    125       <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     125      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    126126      <Name>HeuristicLab.Collections-3.3</Name>
    127127      <Private>False</Private>
    128128    </ProjectReference>
    129129    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    130       <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     130      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    131131      <Name>HeuristicLab.Common.Resources-3.3</Name>
    132132      <Private>False</Private>
    133133    </ProjectReference>
    134134    <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>
    136136      <Name>HeuristicLab.Common-3.3</Name>
    137137      <Private>False</Private>
    138138    </ProjectReference>
    139139    <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>
    141141      <Name>HeuristicLab.Core-3.3</Name>
    142142      <Private>False</Private>
    143143    </ProjectReference>
    144144    <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>
    146146      <Name>HeuristicLab.Data-3.3</Name>
    147147      <Private>False</Private>
    148148    </ProjectReference>
    149149    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    150       <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     150      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    151151      <Name>HeuristicLab.Optimization-3.3</Name>
    152152      <Private>False</Private>
    … …  
    158158    </ProjectReference>
    159159    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    160       <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     160      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    161161      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    162162      <Private>False</Private>
    163163    </ProjectReference>
    164164    <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>
    166166      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    167167      <Private>False</Private>
    … …  
    170170      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    171171      <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>
    172177      <Private>False</Private>
    173178    </ProjectReference>
Note: See TracChangeset for help on using the changeset viewer.