Changeset 7004 for branches/Benchmarking/sources
- Timestamp:
- 11/16/11 16:48:09 (13 years ago)
- Location:
- branches/Benchmarking
- Files:
-
- 19 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/Benchmarking
-
branches/Benchmarking/sources
- Property svn:mergeinfo changed
/trunk/sources merged: 7001
- Property svn:mergeinfo changed
-
branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/DhrystoneBenchmark.cs
r7002 r7004 33 33 [Item("Dhrystone Algorithm", "Dhrystone benchmarking algorithm.")] 34 34 [StorableClass] 35 public class Dhrystone Algorithm: IBenchmark {35 public class DhrystoneBenchmark : IBenchmark { 36 36 [Storable] 37 37 private byte[][] chunk; … … 98 98 99 99 [StorableConstructor] 100 public Dhrystone Algorithm(bool deserializing) { }101 102 public Dhrystone Algorithm() { }103 104 protected Dhrystone Algorithm(DhrystoneAlgorithmoriginal, Cloner cloner) {100 public DhrystoneBenchmark(bool deserializing) { } 101 102 public DhrystoneBenchmark() { } 103 104 protected DhrystoneBenchmark(DhrystoneBenchmark original, Cloner cloner) { 105 105 cloner.RegisterClonedObject(original, this); 106 106 } … … 392 392 393 393 public IDeepCloneable Clone(Cloner cloner) { 394 return new Dhrystone Algorithm(this, cloner);394 return new DhrystoneBenchmark(this, cloner); 395 395 } 396 396 -
branches/Benchmarking/sources/HeuristicLab.Algorithms.Benchmarks/3.3/HeuristicLab.Algorithms.Benchmarks-3.3.csproj
r7002 r7004 100 100 <Compile Include="Plugin.cs" /> 101 101 <Compile Include="Properties\AssemblyInfo.cs" /> 102 <Compile Include="Whetstone Algorithm.cs" />102 <Compile Include="WhetstoneBenchmark.cs" /> 103 103 </ItemGroup> 104 104 <ItemGroup> -
branches/Benchmarking/sources/HeuristicLab.Analysis
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Analysis.Views/3.3/HeatMapView.resx
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Core.Views/3.3/TypeSelector.cs
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Encodings.PermutationEncoding
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionGrammarBase.cs
r6911 r7004 134 134 foreach (var s in symbol.Flatten()) { 135 135 symbols.Add(s.Name, s); 136 symbolSubtreeCount.Add(s.Name, Tuple.Create(s.MinimumArity, s.MaximumArity)); 136 int maxSubTreeCount = Math.Min(s.MinimumArity + 1, s.MaximumArity); 137 symbolSubtreeCount.Add(s.Name, Tuple.Create(s.MinimumArity, maxSubTreeCount)); 137 138 } 138 139 ClearCaches(); -
branches/Benchmarking/sources/HeuristicLab.MainForm.WindowsForms/3.3/HeuristicLab.MainForm.WindowsForms-3.3.csproj
r7000 r7004 140 140 <None Include="Plugin.cs.frame" /> 141 141 <Compile Include="Controls\ControlExtensions.cs" /> 142 <Compile Include="MainForms\DockForm.cs" /> 142 <Compile Include="MainForms\DockForm.cs"> 143 <SubType>Form</SubType> 144 </Compile> 143 145 <Compile Include="MainForms\DockForm.Designer.cs"> 144 146 <DependentUpon>DockForm.cs</DependentUpon> -
branches/Benchmarking/sources/HeuristicLab.Optimization/3.3/Problems/SingleObjectiveHeuristicOptimizationProblem.cs
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Persistence
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Problems.DataAnalysis
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Problems.QuadraticAssignment
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Problems.QuadraticAssignment.Views
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Data
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Problems.VehicleRouting
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Problems.VehicleRouting.Views
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/Benchmarking/sources/HeuristicLab.Tests
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.