Free cookie consent management tool by TermsFeed Policy Generator

Changeset 3138


Ignore:
Timestamp:
03/20/10 04:15:54 (15 years ago)
Author:
swagner
Message:

Refactored interface implementations of selectors and reducers (#931).

Location:
trunk/sources/HeuristicLab.Selection/3.3
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Selection/3.3/BestSelector.cs

    r3137 r3138  
    2020#endregion
    2121
    22 using System;
     22using System.Collections.Generic;
    2323using System.Linq;
    24 using System.Collections.Generic;
    2524using HeuristicLab.Core;
     25using HeuristicLab.Data;
     26using HeuristicLab.Optimization;
    2627using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Data;
    2828
    2929namespace HeuristicLab.Selection {
    … …  
    3434  [StorableClass]
    3535  [Creatable("Test")]
    36   public sealed class BestSelector : SingleObjectiveSelector {
     36  public sealed class BestSelector : SingleObjectiveSelector, ISingleObjectiveSelector {
    3737    public BestSelector() : base() { }
    3838

  • trunk/sources/HeuristicLab.Selection/3.3/LeftReducer.cs

    r3017 r3138  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Core;
     24using HeuristicLab.Optimization;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2526
    … …  
    3132  [StorableClass]
    3233  [Creatable("Test")]
    33   public sealed class LeftReducer : Reducer {
     34  public sealed class LeftReducer : Reducer, IReducer {
    3435    public LeftReducer() : base() { }
    3536

  • trunk/sources/HeuristicLab.Selection/3.3/LinearRankSelector.cs

    r3137 r3138  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
     26using HeuristicLab.Optimization;
    2627using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2728
    … …  
    3334  [StorableClass]
    3435  [Creatable("Test")]
    35   public sealed class LinearRankSelector : StochasticSingleObjectiveSelector {
     36  public sealed class LinearRankSelector : StochasticSingleObjectiveSelector, ISingleObjectiveSelector {
    3637    public LinearRankSelector() : base() { }
    3738

  • trunk/sources/HeuristicLab.Selection/3.3/MergingReducer.cs

    r3017 r3138  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Core;
     24using HeuristicLab.Optimization;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2526
    … …  
    3132  [StorableClass]
    3233  [Creatable("Test")]
    33   public sealed class MergingReducer : Reducer {
     34  public sealed class MergingReducer : Reducer, IReducer {
    3435    public MergingReducer() : base() { }
    3536

  • trunk/sources/HeuristicLab.Selection/3.3/ProportionalSelector.cs

    r3096 r3138  
    2525using HeuristicLab.Core;
    2626using HeuristicLab.Data;
     27using HeuristicLab.Optimization;
    2728using HeuristicLab.Parameters;
    2829using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3536  [StorableClass]
    3637  [Creatable("Test")]
    37   public sealed class ProportionalSelector : StochasticSingleObjectiveSelector {
     38  public sealed class ProportionalSelector : StochasticSingleObjectiveSelector, ISingleObjectiveSelector {
    3839    private ValueParameter<BoolValue> WindowingParameter {
    3940      get { return (ValueParameter<BoolValue>)Parameters["Windowing"]; }

  • trunk/sources/HeuristicLab.Selection/3.3/Reducer.cs

    r3017 r3138  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Operators;
    25 using HeuristicLab.Optimization;
    2625using HeuristicLab.Parameters;
    2726using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3332  [Item("Reducer", "A base class for reduction operators.")]
    3433  [StorableClass]
    35   public abstract class Reducer : SingleSuccessorOperator, IReducer {
     34  public abstract class Reducer : SingleSuccessorOperator {
    3635    protected ScopeParameter CurrentScopeParameter {
    3736      get { return (ScopeParameter)Parameters["CurrentScope"]; }

  • trunk/sources/HeuristicLab.Selection/3.3/RightReducer.cs

    r3017 r3138  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Core;
     24using HeuristicLab.Optimization;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    2526
    … …  
    3132  [StorableClass]
    3233  [Creatable("Test")]
    33   public sealed class RightReducer : Reducer {
     34  public sealed class RightReducer : Reducer, IReducer {
    3435    public RightReducer() : base() { }
    3536

  • trunk/sources/HeuristicLab.Selection/3.3/Selector.cs

    r3129 r3138  
    2222using System.Collections.Generic;
    2323using HeuristicLab.Core;
    24 using HeuristicLab.Data;
    2524using HeuristicLab.Operators;
    26 using HeuristicLab.Optimization;
    2725using HeuristicLab.Parameters;
    2826using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;

  • trunk/sources/HeuristicLab.Selection/3.3/SingleObjectiveSelector.cs

    r3129 r3138  
    2222using HeuristicLab.Core;
    2323using HeuristicLab.Data;
    24 using HeuristicLab.Optimization;
    2524using HeuristicLab.Parameters;
    2625using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3231  [Item("SingleObjectiveSelector", "A base class for selection operators which consider a single double quality value for selection.")]
    3332  [StorableClass]
    34   public abstract class SingleObjectiveSelector : Selector, ISingleObjectiveSelector {
     33  public abstract class SingleObjectiveSelector : Selector {
    3534    protected ValueParameter<BoolValue> CopySelectedParameter {
    3635      get { return (ValueParameter<BoolValue>)Parameters["CopySelected"]; }

  • trunk/sources/HeuristicLab.Selection/3.3/TournamentSelector.cs

    r3096 r3138  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Data;
     26using HeuristicLab.Optimization;
    2627using HeuristicLab.Parameters;
    2728using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    … …  
    3435  [StorableClass]
    3536  [Creatable("Test")]
    36   public sealed class TournamentSelector : StochasticSingleObjectiveSelector {
     37  public sealed class TournamentSelector : StochasticSingleObjectiveSelector, ISingleObjectiveSelector {
    3738    public ValueLookupParameter<IntValue> GroupSizeParameter {
    3839      get { return (ValueLookupParameter<IntValue>)Parameters["GroupSize"]; }

  • trunk/sources/HeuristicLab.Selection/3.3/WorstSelector.cs

    r3137 r3138  
    2020#endregion
    2121
     22using System.Collections.Generic;
    2223using System.Linq;
    23 using System.Collections.Generic;
    2424using HeuristicLab.Core;
     25using HeuristicLab.Data;
     26using HeuristicLab.Optimization;
    2527using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    26 using HeuristicLab.Data;
    2728
    2829namespace HeuristicLab.Selection {
    … …  
    3334  [StorableClass]
    3435  [Creatable("Test")]
    35   public sealed class WorstSelector : SingleObjectiveSelector {
     36  public sealed class WorstSelector : SingleObjectiveSelector, ISingleObjectiveSelector {
    3637    public WorstSelector() : base() { }
    3738
Note: See TracChangeset for help on using the changeset viewer.