Changeset 7004

Timestamp:

11/16/11 16:48:09 (13 years ago)

Author:

ascheibe

Message:

#1659

• renamed benchmarking algs to Benchmark where it was missing
• merged from trunk

Location:

branches/Benchmarking

Files:

• . (modified) (1 prop)
• sources (modified) (1 prop)
• sources/HeuristicLab.Algorithms.Benchmarks/3.3/DhrystoneBenchmark.cs (modified) (3 diffs)
• sources/HeuristicLab.Algorithms.Benchmarks/3.3/HeuristicLab.Algorithms.Benchmarks-3.3.csproj (modified) (1 diff)
• sources/HeuristicLab.Algorithms.Benchmarks/3.3/WhetstoneBenchmark.cs (moved) (moved from branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/WhetstoneAlgorithm.cs)
• sources/HeuristicLab.Analysis (modified) (1 prop)
• sources/HeuristicLab.Analysis.Views/3.3/HeatMapView.resx (modified) (1 prop)
• sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs (modified) (1 prop)
• sources/HeuristicLab.Encodings.PermutationEncoding (modified) (1 prop)
• sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs (modified) (1 diff)
• sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj (modified) (1 diff)
• sources/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs (modified) (1 prop)
• sources/HeuristicLab.Persistence (modified) (1 prop)
• sources/HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• sources/HeuristicLab.Problems.QuadraticAssignment (modified) (1 prop)
• sources/HeuristicLab.Problems.QuadraticAssignment.Views (modified) (1 prop)
• sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Data (modified) (1 prop)
• sources/HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• sources/HeuristicLab.Problems.VehicleRouting.Views (modified) (1 prop)
• sources/HeuristicLab.Tests (modified) (1 prop)

branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/DhrystoneBenchmark.cs

@@ -33 +33 @@
   [Item("Dhrystone Algorithm", "Dhrystone benchmarking algorithm.")]
   [StorableClass]
-  public class DhrystoneAlgorithm : IBenchmark {
+  public class DhrystoneBenchmark : IBenchmark {
     [Storable]
     private byte[][] chunk;
@@ -98 +98 @@
 
     [StorableConstructor]
-    public DhrystoneAlgorithm(bool deserializing) { }
-
-    public DhrystoneAlgorithm() { }
-
-    protected DhrystoneAlgorithm(DhrystoneAlgorithm original, Cloner cloner) {
+    public DhrystoneBenchmark(bool deserializing) { }
+
+    public DhrystoneBenchmark() { }
+
+    protected DhrystoneBenchmark(DhrystoneBenchmark original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
     }
@@ -392 +392 @@
 
     public IDeepCloneable Clone(Cloner cloner) {
-      return new DhrystoneAlgorithm(this, cloner);
+      return new DhrystoneBenchmark(this, cloner);
     }
 

branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/HeuristicLab.Algorithms.Benchmarks-3.3.csproj

@@ -100 +100 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WhetstoneAlgorithm.cs" />
+    <Compile Include="WhetstoneBenchmark.cs" />
   </ItemGroup>
   <ItemGroup>

branches/Benchmarking/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs

@@ -134 +134 @@
       foreach (var s in symbol.Flatten()) {
         symbols.Add(s.Name, s);
-        symbolSubtreeCount.Add(s.Name, Tuple.Create(s.MinimumArity, s.MaximumArity));
+        int maxSubTreeCount = Math.Min(s.MinimumArity + 1, s.MaximumArity);
+        symbolSubtreeCount.Add(s.Name, Tuple.Create(s.MinimumArity, maxSubTreeCount));
       }
       ClearCaches();

branches/Benchmarking/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj

@@ -140 +140 @@
     <None Include="Plugin.cs.frame" />
     <Compile Include="Controls\ControlExtensions.cs" />
-    <Compile Include="MainForms\DockForm.cs" />
+    <Compile Include="MainForms\DockForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="MainForms\DockForm.Designer.cs">
       <DependentUpon>DockForm.cs</DependentUpon>