Changeset 14846


Ignore:
Timestamp:
04/11/17 16:30:56 (4 months ago)
Author:
gkronber
Message:

#745: merged elastic-net from branch to trunk

Location:
trunk/sources
Files:
2 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r14663 r14846  
    9393    {B94FFB82-43D4-40AB-9980-B03470ADF221} = {B94FFB82-43D4-40AB-9980-B03470ADF221}
    9494    {06D4A186-9319-48A0-BADE-A2058D462EEA} = {06D4A186-9319-48A0-BADE-A2058D462EEA}
     95    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9} = {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}
    9596    {5B9B9E8C-2706-43C2-80B8-A08341E431F7} = {5B9B9E8C-2706-43C2-80B8-A08341E431F7}
    9697    {997F018D-AEA2-4F21-9301-82FAF6A5612D} = {997F018D-AEA2-4F21-9301-82FAF6A5612D}
     
    449450EndProject
    450451Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.BinPacking-3.3", "HeuristicLab.Problems.BinPacking\3.3\HeuristicLab.Problems.BinPacking-3.3.csproj", "{F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}"
     452EndProject
     453Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.DataAnalysis.Glmnet", "HeuristicLab.Algorithms.DataAnalysis.Glmnet\3.4\HeuristicLab.Algorithms.DataAnalysis.Glmnet.csproj", "{4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}"
    451454EndProject
    452455Global
     
    21882191    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x86.ActiveCfg = Release|x86
    21892192    {F8A55094-3CD5-4034-B0CA-5BD7FFB016D4}.Release|x86.Build.0 = Release|x86
     2193    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2194    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2195    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|x64.ActiveCfg = Debug|x64
     2196    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|x64.Build.0 = Debug|x64
     2197    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|x86.ActiveCfg = Debug|x86
     2198    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Debug|x86.Build.0 = Debug|x86
     2199    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2200    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|Any CPU.Build.0 = Release|Any CPU
     2201    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|x64.ActiveCfg = Release|x64
     2202    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|x64.Build.0 = Release|x64
     2203    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|x86.ActiveCfg = Release|x86
     2204    {4C7F6D8A-B279-4898-ACD6-7BE39111DEF9}.Release|x86.Build.0 = Release|x86
    21902205  EndGlobalSection
    21912206  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Glmnet/3.4/HeuristicLab.Algorithms.DataAnalysis.Glmnet.csproj

    r14370 r14846  
    4444    <StartupObject />
    4545  </PropertyGroup>
     46  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     47    <DebugSymbols>true</DebugSymbols>
     48    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     49    <DefineConstants>DEBUG;TRACE</DefineConstants>
     50    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     51    <DebugType>full</DebugType>
     52    <PlatformTarget>x64</PlatformTarget>
     53    <ErrorReport>prompt</ErrorReport>
     54  </PropertyGroup>
     55  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     56    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     57    <DefineConstants>TRACE</DefineConstants>
     58    <Optimize>true</Optimize>
     59    <DebugType>pdbonly</DebugType>
     60    <PlatformTarget>x64</PlatformTarget>
     61    <ErrorReport>prompt</ErrorReport>
     62  </PropertyGroup>
     63  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     64    <DebugSymbols>true</DebugSymbols>
     65    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     66    <DefineConstants>DEBUG;TRACE</DefineConstants>
     67    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     68    <DebugType>full</DebugType>
     69    <PlatformTarget>x86</PlatformTarget>
     70    <ErrorReport>prompt</ErrorReport>
     71  </PropertyGroup>
     72  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     73    <OutputPath>..\..\..\trunk\sources\bin\</OutputPath>
     74    <DefineConstants>TRACE</DefineConstants>
     75    <Optimize>true</Optimize>
     76    <DebugType>pdbonly</DebugType>
     77    <PlatformTarget>x86</PlatformTarget>
     78    <ErrorReport>prompt</ErrorReport>
     79  </PropertyGroup>
    4680  <ItemGroup>
    47     <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    48       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
    49       <SpecificVersion>False</SpecificVersion>
    50       <Private>False</Private>
    51     </Reference>
    52     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    53       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    54       <SpecificVersion>False</SpecificVersion>
    55       <Private>False</Private>
    56     </Reference>
    57     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    58       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    59       <SpecificVersion>False</SpecificVersion>
    60       <Private>False</Private>
    61     </Reference>
    62     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    63       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    64       <SpecificVersion>False</SpecificVersion>
    65       <Private>False</Private>
    66     </Reference>
    67     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    68       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    69       <SpecificVersion>False</SpecificVersion>
    70       <Private>False</Private>
    71     </Reference>
    72     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    73       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    74       <SpecificVersion>False</SpecificVersion>
    75       <Private>False</Private>
    76     </Reference>
    77     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    78       <SpecificVersion>False</SpecificVersion>
    79       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
    80       <SpecificVersion>False</SpecificVersion>
    81       <Private>False</Private>
    82     </Reference>
    83     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    84       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    85       <SpecificVersion>False</SpecificVersion>
    86       <Private>False</Private>
    87     </Reference>
    88     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    89       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    90       <SpecificVersion>False</SpecificVersion>
    91       <Private>False</Private>
    92     </Reference>
    93     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    94       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    95       <SpecificVersion>False</SpecificVersion>
    96       <Private>False</Private>
    97     </Reference>
    98     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    99       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    100       <SpecificVersion>False</SpecificVersion>
    101       <Private>False</Private>
    102     </Reference>
    103     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    104       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
    105       <SpecificVersion>False</SpecificVersion>
    106       <Private>False</Private>
    107     </Reference>
    108     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    109       <SpecificVersion>False</SpecificVersion>
    110       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
    111       <SpecificVersion>False</SpecificVersion>
    112       <Private>False</Private>
    113     </Reference>
    114     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    115       <SpecificVersion>False</SpecificVersion>
    116       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
    117       <SpecificVersion>False</SpecificVersion>
    118       <Private>False</Private>
    119     </Reference>
    120     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    121       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    122       <SpecificVersion>False</SpecificVersion>
    123       <Private>False</Private>
    124     </Reference>
    12581    <Reference Include="System" />
    12682    <Reference Include="System.Core" />
     
    13490  </ItemGroup>
    13591  <ItemGroup>
    136     <None Include="Build.cmd" />
    13792    <None Include="HeuristicLab.snk" />
    13893    <None Include="Plugin.cs.frame" />
    139     <None Include="PreBuildEvent.cmd" />
    14094    <None Include="Properties\AssemblyInfo.cs.frame" />
    14195  </ItemGroup>
     
    156110    <Compile Include="Plugin.cs" />
    157111    <Compile Include="Properties\AssemblyInfo.cs" />
     112  </ItemGroup>
     113  <ItemGroup>
     114    <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj">
     115      <Project>{2e782078-fa81-4b70-b56f-74ce38dac6c8}</Project>
     116      <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
     117    </ProjectReference>
     118    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     119      <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>
     120      <Name>HeuristicLab.Analysis-3.3</Name>
     121    </ProjectReference>
     122    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     123      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     124      <Name>HeuristicLab.Collections-3.3</Name>
     125    </ProjectReference>
     126    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     127      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     128      <Name>HeuristicLab.Common-3.3</Name>
     129    </ProjectReference>
     130    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     131      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     132      <Name>HeuristicLab.Core-3.3</Name>
     133    </ProjectReference>
     134    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     135      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     136      <Name>HeuristicLab.Data-3.3</Name>
     137    </ProjectReference>
     138    <ProjectReference Include="..\..\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding\3.4\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.csproj">
     139      <Project>{06D4A186-9319-48A0-BADE-A2058D462EEA}</Project>
     140      <Name>HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4</Name>
     141    </ProjectReference>
     142    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     143      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     144      <Name>HeuristicLab.Optimization-3.3</Name>
     145    </ProjectReference>
     146    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     147      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     148      <Name>HeuristicLab.Parameters-3.3</Name>
     149    </ProjectReference>
     150    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     151      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     152      <Name>HeuristicLab.Persistence-3.3</Name>
     153    </ProjectReference>
     154    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     155      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     156      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     157    </ProjectReference>
     158    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
     159      <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
     160      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
     161    </ProjectReference>
     162    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
     163      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
     164      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
     165    </ProjectReference>
     166    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
     167      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
     168      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
     169    </ProjectReference>
     170    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     171      <Project>{3540E29E-4793-49E7-8EE2-FEA7F61C3994}</Project>
     172      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     173    </ProjectReference>
    158174  </ItemGroup>
    159175  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.