Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/04/12 16:45:02 (13 years ago)
Author:
spimming
Message:

#1680:

  • merged changes from trunk into branch
Location:
branches/HeuristicLab.Hive.Azure
Files:
3 deleted
6 edited
5 copied

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive.Azure

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.Benchmarks/3.3

    • Property svn:ignore

      •  

        old new  
        22bin
        33obj
         4*.vs10x
         5*.user

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.Benchmarks/3.3/HeuristicLab.Algorithms.Benchmarks-3.3.csproj

    r7006 r7270  
    8484    <Reference Include="System" />
    8585    <Reference Include="System.Core" />
     86    <Reference Include="System.Data" />
    8687    <Reference Include="System.Drawing" />
    87     <Reference Include="System.Xml.Linq" />
    88     <Reference Include="System.Data.DataSetExtensions" />
    89     <Reference Include="Microsoft.CSharp" />
    90     <Reference Include="System.Data" />
    9188    <Reference Include="System.Xml" />
    9289  </ItemGroup>
    9390  <ItemGroup>
    94     <Compile Include="Benchmark.cs">
    95       <SubType>Code</SubType>
    96     </Compile>
    97     <Compile Include="DhrystoneBenchmark.cs" />
     91    <Compile Include="Benchmark.cs" />
     92    <Compile Include="BenchmarkAlgorithm.cs" />
     93    <Compile Include="Dhrystone.cs" />
    9894    <Compile Include="IBenchmark.cs" />
    99     <Compile Include="LinpackBenchmark.cs" />
     95    <Compile Include="Linpack.cs" />
    10096    <Compile Include="Plugin.cs" />
    10197    <Compile Include="Properties\AssemblyInfo.cs" />
    102     <Compile Include="WhetstoneBenchmark.cs" />
     98    <Compile Include="Whetstone.cs" />
    10399  </ItemGroup>
    104100  <ItemGroup>
    … …  
    131127      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    132128      <Name>HeuristicLab.Data-3.3</Name>
    133       <Private>False</Private>
    134     </ProjectReference>
    135     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    136       <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    137       <Name>HeuristicLab.Operators-3.3</Name>
    138129      <Private>False</Private>
    139130    </ProjectReference>

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.Benchmarks/3.3/IBenchmark.cs

    r7006 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
     26
    2627namespace HeuristicLab.Algorithms.Benchmarks {
    2728  public interface IBenchmark : IItem {
    2829    byte[][] ChunkData { get; set; }
    2930    TimeSpan TimeLimit { get; set; }
    30     void Run(CancellationToken cancellationToken, ResultCollection resuls);
     31    void Run(CancellationToken cancellationToken, ResultCollection results);
    3132  }
    3233}

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.Benchmarks/3.3/Plugin.cs.frame

    r7006 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2626  /// Plugin class for HeuristicLab.Algorithms.Benchmark plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Algorithms.Benchmarks", "Provides different benchmarking algorithms", "3.3.5.$WCREV$")]
     28  [Plugin("HeuristicLab.Algorithms.Benchmarks", "Provides different performance benchmark algorithms.", "3.3.6.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Algorithms.Benchmarks-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]
    … …  
    3232  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    3333  [PluginDependency("HeuristicLab.Core", "3.3")]
    34   [PluginDependency("HeuristicLab.Data", "3.3")]   
     34  [PluginDependency("HeuristicLab.Data", "3.3")]
    3535  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3636  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    37   [PluginDependency("HeuristicLab.Persistence", "3.3")] 
     37  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    3838  public class HeuristicLabAlgorithmsBenchmarksPlugin : PluginBase {
    3939  }

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Algorithms.Benchmarks/3.3/Properties/AssemblyInfo.cs.frame

    r7006 r7270  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2011 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727// associated with an assembly.
    2828[assembly: AssemblyTitle("HeuristicLab.Algorithms.Benchmarks")]
    29 [assembly: AssemblyDescription("Benchmarking")]
     29[assembly: AssemblyDescription("HeuristicLab performance benchmark algorithms")]
    3030[assembly: AssemblyConfiguration("")]
    3131[assembly: AssemblyCompany("")]
    3232[assembly: AssemblyProduct("HeuristicLab")]
    33 [assembly: AssemblyCopyright("(c) 2002-2011 HEAL")]
     33[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
    3434[assembly: AssemblyTrademark("")]
    3535[assembly: AssemblyCulture("")]
    … …  
    4141
    4242// The following GUID is for the ID of the typelib if this project is exposed to COM
    43 [assembly: Guid("3E422463-0CE0-400D-9544-5C11D5818769")]
     43[assembly: Guid("2C246561-1750-4770-BDB9-0FD89D844068")]
    4444
    4545// Version information for an assembly consists of the following four values:
    … …  
    5353// by using the '*' as shown below:
    5454[assembly: AssemblyVersion("3.3.0.0")]
    55 [assembly: AssemblyFileVersion("3.3.5.$WCREV$")]
     55[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
Note: See TracChangeset for help on using the changeset viewer.