Changeset 12368

Timestamp:

04/29/15 17:19:59 (10 years ago)

Author:

pfleck

Message:

#2027 Fixed some typos.

Location:

branches/TerminationCriteria

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Termination/3.3/ComparisonTerminationCriterion.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/ExecutionTimeTerminationCriterion.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/ExecutionTimeTimeTerminationCriterion.cs) (2 diffs)
• HeuristicLab.Termination/3.3/HeuristicLab.Termination-3.3.csproj (modified) (1 diff)
• HeuristicLab.Termination/3.3/ThresholdTerminationCriterion.cs (modified) (1 diff)

branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

@@ -230 +230 @@
     private ComparisonTerminationCriterion<DoubleValue> qualityTerminationCriterion;
     [Storable]
-    private ExecutionTimeTimeTerminationCriterion executionTimeTerminationCriterion;
+    private ExecutionTimeTerminationCriterion executionTimeTerminationCriterion;
     #endregion
 
@@ -355 +355 @@
       maximumSelectionPressureTerminationCriterion = new ComparisonTerminationCriterion<DoubleValue>("SelectionPressure", "MaximumSelectionPressure", ComparisonType.GreaterOrEqual) { Name = "Maximum Selection Pressure" };
       qualityTerminationCriterion = new ComparisonTerminationCriterion<DoubleValue>() { Name = "Maximum/Minimum Quality" };
-      executionTimeTerminationCriterion = new ExecutionTimeTimeTerminationCriterion(this, TimeSpan.FromMinutes(5)) { Name = "Maximum Execution Time" };
+      executionTimeTerminationCriterion = new ExecutionTimeTerminationCriterion(this, TimeSpan.FromMinutes(5)) { Name = "Maximum Execution Time" };
       ParameterizeTerminationCriteria();
       UpdateTerminationCriteria();

branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminationCriterion.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Termination {
-  [Item("ComparisonTerminationCriterion", "An termination criterion which compares to values.")]
+  [Item("ComparisonTerminationCriterion", "An termination criterion which compares two values.")]
   [StorableClass]
   public class ComparisonTerminationCriterion<T> : ThresholdTerminationCriterion<T> where T : class, IItem, IComparable {

branches/TerminationCriteria/HeuristicLab.Termination/3.3/ExecutionTimeTerminationCriterion.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Termination {
-  [Item("ExecutionTimeTimeTerminationCriterion", "")]
+  [Item("ExecutionTimeTerminationCriterion", "A termination criterion based on execution time of an algorithm.")]
   [StorableClass]
-  public class ExecutionTimeTimeTerminationCriterion : ThresholdTerminationCriterion<TimeSpanValue> {
+  public class ExecutionTimeTerminationCriterion : ThresholdTerminationCriterion<TimeSpanValue> {
 
     [Storable]
@@ -35 +35 @@
 
     [StorableConstructor]
-    protected ExecutionTimeTimeTerminationCriterion(bool deserializing) : base(deserializing) { }
-    protected ExecutionTimeTimeTerminationCriterion(ExecutionTimeTimeTerminationCriterion original, Cloner cloner)
+    protected ExecutionTimeTerminationCriterion(bool deserializing) : base(deserializing) { }
+    protected ExecutionTimeTerminationCriterion(ExecutionTimeTerminationCriterion original, Cloner cloner)
       : base(original, cloner) {
       executable = cloner.Clone(executable);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ExecutionTimeTimeTerminationCriterion(this, cloner);
+      return new ExecutionTimeTerminationCriterion(this, cloner);
     }
-    public ExecutionTimeTimeTerminationCriterion(IExecutable executable)
+    public ExecutionTimeTerminationCriterion(IExecutable executable)
       : this(executable, new TimeSpan(0, 10, 0)) { }
-    public ExecutionTimeTimeTerminationCriterion(IExecutable executable, TimeSpan maximumExecutionTime) {
+    public ExecutionTimeTerminationCriterion(IExecutable executable, TimeSpan maximumExecutionTime) {
       this.executable = executable;
       ThresholdParameter.Value = new TimeSpanValue(maximumExecutionTime);

branches/TerminationCriteria/HeuristicLab.Termination/3.3/HeuristicLab.Termination-3.3.csproj

@@ -151 +151 @@
     <Compile Include="ComparisonTerminationCriterion.cs" />
     <Compile Include="MultiTerminationCriterion.cs" />
-    <Compile Include="ExecutionTimeTimeTerminationCriterion.cs" />
+    <Compile Include="ExecutionTimeTerminationCriterion.cs" />
     <Compile Include="TerminationCriterion.cs" />
     <Compile Include="TerminationOperator.cs" />

branches/TerminationCriteria/HeuristicLab.Termination/3.3/ThresholdTerminationCriterion.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Termination {
-  [Item("ThreshholdTerminationCriterion", "Basis class for all termination criteria which specifies some form of threshold.")]
+  [Item("ThresholdTerminationCriterion", "Base class for all termination criteria which specifies some threshold.")]
   [StorableClass]
   public abstract class ThresholdTerminationCriterion<T> : TerminationCriterion where T : class, IItem {