Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/20/15 11:28:32 (10 years ago)
Author:
pfleck
Message:

#2027
Added execution-time based termination criterion.
Restructured configuring termination criteria.

Location:
branches/TerminationCriteria/HeuristicLab.Termination/3.3
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed

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

    r12310 r12328  
    2828
    2929namespace HeuristicLab.Termination {
    30   [Item("ComparisonTerminationCriterion", "")]
     30  [Item("ComparisonTerminationCriterion", "An termination criterion which compares to values.")]
    3131  [StorableClass]
    32   public sealed class ComparisonTerminationCriterion<T> : TerminationCriterion where T : class, IItem, IComparable {
     32  public class ComparisonTerminationCriterion<T> : TerminationCriterion where T : class, IItem, IComparable {
    3333    public ILookupParameter<T> LeftSideParameter {
    3434      get { return (ILookupParameter<T>)Parameters["LeftSide"]; }
    … …  
    4747
    4848    [StorableConstructor]
    49     private ComparisonTerminationCriterion(bool deserializing) : base(deserializing) { }
    50     private ComparisonTerminationCriterion(ComparisonTerminationCriterion<T> original, Cloner cloner)
     49    protected ComparisonTerminationCriterion(bool deserializing) : base(deserializing) { }
     50    protected ComparisonTerminationCriterion(ComparisonTerminationCriterion<T> original, Cloner cloner)
    5151      : base(original, cloner) {
    5252    }
    … …  
    5858      Parameters.Add(new LookupParameter<T>("LeftSide", "The left side of the comparison."));
    5959      Parameters.Add(new ValueLookupParameter<T>("RightSide", "The right side of the comparison."));
    60       Parameters.Add(new ValueParameter<Comparison>("Comparison", "The type of comparison.", new Comparison(ComparisonType.Equal)) { Hidden = true });
     60      Parameters.Add(new ValueParameter<Comparison>("Comparison", "The type of comparison.", new Comparison(ComparisonType.GreaterOrEqual)) { Hidden = true });
    6161    }
    6262    public ComparisonTerminationCriterion(string leftSideActualName, string rightSideActualName, ComparisonType comparison = ComparisonType.GreaterOrEqual)

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

    r12310 r12328  
    121121    <Compile Include="ComparisonTerminationCriterion.cs" />
    122122    <Compile Include="MultiTerminationCriterion.cs" />
     123    <Compile Include="ExecutionTimeTimeTerminationCriterion.cs" />
    123124    <Compile Include="TerminationCriterion.cs" />
    124125    <Compile Include="TerminationOperator.cs" />
Note: See TracChangeset for help on using the changeset viewer.