Changeset 16030


Ignore:
Timestamp:
07/30/18 13:02:34 (13 months ago)
Author:
fholzing
Message:

#2904: Made the branch compile

Location:
branches/2904_CalculateImpacts
Files:
3 added
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r15638 r16030  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     43    <OutputPath>..\..\..\..\trunk\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
     
    4747    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    4848    <Prefer32Bit>false</Prefer32Bit>
     49    <PlatformTarget>AnyCPU</PlatformTarget>
    4950  </PropertyGroup>
    5051  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    5152    <DebugType>pdbonly</DebugType>
    5253    <Optimize>true</Optimize>
    53     <OutputPath>$(SolutionDir)\bin\</OutputPath>
     54    <OutputPath>..\..\..\trunk\bin\</OutputPath>
    5455    <DefineConstants>TRACE</DefineConstants>
    5556    <ErrorReport>prompt</ErrorReport>
     
    100101  <ItemGroup>
    101102    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    102       <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
    103       <Private>False</Private>
     103      <SpecificVersion>False</SpecificVersion>
     104      <HintPath>..\..\..\..\trunk\bin\ALGLIB-3.7.0.dll</HintPath>
     105    </Reference>
     106    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     107      <SpecificVersion>False</SpecificVersion>
     108      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
     109    </Reference>
     110    <Reference Include="HeuristicLab.Analysis-3.3">
     111      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HeuristicLab.Analysis.Views-3.3">
     114      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Analysis.Views-3.3.dll</HintPath>
     115    </Reference>
     116    <Reference Include="HeuristicLab.Collections-3.3">
     117      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>
     118    </Reference>
     119    <Reference Include="HeuristicLab.Common-3.3">
     120      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common-3.3.dll</HintPath>
     121    </Reference>
     122    <Reference Include="HeuristicLab.Common.Resources-3.3">
     123      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
     124    </Reference>
     125    <Reference Include="HeuristicLab.Core-3.3">
     126      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core-3.3.dll</HintPath>
     127    </Reference>
     128    <Reference Include="HeuristicLab.Core.Views-3.3">
     129      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
     130    </Reference>
     131    <Reference Include="HeuristicLab.Data-3.3">
     132      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data-3.3.dll</HintPath>
     133    </Reference>
     134    <Reference Include="HeuristicLab.Data.Views-3.3">
     135      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Data.Views-3.3.dll</HintPath>
     136    </Reference>
     137    <Reference Include="HeuristicLab.MainForm-3.3">
     138      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
     139    </Reference>
     140    <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3">
     141      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
     142    </Reference>
     143    <Reference Include="HeuristicLab.Optimization-3.3">
     144      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
     145    </Reference>
     146    <Reference Include="HeuristicLab.Optimization.Views-3.3">
     147      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimization.Views-3.3.dll</HintPath>
     148    </Reference>
     149    <Reference Include="HeuristicLab.Optimizer-3.3">
     150      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Optimizer-3.3.dll</HintPath>
     151    </Reference>
     152    <Reference Include="HeuristicLab.Parameters.Views-3.3">
     153      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Parameters.Views-3.3.dll</HintPath>
     154    </Reference>
     155    <Reference Include="HeuristicLab.Persistence-3.3">
     156      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
     157    </Reference>
     158    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
     159      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     160    </Reference>
     161    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     162      <SpecificVersion>False</SpecificVersion>
     163      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis-3.4.dll</HintPath>
     164    </Reference>
     165    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
     166      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
     167    </Reference>
     168    <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4">
     169      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.dll</HintPath>
     170    </Reference>
     171    <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3">
     172      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
    104173    </Reference>
    105174    <Reference Include="System" />
     
    470539    <None Include="Properties\AssemblyInfo.cs.frame" />
    471540    <Compile Include="Properties\AssemblyInfo.cs" />
    472   </ItemGroup>
    473   <ItemGroup>
    474     <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj">
    475       <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
    476       <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
    477       <Private>False</Private>
    478     </ProjectReference>
    479     <ProjectReference Include="..\..\HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj">
    480       <Project>{76945D76-CA61-4147-9DC2-0ACDCDDF87F9}</Project>
    481       <Name>HeuristicLab.Analysis.Views-3.3</Name>
    482       <Private>False</Private>
    483     </ProjectReference>
    484     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
    485       <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    486       <Name>HeuristicLab.Analysis-3.3</Name>
    487       <Private>False</Private>
    488     </ProjectReference>
    489     <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    490       <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    491       <Name>HeuristicLab.Collections-3.3</Name>
    492       <Private>False</Private>
    493     </ProjectReference>
    494     <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    495       <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    496       <Name>HeuristicLab.Common.Resources-3.3</Name>
    497       <Private>False</Private>
    498     </ProjectReference>
    499     <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    500       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    501       <Name>HeuristicLab.Common-3.3</Name>
    502       <Private>False</Private>
    503     </ProjectReference>
    504     <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    505       <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    506       <Name>HeuristicLab.Core.Views-3.3</Name>
    507       <Private>False</Private>
    508     </ProjectReference>
    509     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    510       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    511       <Name>HeuristicLab.Core-3.3</Name>
    512       <Private>False</Private>
    513     </ProjectReference>
    514     <ProjectReference Include="..\..\HeuristicLab.Data.Views\3.3\HeuristicLab.Data.Views-3.3.csproj">
    515       <Project>{72104A0B-90E7-42F3-9ABE-9BBBADD4B943}</Project>
    516       <Name>HeuristicLab.Data.Views-3.3</Name>
    517       <Private>False</Private>
    518     </ProjectReference>
    519     <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    520       <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    521       <Name>HeuristicLab.Data-3.3</Name>
    522       <Private>False</Private>
    523     </ProjectReference>
    524     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    525       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    526       <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
    527       <Private>False</Private>
    528     </ProjectReference>
    529     <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    530       <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    531       <Name>HeuristicLab.MainForm-3.3</Name>
    532       <Private>False</Private>
    533     </ProjectReference>
    534     <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    535       <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    536       <Name>HeuristicLab.Optimization.Views-3.3</Name>
    537       <Private>False</Private>
    538     </ProjectReference>
    539     <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    540       <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    541       <Name>HeuristicLab.Optimization-3.3</Name>
    542       <Private>False</Private>
    543     </ProjectReference>
    544     <ProjectReference Include="..\..\HeuristicLab.Optimizer\3.3\HeuristicLab.Optimizer-3.3.csproj">
    545       <Project>{C664305E-497C-4533-A140-967DEDB05C19}</Project>
    546       <Name>HeuristicLab.Optimizer-3.3</Name>
    547       <Private>False</Private>
    548     </ProjectReference>
    549     <ProjectReference Include="..\..\HeuristicLab.Parameters.Views\3.3\HeuristicLab.Parameters.Views-3.3.csproj">
    550       <Project>{AE5B1CE5-9862-4D6F-A700-D72CD9AEA295}</Project>
    551       <Name>HeuristicLab.Parameters.Views-3.3</Name>
    552       <Private>False</Private>
    553     </ProjectReference>
    554     <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    555       <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    556       <Name>HeuristicLab.Persistence-3.3</Name>
    557       <Private>False</Private>
    558     </ProjectReference>
    559     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    560       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    561       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    562       <Private>False</Private>
    563     </ProjectReference>
    564     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
    565       <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
    566       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
    567       <Private>False</Private>
    568     </ProjectReference>
    569     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
    570       <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
    571       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
    572       <Private>False</Private>
    573     </ProjectReference>
    574     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
    575       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>
    576       <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
    577       <Private>False</Private>
    578     </ProjectReference>
    579     <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
    580       <Project>{315BDA09-3F4F-49B3-9790-B37CFC1C5750}</Project>
    581       <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    582       <Private>False</Private>
    583     </ProjectReference>
    584541  </ItemGroup>
    585542  <ItemGroup>
  • branches/2904_CalculateImpacts/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.cs

    r16021 r16030  
    137137      //Remember the original ordering of the variables
    138138      try {
    139         var impacts = await Task.Run(() => RegressionSolutionVariableImpactsCalculator.CalculateImpacts(Content, dataPartition, replMethod, factorReplMethod,
     139        var impacts = await Task.Run(() => RegressionSolutionVariableImpactsCalculator.CalculateImpacts(Content, replMethod, factorReplMethod, dataPartition,
    140140          (i, s) => {
    141141            progress.ProgressValue = i;
Note: See TracChangeset for help on using the changeset viewer.