Changeset 7002


Ignore:
Timestamp:
11/16/11 16:37:46 (8 years ago)
Author:
ascheibe
Message:

#1659

  • fixed errors found by unit tests
  • set references to copylocal=false
  • added missing platforms to project files
Location:
branches/Benchmarking/sources
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks.Views/3.3/BenchmarkView.cs

    r6948 r7002  
    2828  [Content(typeof(Benchmark), true)]
    2929  public partial class BenchmarkView : AlgorithmView {
     30    public new Benchmark Content {
     31      get { return (Benchmark)base.Content; }
     32      set { base.Content = value; }
     33    }
    3034    public BenchmarkView() {
    3135      InitializeComponent();
  • branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks.Views/3.3/HeuristicLab.Algorithms.Benchmarks.Views-3.3.csproj

    r6934 r7002  
    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>
    2323    <WarningLevel>4</WarningLevel>
     24    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2425  </PropertyGroup>
    2526  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    2627    <DebugType>pdbonly</DebugType>
    2728    <Optimize>true</Optimize>
    28     <OutputPath>..\..\bin\</OutputPath>
     29    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2930    <DefineConstants>TRACE</DefineConstants>
    3031    <ErrorReport>prompt</ErrorReport>
    3132    <WarningLevel>4</WarningLevel>
     33    <DocumentationFile>
     34    </DocumentationFile>
     35    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     36  </PropertyGroup>
     37  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     38    <DebugSymbols>true</DebugSymbols>
     39    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     40    <DefineConstants>DEBUG;TRACE</DefineConstants>
     41    <DebugType>full</DebugType>
     42    <PlatformTarget>x86</PlatformTarget>
     43    <ErrorReport>prompt</ErrorReport>
     44    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     45  </PropertyGroup>
     46  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     47    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     48    <DefineConstants>TRACE</DefineConstants>
     49    <DocumentationFile>
     50    </DocumentationFile>
     51    <Optimize>true</Optimize>
     52    <DebugType>pdbonly</DebugType>
     53    <PlatformTarget>x86</PlatformTarget>
     54    <ErrorReport>prompt</ErrorReport>
     55    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     56  </PropertyGroup>
     57  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     58    <DebugSymbols>true</DebugSymbols>
     59    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     60    <DefineConstants>DEBUG;TRACE</DefineConstants>
     61    <DebugType>full</DebugType>
     62    <PlatformTarget>x64</PlatformTarget>
     63    <ErrorReport>prompt</ErrorReport>
     64    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     65  </PropertyGroup>
     66  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     67    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     68    <DefineConstants>TRACE</DefineConstants>
     69    <DocumentationFile>
     70    </DocumentationFile>
     71    <Optimize>true</Optimize>
     72    <DebugType>pdbonly</DebugType>
     73    <PlatformTarget>x64</PlatformTarget>
     74    <ErrorReport>prompt</ErrorReport>
     75    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3276  </PropertyGroup>
    3377  <PropertyGroup>
     
    3882  </PropertyGroup>
    3983  <ItemGroup>
    40     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    41     <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    42     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    43     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Classification-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    44     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    45     <Reference Include="HeuristicLab.Problems.DataAnalysis.Views-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    4684    <Reference Include="System" />
    4785    <Reference Include="System.Core" />
     
    73111      <Project>{068C70A7-8CAF-4AB6-8721-4564D62292BC}</Project>
    74112      <Name>HeuristicLab.Algorithms.Benchmarks-3.3</Name>
     113      <Private>False</Private>
    75114    </ProjectReference>
    76115    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    77116      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    78117      <Name>HeuristicLab.Collections-3.3</Name>
     118      <Private>False</Private>
    79119    </ProjectReference>
    80120    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    81121      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    82122      <Name>HeuristicLab.Common-3.3</Name>
     123      <Private>False</Private>
    83124    </ProjectReference>
    84125    <ProjectReference Include="..\..\HeuristicLab.Core.Views\3.3\HeuristicLab.Core.Views-3.3.csproj">
    85126      <Project>{E226881D-315F-423D-B419-A766FE0D8685}</Project>
    86127      <Name>HeuristicLab.Core.Views-3.3</Name>
     128      <Private>False</Private>
    87129    </ProjectReference>
    88130    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    89131      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    90132      <Name>HeuristicLab.Core-3.3</Name>
     133      <Private>False</Private>
    91134    </ProjectReference>
    92135    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    93136      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
    94137      <Name>HeuristicLab.MainForm.WindowsForms-3.3</Name>
     138      <Private>False</Private>
    95139    </ProjectReference>
    96140    <ProjectReference Include="..\..\HeuristicLab.MainForm\3.3\HeuristicLab.MainForm-3.3.csproj">
    97141      <Project>{3BD61258-31DA-4B09-89C0-4F71FEF5F05A}</Project>
    98142      <Name>HeuristicLab.MainForm-3.3</Name>
     143      <Private>False</Private>
    99144    </ProjectReference>
    100145    <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj">
    101146      <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project>
    102147      <Name>HeuristicLab.Optimization.Views-3.3</Name>
     148      <Private>False</Private>
    103149    </ProjectReference>
    104150    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    105151      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    106152      <Name>HeuristicLab.Optimization-3.3</Name>
     153      <Private>False</Private>
    107154    </ProjectReference>
    108155    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    109156      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    110157      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
    111     </ProjectReference>
    112     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj">
    113       <Project>{BF1E4DF4-A4CC-451F-9D50-303F405E265E}</Project>
    114       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4</Name>
     158      <Private>False</Private>
    115159    </ProjectReference>
    116160  </ItemGroup>
  • branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks.Views/3.3/Plugin.cs.frame

    r6934 r7002  
    2727  /// </summary>
    2828  [Plugin("HeuristicLab.Algorithms.Benchmarks.Views", "Provides views for benchmarking algorithms.", "3.3.5.$WCREV$")]
    29   [PluginFile("HeuristicLab.Algorithms.Benchmarks.Views-3.3.dll", PluginFileType.Assembly)]
    30   [PluginDependency("HeuristicLab.Algorithms.Benchmarks", "3.3")]
    31   [PluginDependency("HeuristicLab.Collections", "3.3")]
    32   [PluginDependency("HeuristicLab.Common", "3.3")]
    33   [PluginDependency("HeuristicLab.Core", "3.3")]
    34   [PluginDependency("HeuristicLab.Core.Views", "3.3")]
     29  [PluginFile("HeuristicLab.Algorithms.Benchmarks.Views-3.3.dll", PluginFileType.Assembly)] 
    3530  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3631  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    3732  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3833  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
     34  [PluginDependency("HeuristicLab.Algorithms.Benchmarks", "3.3")]
    3935  public class HeuristicLabAlgorithmsBenchmarksViewsPlugin : PluginBase {
    4036  }
  • branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/Benchmark.cs

    r6987 r7002  
    237237    #region Constructors
    238238
     239    [StorableConstructor]
     240    public Benchmark(bool deserializing) { }
     241
    239242    public Benchmark() {
    240243      name = ItemName;
  • branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/DhrystoneBenchmark.cs

    r6987 r7002  
    4141    }
    4242
     43    [Storable]
    4344    private TimeSpan timeLimit;
    4445    public TimeSpan TimeLimit {
     
    9697    #region Costructors
    9798
    98     public DhrystoneAlgorithm() {
    99     }
    100 
    101     private DhrystoneAlgorithm(DhrystoneAlgorithm original, Cloner cloner) {
     99    [StorableConstructor]
     100    public DhrystoneAlgorithm(bool deserializing) { }
     101
     102    public DhrystoneAlgorithm() { }
     103
     104    protected DhrystoneAlgorithm(DhrystoneAlgorithm original, Cloner cloner) {
    102105      cloner.RegisterClonedObject(original, this);
    103106    }
  • branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/HeuristicLab.Algorithms.Benchmarks-3.3.csproj

    r6948 r7002  
    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>
    2323    <WarningLevel>4</WarningLevel>
     24    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    2425  </PropertyGroup>
    2526  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    2627    <DebugType>pdbonly</DebugType>
    2728    <Optimize>true</Optimize>
    28     <OutputPath>..\..\bin\</OutputPath>
     29    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2930    <DefineConstants>TRACE</DefineConstants>
    3031    <ErrorReport>prompt</ErrorReport>
    3132    <WarningLevel>4</WarningLevel>
     33    <DocumentationFile>
     34    </DocumentationFile>
     35    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     36  </PropertyGroup>
     37  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     38    <DebugSymbols>true</DebugSymbols>
     39    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     40    <DefineConstants>DEBUG;TRACE</DefineConstants>
     41    <DebugType>full</DebugType>
     42    <PlatformTarget>x86</PlatformTarget>
     43    <ErrorReport>prompt</ErrorReport>
     44    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     45  </PropertyGroup>
     46  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     47    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     48    <DefineConstants>TRACE</DefineConstants>
     49    <DocumentationFile>
     50    </DocumentationFile>
     51    <Optimize>true</Optimize>
     52    <DebugType>pdbonly</DebugType>
     53    <PlatformTarget>x86</PlatformTarget>
     54    <ErrorReport>prompt</ErrorReport>
     55    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     56  </PropertyGroup>
     57  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     58    <DebugSymbols>true</DebugSymbols>
     59    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     60    <DefineConstants>DEBUG;TRACE</DefineConstants>
     61    <DebugType>full</DebugType>
     62    <PlatformTarget>x64</PlatformTarget>
     63    <ErrorReport>prompt</ErrorReport>
     64    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     65  </PropertyGroup>
     66  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     67    <OutputPath>$(SolutionDir)\bin\</OutputPath>
     68    <DefineConstants>TRACE</DefineConstants>
     69    <DocumentationFile>
     70    </DocumentationFile>
     71    <Optimize>true</Optimize>
     72    <DebugType>pdbonly</DebugType>
     73    <PlatformTarget>x64</PlatformTarget>
     74    <ErrorReport>prompt</ErrorReport>
     75    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    3276  </PropertyGroup>
    3377  <PropertyGroup>
     
    67111      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    68112      <Name>HeuristicLab.Collections-3.3</Name>
     113      <Private>False</Private>
    69114    </ProjectReference>
    70115    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    71116      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    72117      <Name>HeuristicLab.Common.Resources-3.3</Name>
     118      <Private>False</Private>
    73119    </ProjectReference>
    74120    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    75121      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    76122      <Name>HeuristicLab.Common-3.3</Name>
     123      <Private>False</Private>
    77124    </ProjectReference>
    78125    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    79126      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    80127      <Name>HeuristicLab.Core-3.3</Name>
     128      <Private>False</Private>
    81129    </ProjectReference>
    82130    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    83131      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    84132      <Name>HeuristicLab.Data-3.3</Name>
     133      <Private>False</Private>
    85134    </ProjectReference>
    86135    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    87136      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    88137      <Name>HeuristicLab.Operators-3.3</Name>
     138      <Private>False</Private>
    89139    </ProjectReference>
    90140    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    91141      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    92142      <Name>HeuristicLab.Optimization-3.3</Name>
     143      <Private>False</Private>
    93144    </ProjectReference>
    94145    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    95146      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    96147      <Name>HeuristicLab.Parameters-3.3</Name>
     148      <Private>False</Private>
    97149    </ProjectReference>
    98150    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    99151      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    100152      <Name>HeuristicLab.Persistence-3.3</Name>
     153      <Private>False</Private>
    101154    </ProjectReference>
    102155    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    103156      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    104157      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     158      <Private>False</Private>
    105159    </ProjectReference>
    106160  </ItemGroup>
  • branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/LinpackBenchmark.cs

    r6987 r7002  
    4141    }
    4242
     43    [Storable]
    4344    private TimeSpan timeLimit;
    4445    public TimeSpan TimeLimit {
     
    8384    #region Costructors
    8485
    85     public LinpackBenchmark() {
    86     }
     86    [StorableConstructor]
     87    public LinpackBenchmark(bool deserializing) { }
     88
     89    public LinpackBenchmark() { }
    8790
    8891    public LinpackBenchmark(LinpackBenchmark original, Cloner cloner) {
  • branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/Plugin.cs.frame

    r6934 r7002  
    3232  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3333  [PluginDependency("HeuristicLab.Core", "3.3")]
    34   [PluginDependency("HeuristicLab.Data", "3.3")]
    35   [PluginDependency("HeuristicLab.Operators", "3.3")]
     34  [PluginDependency("HeuristicLab.Data", "3.3")]   
    3635  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3736  [PluginDependency("HeuristicLab.Parameters", "3.3")]
  • branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/WhetstoneAlgorithm.cs

    r6987 r7002  
    4141    }
    4242
     43    [Storable]
    4344    private TimeSpan timeLimit;
    4445    public TimeSpan TimeLimit {
     
    8485    #region Costructors
    8586
    86     public WhetstoneBenchmark() {
    87     }
    88 
    89     private WhetstoneBenchmark(WhetstoneBenchmark original, Cloner cloner) {
     87    [StorableConstructor]
     88    public WhetstoneBenchmark(bool deserializing) { }
     89
     90    public WhetstoneBenchmark() { }
     91
     92    protected WhetstoneBenchmark(WhetstoneBenchmark original, Cloner cloner) {
    9093      cloner.RegisterClonedObject(original, this);
    9194    }
  • branches/Benchmarking/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r7000 r7002  
    570570  </ItemGroup>
    571571  <ItemGroup>
     572    <ProjectReference Include="..\HeuristicLab.Algorithms.Benchmarks.Views\3.3\HeuristicLab.Algorithms.Benchmarks.Views-3.3.csproj">
     573      <Project>{3C906172-E044-4DF0-B4FD-AA21192D5D3E}</Project>
     574      <Name>HeuristicLab.Algorithms.Benchmarks.Views-3.3</Name>
     575    </ProjectReference>
     576    <ProjectReference Include="..\HeuristicLab.Algorithms.Benchmarks\3.3\HeuristicLab.Algorithms.Benchmarks-3.3.csproj">
     577      <Project>{068C70A7-8CAF-4AB6-8721-4564D62292BC}</Project>
     578      <Name>HeuristicLab.Algorithms.Benchmarks-3.3</Name>
     579    </ProjectReference>
    572580    <ProjectReference Include="..\HeuristicLab.Algorithms.DataAnalysis.Views\3.4\HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj">
    573581      <Project>{A2330DB0-413D-4424-B4E6-591118E2B9F8}</Project>
Note: See TracChangeset for help on using the changeset viewer.