Changeset 12402


Ignore:
Timestamp:
05/26/15 16:15:54 (7 years ago)
Author:
pfleck
Message:

#2027 Renamed TerminationCriterion to Terminator.

Location:
branches/TerminationCriteria
Files:
5 edited
8 moved

Legend:

Unmodified
Added
Removed
  • branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

    r12368 r12402  
    116116      get { return (IFixedValueParameter<BoolValue>)Parameters["FillPopulationWithParents"]; }
    117117    }
    118     private IValueParameter<MultiTerminationCriterion> TerminationCriteriaParameter {
    119       get { return (IValueParameter<MultiTerminationCriterion>)Parameters["TerminationCriteria"]; }
     118    private IValueParameter<MultiTerminator> TerminatorsParameter {
     119      get { return (IValueParameter<MultiTerminator>)Parameters["Terminators"]; }
    120120    }
    121121    #endregion
     
    203203      set { FillPopulationWithParentsParameter.Value.Value = value; }
    204204    }
    205     private MultiTerminationCriterion TerminationCriteria {
    206       get { return TerminationCriteriaParameter.Value; }
     205    private MultiTerminator Terminators {
     206      get { return TerminatorsParameter.Value; }
    207207    }
    208208    private RandomCreator RandomCreator {
     
    222222    private SuccessfulOffspringAnalyzer successfulOffspringAnalyzer;
    223223    [Storable]
    224     private ComparisonTerminationCriterion<IntValue> maximumGenerationsTerminationCriterion;
    225     [Storable]
    226     private ComparisonTerminationCriterion<IntValue> maximumEvaluatedSolutionsTerminationCriterion;
    227     [Storable]
    228     private ComparisonTerminationCriterion<DoubleValue> maximumSelectionPressureTerminationCriterion;
    229     [Storable]
    230     private ComparisonTerminationCriterion<DoubleValue> qualityTerminationCriterion;
    231     [Storable]
    232     private ExecutionTimeTerminationCriterion executionTimeTerminationCriterion;
     224    private ComparisonTerminator<IntValue> generationsTerminator;
     225    [Storable]
     226    private ComparisonTerminator<IntValue> evaluatedSolutionsTerminator;
     227    [Storable]
     228    private ComparisonTerminator<DoubleValue> selectionPressureTerminator;
     229    [Storable]
     230    private ComparisonTerminator<DoubleValue> qualityTerminator;
     231    [Storable]
     232    private ExecutionTimeTerminator executionTimeTerminator;
    233233    #endregion
    234234
     
    255255      selectionPressureAnalyzer = cloner.Clone(original.selectionPressureAnalyzer);
    256256      successfulOffspringAnalyzer = cloner.Clone(original.successfulOffspringAnalyzer);
    257       maximumGenerationsTerminationCriterion = cloner.Clone(original.maximumGenerationsTerminationCriterion);
    258       maximumEvaluatedSolutionsTerminationCriterion = cloner.Clone(original.maximumEvaluatedSolutionsTerminationCriterion);
    259       maximumSelectionPressureTerminationCriterion = cloner.Clone(original.maximumSelectionPressureTerminationCriterion);
    260       qualityTerminationCriterion = cloner.Clone(original.qualityTerminationCriterion);
    261       executionTimeTerminationCriterion = cloner.Clone(original.executionTimeTerminationCriterion);
     257      generationsTerminator = cloner.Clone(original.generationsTerminator);
     258      evaluatedSolutionsTerminator = cloner.Clone(original.evaluatedSolutionsTerminator);
     259      selectionPressureTerminator = cloner.Clone(original.selectionPressureTerminator);
     260      qualityTerminator = cloner.Clone(original.qualityTerminator);
     261      executionTimeTerminator = cloner.Clone(original.executionTimeTerminator);
    262262      Initialize();
    263263    }
     
    287287      Parameters.Add(new ValueParameter<IntValue>("MaximumEvaluatedSolutions", "The maximum number of evaluated solutions (approximately).", new IntValue(int.MaxValue)));
    288288      Parameters.Add(new FixedValueParameter<BoolValue>("FillPopulationWithParents", "True if the population should be filled with parent individual or false if worse children should be used when the maximum selection pressure is exceeded.", new BoolValue(false)) { Hidden = true });
    289       Parameters.Add(new ValueParameter<MultiTerminationCriterion>("TerminationCriteria", "The termination criteria which sould be checked.", new MultiTerminationCriterion()));
     289      Parameters.Add(new ValueParameter<MultiTerminator>("Terminators", "The termination criteria which sould be checked.", new MultiTerminator()));
    290290
    291291      RandomCreator randomCreator = new RandomCreator();
     
    351351      UpdateAnalyzers();
    352352
    353       maximumGenerationsTerminationCriterion = new ComparisonTerminationCriterion<IntValue>("Generations", new IntValue(50), ComparisonType.GreaterOrEqual) { Name = "Maximum Generations" };
    354       maximumEvaluatedSolutionsTerminationCriterion = new ComparisonTerminationCriterion<IntValue>("EvaluatedSolutions", "MaximumEvaluatedSolutions", ComparisonType.GreaterOrEqual) { Name = "Maximum Evaluations" };
    355       maximumSelectionPressureTerminationCriterion = new ComparisonTerminationCriterion<DoubleValue>("SelectionPressure", "MaximumSelectionPressure", ComparisonType.GreaterOrEqual) { Name = "Maximum Selection Pressure" };
    356       qualityTerminationCriterion = new ComparisonTerminationCriterion<DoubleValue>() { Name = "Maximum/Minimum Quality" };
    357       executionTimeTerminationCriterion = new ExecutionTimeTerminationCriterion(this, TimeSpan.FromMinutes(5)) { Name = "Maximum Execution Time" };
    358       ParameterizeTerminationCriteria();
    359       UpdateTerminationCriteria();
     353      generationsTerminator = new ComparisonTerminator<IntValue>("Generations", new IntValue(50), ComparisonType.GreaterOrEqual) { Name = "Generations" };
     354      evaluatedSolutionsTerminator = new ComparisonTerminator<IntValue>("EvaluatedSolutions", "MaximumEvaluatedSolutions", ComparisonType.GreaterOrEqual) { Name = "Evaluations" };
     355      selectionPressureTerminator = new ComparisonTerminator<DoubleValue>("SelectionPressure", "MaximumSelectionPressure", ComparisonType.GreaterOrEqual) { Name = "Selection Pressure" };
     356      qualityTerminator = new ComparisonTerminator<DoubleValue>() { Name = "Quality" };
     357      executionTimeTerminator = new ExecutionTimeTerminator(this, TimeSpan.FromMinutes(5)) { Name = "Execution Time" };
     358      ParameterizeTerminators();
     359      UpdateTerminators();
    360360
    361361      Initialize();
     
    377377      ParameterizeSelectors();
    378378      ParameterizeAnalyzers();
    379       ParameterizeTerminationCriteria();
     379      ParameterizeTerminators();
    380380      ParameterizeIterationBasedOperators();
    381381      UpdateCrossovers();
    382382      UpdateMutators();
    383383      UpdateAnalyzers();
    384       UpdateTerminationCriteria();
     384      UpdateTerminators();
    385385      Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
    386386      base.OnProblemChanged();
     
    407407      UpdateMutators();
    408408      UpdateAnalyzers();
    409       UpdateTerminationCriteria();
     409      UpdateTerminators();
    410410      base.Problem_OperatorsChanged(sender, e);
    411411    }
     
    485485      }
    486486    }
    487     private void ParameterizeTerminationCriteria() {
     487    private void ParameterizeTerminators() {
    488488      if (Problem != null) {
    489489        bool maximization = ((BoolValue)Problem.MaximizationParameter.ActualValue).Value;
    490         qualityTerminationCriterion.Name = maximization ? "Maximum Quality" : "Minimum Quality";
    491         qualityTerminationCriterion.Comparison = new Comparison(maximization ? ComparisonType.GreaterOrEqual : ComparisonType.LessOrEqual);
    492         qualityTerminationCriterion.ValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
    493         qualityTerminationCriterion.ThresholdParameter.Value = new DoubleValue(maximization ? double.MaxValue : double.MinValue);
     490        qualityTerminator.Comparison = new Comparison(maximization ? ComparisonType.GreaterOrEqual : ComparisonType.LessOrEqual);
     491        qualityTerminator.ValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
     492        qualityTerminator.ThresholdParameter.Value = new DoubleValue(maximization ? double.MaxValue : double.MinValue);
    494493      }
    495494    }
     
    551550      Analyzer.Operators.Add(successfulOffspringAnalyzer, successfulOffspringAnalyzer.EnabledByDefault);
    552551    }
    553     private void UpdateTerminationCriteria() {
    554       TerminationCriteria.Operators.Clear();
    555       if (Problem != null) {
    556         foreach (var terminationCriterion in Problem.Operators.OfType<ITerminationCriterion>())
    557           TerminationCriteria.Operators.Add(terminationCriterion);
    558       }
    559       TerminationCriteria.Operators.Add(maximumGenerationsTerminationCriterion);
    560       TerminationCriteria.Operators.Add(maximumEvaluatedSolutionsTerminationCriterion);
    561       TerminationCriteria.Operators.Add(maximumSelectionPressureTerminationCriterion);
    562       TerminationCriteria.Operators.Add(qualityTerminationCriterion, checkedState: false);
    563       TerminationCriteria.Operators.Add(executionTimeTerminationCriterion, checkedState: false);
     552    private void UpdateTerminators() {
     553      Terminators.Operators.Clear();
     554      if (Problem != null) {
     555        foreach (var terminator in Problem.Operators.OfType<ITerminator>())
     556          Terminators.Operators.Add(terminator);
     557      }
     558      Terminators.Operators.Add(generationsTerminator);
     559      Terminators.Operators.Add(evaluatedSolutionsTerminator);
     560      Terminators.Operators.Add(selectionPressureTerminator);
     561      Terminators.Operators.Add(qualityTerminator, checkedState: false);
     562      Terminators.Operators.Add(executionTimeTerminator, checkedState: false);
    564563    }
    565564    private OffspringSelectionGeneticAlgorithmMainLoop FindMainLoop(IOperator start) {
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminator.cs

    r12401 r12402  
    2828
    2929namespace HeuristicLab.Termination {
    30   [Item("ComparisonTerminationCriterion", "An termination criterion which compares two values.")]
     30  [Item("ComparisonTerminator", "An termination criterion which compares two values.")]
    3131  [StorableClass]
    32   public class ComparisonTerminationCriterion<T> : ThresholdTerminationCriterion<T> where T : class, IItem, IComparable {
     32  public class ComparisonTerminator<T> : ThresholdTerminator<T> where T : class, IItem, IComparable {
    3333    public ILookupParameter<T> ValueParameter {
    3434      get { return (ILookupParameter<T>)Parameters["Value"]; }
     
    4545
    4646    [StorableConstructor]
    47     protected ComparisonTerminationCriterion(bool deserializing) : base(deserializing) { }
    48     protected ComparisonTerminationCriterion(ComparisonTerminationCriterion<T> original, Cloner cloner)
     47    protected ComparisonTerminator(bool deserializing) : base(deserializing) { }
     48    protected ComparisonTerminator(ComparisonTerminator<T> original, Cloner cloner)
    4949      : base(original, cloner) { }
    5050    public override IDeepCloneable Clone(Cloner cloner) {
    51       return new ComparisonTerminationCriterion<T>(this, cloner);
     51      return new ComparisonTerminator<T>(this, cloner);
    5252    }
    53     public ComparisonTerminationCriterion()
     53    public ComparisonTerminator()
    5454      : base() {
    5555      Parameters.Add(new LookupParameter<T>("Value", "The left side value of the comparison."));
    5656      Parameters.Add(new ValueParameter<Comparison>("Comparison", "The type of comparison.", new Comparison(ComparisonType.GreaterOrEqual)) { Hidden = true });
    5757    }
    58     public ComparisonTerminationCriterion(string leftSideActualName, string rightSideActualName, ComparisonType comparison = ComparisonType.GreaterOrEqual)
     58    public ComparisonTerminator(string leftSideActualName, string rightSideActualName, ComparisonType comparison = ComparisonType.GreaterOrEqual)
    5959      : this() {
    6060      ValueParameter.ActualName = leftSideActualName;
     
    6262      Comparison.Value = comparison;
    6363    }
    64     public ComparisonTerminationCriterion(string leftSideActualName, T rightSideValue, ComparisonType comparison = ComparisonType.GreaterOrEqual)
     64    public ComparisonTerminator(string leftSideActualName, T rightSideValue, ComparisonType comparison = ComparisonType.GreaterOrEqual)
    6565      : this() {
    6666      ValueParameter.ActualName = leftSideActualName;
     
    9191      }
    9292    }
    93 
    94 
    9593  }
    9694}
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/ExecutionTimeTerminator.cs

    r12401 r12402  
    2727
    2828namespace HeuristicLab.Termination {
    29   [Item("ExecutionTimeTerminationCriterion", "A termination criterion based on execution time of an algorithm.")]
     29  [Item("ExecutionTimeTerminator", "A termination criterion based on execution time of an algorithm.")]
    3030  [StorableClass]
    31   public class ExecutionTimeTerminationCriterion : ThresholdTerminationCriterion<TimeSpanValue> {
     31  public class ExecutionTimeTerminator : ThresholdTerminator<TimeSpanValue> {
    3232
    3333    [Storable]
     
    3535
    3636    [StorableConstructor]
    37     protected ExecutionTimeTerminationCriterion(bool deserializing) : base(deserializing) { }
    38     protected ExecutionTimeTerminationCriterion(ExecutionTimeTerminationCriterion original, Cloner cloner)
     37    protected ExecutionTimeTerminator(bool deserializing) : base(deserializing) { }
     38    protected ExecutionTimeTerminator(ExecutionTimeTerminator original, Cloner cloner)
    3939      : base(original, cloner) {
    4040      executable = cloner.Clone(executable);
    4141    }
    4242    public override IDeepCloneable Clone(Cloner cloner) {
    43       return new ExecutionTimeTerminationCriterion(this, cloner);
     43      return new ExecutionTimeTerminator(this, cloner);
    4444    }
    45     public ExecutionTimeTerminationCriterion(IExecutable executable)
     45    public ExecutionTimeTerminator(IExecutable executable)
    4646      : this(executable, new TimeSpan(0, 10, 0)) { }
    47     public ExecutionTimeTerminationCriterion(IExecutable executable, TimeSpan maximumExecutionTime) {
     47    public ExecutionTimeTerminator(IExecutable executable, TimeSpan maximumExecutionTime) {
    4848      this.executable = executable;
    4949      ThresholdParameter.Value = new TimeSpanValue(maximumExecutionTime);
    5050
    51       Name = "Maximum Execution Time";
     51      Name = "Execution Time";
    5252    }
    5353
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/HeuristicLab.Termination-3.3.csproj

    r12368 r12402  
    141141  </ItemGroup>
    142142  <ItemGroup>
    143     <Compile Include="ThresholdTerminationCriterion.cs" />
    144     <Compile Include="Views\ThresholdTerminationCriterionView.cs">
     143    <Compile Include="ThresholdTerminator.cs" />
     144    <Compile Include="Views\ThresholdTerminatorView.cs">
    145145      <SubType>UserControl</SubType>
    146146    </Compile>
    147     <Compile Include="Views\ThresholdTerminationCriterionView.Designer.cs">
    148       <DependentUpon>ThresholdTerminationCriterionView.cs</DependentUpon>
     147    <Compile Include="Views\ThresholdTerminatorView.Designer.cs">
     148      <DependentUpon>ThresholdTerminatorView.cs</DependentUpon>
    149149    </Compile>
    150     <Compile Include="ITerminationCriterion.cs" />
    151     <Compile Include="ComparisonTerminationCriterion.cs" />
    152     <Compile Include="MultiTerminationCriterion.cs" />
    153     <Compile Include="ExecutionTimeTerminationCriterion.cs" />
    154     <Compile Include="TerminationCriterion.cs" />
     150    <Compile Include="ITerminator.cs" />
     151    <Compile Include="ComparisonTerminator.cs" />
     152    <Compile Include="MultiTerminator.cs" />
     153    <Compile Include="ExecutionTimeTerminator.cs" />
     154    <Compile Include="Terminator.cs" />
    155155    <Compile Include="TerminationOperator.cs" />
    156156    <None Include="HeuristicLab.snk" />
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/ITerminator.cs

    r12401 r12402  
    2626  /// An interface which represents an operator for checking a termination criterion.
    2727  /// </summary>
    28   public interface ITerminationCriterion : IOperator {
     28  public interface ITerminator : IOperator {
    2929  }
    3030}
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/MultiTerminator.cs

    r12401 r12402  
    3131
    3232namespace HeuristicLab.Termination {
    33   [Item("MultiTerminationCriterion", "A multi operator, containing termination criteria.")]
     33  [Item("MultiTerminator", "A multi operator, containing termination criteria.")]
    3434  [StorableClass]
    35   public sealed class MultiTerminationCriterion : CheckedMultiOperator<ITerminationCriterion>, ITerminationCriterion {
     35  public sealed class MultiTerminator : CheckedMultiOperator<ITerminator>, ITerminator {
    3636    public static new Image StaticItemImage {
    3737      get { return HeuristicLab.Common.Resources.VSImageLibrary.Object; }
     
    4949
    5050    [StorableConstructor]
    51     private MultiTerminationCriterion(bool deserializing) : base(deserializing) { }
    52     private MultiTerminationCriterion(MultiTerminationCriterion original, Cloner cloner) : base(original, cloner) { }
    53     public override IDeepCloneable Clone(Cloner cloner) { return new MultiTerminationCriterion(this, cloner); }
     51    private MultiTerminator(bool deserializing) : base(deserializing) { }
     52    private MultiTerminator(MultiTerminator original, Cloner cloner) : base(original, cloner) { }
     53    public override IDeepCloneable Clone(Cloner cloner) { return new MultiTerminator(this, cloner); }
    5454
    55     public MultiTerminationCriterion()
     55    public MultiTerminator()
    5656      : base() {
    5757      Parameters.Add(new LookupParameter<BoolValue>("Terminate", "The parameter which will be set to determine if execution should be terminated or should continue."));
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/Plugin.cs.frame

    r12301 r12402  
    2626  /// Plugin class for HeuristicLab.Termination plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.Termination", "Provides a generic TerminationOperator as well as different generic TerminationCriteria.", "3.3.11.$WCREV$")]
     28  [Plugin("HeuristicLab.Termination", "Provides the TerminationOperator as well as different generic Terminators.", "3.3.11.$WCREV$")]
    2929  [PluginFile("HeuristicLab.Termination-3.3.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Collections", "3.3")]
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/Properties/AssemblyInfo.cs.frame

    r12301 r12402  
    2727// associated with an assembly.
    2828[assembly: AssemblyTitle("HeuristicLab.Termination")]
    29 [assembly: AssemblyDescription("HeuristicLab Termination criteria")]
     29[assembly: AssemblyDescription("HeuristicLab Termination")]
    3030[assembly: AssemblyConfiguration("")]
    3131[assembly: AssemblyCompany("")]
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/TerminationOperator.cs

    r12355 r12402  
    3131  [StorableClass]
    3232  public sealed class TerminationOperator : InstrumentedOperator {
    33     public ILookupParameter<ITerminationCriterion> TerminationCriteriaParameter {
    34       get { return (ILookupParameter<ITerminationCriterion>)Parameters["TerminationCriteria"]; }
     33    public ILookupParameter<ITerminator> TerminatorParameter {
     34      get { return (ILookupParameter<ITerminator>)Parameters["Terminator"]; }
    3535    }
    3636    public ILookupParameter<BoolValue> TerminateParameter {
     
    6464    public TerminationOperator()
    6565      : base() {
    66       Parameters.Add(new LookupParameter<ITerminationCriterion>("TerminationCriteria", "The termination criteria which sould be checked."));
     66      Parameters.Add(new LookupParameter<ITerminator>("Terminator", "The termination criteria which sould be checked.", "Terminators"));
    6767      Parameters.Add(new LookupParameter<BoolValue>("Terminate", "The parameter which will be set to determine if execution should be terminated or schould continue."));
    6868      Parameters.Add(new OperatorParameter("ContinueBranch", "The operator which is executed if no termination criteria has met."));
     
    7474
    7575      var placeholder = new Placeholder() { Name = "Check termination criteria (Placeholder)" };
    76       placeholder.OperatorParameter.ActualName = TerminationCriteriaParameter.Name;
     76      placeholder.OperatorParameter.ActualName = TerminatorParameter.Name;
    7777
    7878      BeforeExecutionOperators.Add(assigner);
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/Terminator.cs

    r12401 r12402  
    2828
    2929namespace HeuristicLab.Termination {
    30   [Item("TerminationCriterion", "A base class for all termination criteria.")]
     30  [Item("Terminator", "A base class for all termination criteria.")]
    3131  [StorableClass]
    32   public abstract class TerminationCriterion : InstrumentedOperator, ITerminationCriterion {
     32  public abstract class Terminator : InstrumentedOperator, ITerminator {
    3333    public ILookupParameter<BoolValue> TerminateParameter {
    3434      get { return (ILookupParameter<BoolValue>)Parameters["Terminate"]; }
     
    3636
    3737    [StorableConstructor]
    38     protected TerminationCriterion(bool deserializing) : base(deserializing) { }
    39     protected TerminationCriterion(TerminationCriterion original, Cloner cloner) : base(original, cloner) { }
     38    protected Terminator(bool deserializing) : base(deserializing) { }
     39    protected Terminator(Terminator original, Cloner cloner) : base(original, cloner) { }
    4040
    41     protected TerminationCriterion()
     41    protected Terminator()
    4242      : base() {
    4343      Parameters.Add(new LookupParameter<BoolValue>("Terminate", "The parameter which will be set to determine if execution should be terminated or should continue."));
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/ThresholdTerminator.cs

    r12401 r12402  
    2727
    2828namespace HeuristicLab.Termination {
    29   [Item("ThresholdTerminationCriterion", "Base class for all termination criteria which specifies some threshold.")]
     29  [Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
    3030  [StorableClass]
    31   public abstract class ThresholdTerminationCriterion<T> : TerminationCriterion where T : class, IItem {
     31  public abstract class ThresholdTerminator<T> : Terminator where T : class, IItem {
    3232    public IValueLookupParameter<T> ThresholdParameter {
    3333      get { return (IValueLookupParameter<T>)Parameters["Threshold"]; }
     
    3535
    3636    [StorableConstructor]
    37     protected ThresholdTerminationCriterion(bool deserializing) : base(deserializing) { }
     37    protected ThresholdTerminator(bool deserializing) : base(deserializing) { }
    3838    [StorableHook(HookType.AfterDeserialization)]
    3939    private void AfterDeserialization() {
    4040      Initialize();
    4141    }
    42     protected ThresholdTerminationCriterion(ThresholdTerminationCriterion<T> original, Cloner cloner)
     42    protected ThresholdTerminator(ThresholdTerminator<T> original, Cloner cloner)
    4343      : base(original, cloner) {
    4444      Initialize();
    4545    }
    46     protected ThresholdTerminationCriterion()
     46    protected ThresholdTerminator()
    4747      : base() {
    4848      Parameters.Add(new ValueLookupParameter<T>("Threshold", "The limit of the termiation criterion."));
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.Designer.cs

    r12401 r12402  
    2121
    2222namespace HeuristicLab.Termination.Views {
    23   partial class ThresholdTerminationCriterionView<T> {
     23  partial class ThresholdTerminatorView<T> {
    2424    /// <summary>
    2525    /// Required designer variable.
     
    6262      this.viewHost.ViewType = null;
    6363      //
    64       // ThresholdTerminationCriterionView
     64      // ThresholdTerminatorView
    6565      //
    6666      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    6767      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    6868      this.Controls.Add(this.viewHost);
    69       this.Name = "ThresholdTerminationCriterionView";
     69      this.Name = "ThresholdTerminatorView";
    7070      this.ResumeLayout(false);
    7171
  • branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.cs

    r12401 r12402  
    2727namespace HeuristicLab.Termination.Views {
    2828
    29   [View("ThresholdTerminationCriterion View")]
    30   [Content(typeof(ThresholdTerminationCriterion<>), true)]
    31   public partial class ThresholdTerminationCriterionView<T> : ItemView where T : class, IItem, IComparable {
     29  [View("ThresholdTerminator View")]
     30  [Content(typeof(ThresholdTerminator<>), true)]
     31  public partial class ThresholdTerminatorView<T> : ItemView where T : class, IItem, IComparable {
    3232
    33     public new ThresholdTerminationCriterion<T> Content {
    34       get { return (ThresholdTerminationCriterion<T>)base.Content; }
     33    public new ThresholdTerminator<T> Content {
     34      get { return (ThresholdTerminator<T>)base.Content; }
    3535      set { base.Content = value; }
    3636    }
    3737
    38     public ThresholdTerminationCriterionView() {
     38    public ThresholdTerminatorView() {
    3939      InitializeComponent();
    4040    }
Note: See TracChangeset for help on using the changeset viewer.