Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/10/11 13:14:33 (14 years ago)
Author:
gkronber
Message:

changed project files and solution file to make the branch compatible with current trunk version. #1142

Location:
branches/DataAnalysis
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/DataAnalysis

    • Property svn:ignore set to
      *.suo

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/HeuristicLab.Problems.DataAnalysis-3.3.csproj

    r4555 r5265  
    1111    <RootNamespace>HeuristicLab.Problems.DataAnalysis</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.DataAnalysis-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <SignAssembly>true</SignAssembly>
    … …  
    3434    <UseApplicationTrust>false</UseApplicationTrust>
    3535    <BootstrapperEnabled>true</BootstrapperEnabled>
     36    <TargetFrameworkProfile />
    3637  </PropertyGroup>
    3738  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    … …  
    9192  </PropertyGroup>
    9293  <ItemGroup>
     94    <Reference Include="ALGLIB-3.1.0">
     95      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\ALGLIB-3.1.0.dll</HintPath>
     96    </Reference>
     97    <Reference Include="HeuristicLab.ALGLIB-3.1.0">
     98      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.ALGLIB-3.1.0.dll</HintPath>
     99    </Reference>
     100    <Reference Include="HeuristicLab.Analysis-3.3">
     101      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll</HintPath>
     102    </Reference>
     103    <Reference Include="HeuristicLab.Collections-3.3">
     104      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Common-3.3">
     107      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
     108    </Reference>
     109    <Reference Include="HeuristicLab.Core-3.3">
     110      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
     111    </Reference>
     112    <Reference Include="HeuristicLab.Data-3.3">
     113      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     114    </Reference>
     115    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3">
     116      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
     117    </Reference>
     118    <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3">
     119      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.dll</HintPath>
     120    </Reference>
     121    <Reference Include="HeuristicLab.LibSVM-1.6.3">
     122      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.LibSVM-1.6.3.dll</HintPath>
     123    </Reference>
     124    <Reference Include="HeuristicLab.Operators-3.3">
     125      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
     126    </Reference>
     127    <Reference Include="HeuristicLab.Optimization-3.3">
     128      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
     129    </Reference>
     130    <Reference Include="HeuristicLab.Parameters-3.3">
     131      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
     132    </Reference>
     133    <Reference Include="HeuristicLab.Persistence-3.3">
     134      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
     135    </Reference>
     136    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     137      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     138    </Reference>
     139    <Reference Include="HeuristicLab.Random-3.3">
     140      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
     141    </Reference>
     142    <Reference Include="LibSVM-1.6.3">
     143      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\LibSVM-1.6.3.dll</HintPath>
     144    </Reference>
    93145    <Reference Include="System" />
    94146    <Reference Include="System.Core">
    … …  
    184236  </ItemGroup>
    185237  <ItemGroup>
    186     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    187       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    188       <Name>HeuristicLab.Analysis-3.3</Name>
    189     </ProjectReference>
    190     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    191       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    192       <Name>HeuristicLab.Collections-3.3</Name>
    193     </ProjectReference>
    194     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    195       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    196       <Name>HeuristicLab.Common.Resources-3.3</Name>
    197     </ProjectReference>
    198     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    199       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    200       <Name>HeuristicLab.Common-3.3</Name>
    201     </ProjectReference>
    202     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    203       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    204       <Name>HeuristicLab.Core-3.3</Name>
    205     </ProjectReference>
    206     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    207       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    208       <Name>HeuristicLab.Data-3.3</Name>
    209     </ProjectReference>
    210     <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
    211       <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
    212       <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
    213     </ProjectReference>
    214     <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    215       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    216       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    217     </ProjectReference>
    218     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\ALGLIB-2.5.0\ALGLIB-2.5.0.csproj">
    219       <Project>{29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}</Project>
    220       <Name>ALGLIB-2.5.0</Name>
    221     </ProjectReference>
    222     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">
    223       <Project>{89B50302-9CEE-4D13-9779-633EADCAE624}</Project>
    224       <Name>HeuristicLab.LibSVM-1.6.3 %28HeuristicLab.ExtLibs\HeuristicLab.LibSVM\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3%29</Name>
    225     </ProjectReference>
    226     <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\LibSVM-1.6.3\LibSVM-1.6.3.csproj">
    227       <Project>{A16F23B5-FB62-499E-A831-26953AA56FE2}</Project>
    228       <Name>LibSVM-1.6.3</Name>
    229     </ProjectReference>
    230     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    231       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    232       <Name>HeuristicLab.Operators-3.3</Name>
    233     </ProjectReference>
    234     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    235       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    236       <Name>HeuristicLab.Optimization-3.3</Name>
    237     </ProjectReference>
    238     <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    239       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    240       <Name>HeuristicLab.Parameters-3.3</Name>
    241     </ProjectReference>
    242     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    243       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    244       <Name>HeuristicLab.Persistence-3.3</Name>
    245     </ProjectReference>
    246     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    247       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    248       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    249     </ProjectReference>
    250     <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    251       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    252       <Name>HeuristicLab.Random-3.3</Name>
    253     </ProjectReference>
    254   </ItemGroup>
    255   <ItemGroup>
    256238    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    257239      <Visible>False</Visible>

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/CovariantParsimonyPressure.cs

    r4350 r5265  
    2222using System;
    2323using System.Linq;
    24 using alglib;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Data;
    … …  
    200199                               select normFit).ToArray<double>();
    201200
    202         LengthCorrelationParameter.ActualValue = new DoubleValue(alglib.correlation.spearmanrankcorrelation(lengthArr, adjFitess, lengthArr.Length));
    203         FitnessCorrelationParameter.ActualValue = new DoubleValue(alglib.correlation.spearmanrankcorrelation(fitnessArr, adjFitess, lengthArr.Length));
     201        LengthCorrelationParameter.ActualValue = new DoubleValue(alglib.spearmancorr2(lengthArr, adjFitess, lengthArr.Length));
     202        FitnessCorrelationParameter.ActualValue = new DoubleValue(alglib.spearmancorr2(fitnessArr, adjFitess, lengthArr.Length));
    204203
    205204      } else {
    … …  
    215214                           select f.Value).ToArray<double>();
    216215
    217         LengthCorrelationParameter.ActualValue = new DoubleValue(alglib.correlation.spearmanrankcorrelation(lengths, fitess, lengths.Length));
     216        LengthCorrelationParameter.ActualValue = new DoubleValue(alglib.spearmancorr2(lengths, fitess, lengths.Length));
    218217      }
    219218      return base.Apply();

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/CovariantParsimonyPressureAdder.cs

    r4309 r5265  
    2222using System;
    2323using System.Linq;
    24 using alglib;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Data;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynOpEqComparator.cs

    r4227 r5265  
    2222using System;
    2323using System.Linq;
    24 using alglib;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Data;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynOpEqHistogramInitializer.cs

    r4222 r5265  
    2222using System;
    2323using System.Linq;
    24 using alglib;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Data;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynamicDepthLimitComparator.cs

    r4228 r5265  
    2222using System;
    2323using System.Linq;
    24 using alglib;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Data;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/DynamicDepthLimitInitializer.cs

    r4221 r5265  
    2222using System;
    2323using System.Linq;
    24 using alglib;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Data;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Operators/WeightedParentsQualityVarianceComparator.cs

    r4193 r5265  
    2222using System;
    2323using System.Linq;
    24 using alglib;
    2524using HeuristicLab.Core;
    2625using HeuristicLab.Data;

  • branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Tests/HeuristicLab.Problems.DataAnalysis.Tests-3.3.csproj

    r4459 r5265  
    119119  </ItemGroup>
    120120  <ItemGroup>
    121     <ProjectReference Include="..\..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    122       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    123       <Name>HeuristicLab.Common.Resources-3.3</Name>
    124     </ProjectReference>
    125     <ProjectReference Include="..\..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    126       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    127       <Name>HeuristicLab.Common-3.3</Name>
    128     </ProjectReference>
    129     <ProjectReference Include="..\..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    130       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    131       <Name>HeuristicLab.Core-3.3</Name>
    132     </ProjectReference>
    133     <ProjectReference Include="..\..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    134       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    135       <Name>HeuristicLab.Data-3.3</Name>
    136     </ProjectReference>
    137     <ProjectReference Include="..\..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.3\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3.csproj">
    138       <Project>{125D3006-67F5-48CB-913E-73C0548F17FA}</Project>
    139       <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.3</Name>
    140     </ProjectReference>
    141     <ProjectReference Include="..\..\..\HeuristicLab.ExtLibs\HeuristicLab.ALGLIB\2.5.0\ALGLIB-2.5.0\ALGLIB-2.5.0.csproj">
    142       <Project>{29E4B033-1FEF-4FE1-AE17-0A9319D7C54E}</Project>
    143       <Name>ALGLIB-2.5.0</Name>
    144     </ProjectReference>
    145     <ProjectReference Include="..\..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    146       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    147       <Name>HeuristicLab.Operators-3.3</Name>
    148     </ProjectReference>
    149     <ProjectReference Include="..\..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    150       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    151       <Name>HeuristicLab.Optimization-3.3</Name>
    152     </ProjectReference>
    153     <ProjectReference Include="..\..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    154       <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    155       <Name>HeuristicLab.Parameters-3.3</Name>
    156     </ProjectReference>
    157121    <ProjectReference Include="..\..\..\HeuristicLab.Problems.DataAnalysis.Regression\3.3\HeuristicLab.Problems.DataAnalysis.Regression-3.3.csproj">
    158122      <Project>{BDF86B1D-630E-4CE2-8A49-8C90B1BDE4C9}</Project>
    159123      <Name>HeuristicLab.Problems.DataAnalysis.Regression-3.3</Name>
    160     </ProjectReference>
    161     <ProjectReference Include="..\..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    162       <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    163       <Name>HeuristicLab.Random-3.3</Name>
    164124    </ProjectReference>
    165125    <ProjectReference Include="..\HeuristicLab.Problems.DataAnalysis-3.3.csproj">
Note: See TracChangeset for help on using the changeset viewer.