Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/29/19 15:22:17 (5 years ago)
Author:
mkommend
Message:

#3005: Removed parameter ctors with getsCollected flag.

Location:
trunk/HeuristicLab.Parameters/3.3
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/HeuristicLab.Parameters/3.3/ConstrainedValueParameter.cs

    r16565 r16875  
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Collections;
    2526using HeuristicLab.Common;
    2627using HeuristicLab.Core;
    27 using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Parameters {
    … …  
    4747    public ConstrainedValueParameter() : base() { }
    4848    public ConstrainedValueParameter(string name) : base(name) { }
    49     public ConstrainedValueParameter(string name, bool getsCollected) : base(name, getsCollected) { }
    5049    public ConstrainedValueParameter(string name, ItemSet<T> validValues) : base(name, validValues) { }
    51     public ConstrainedValueParameter(string name, ItemSet<T> validValues, bool getsCollected) : base(name, validValues, getsCollected) { }
    5250    public ConstrainedValueParameter(string name, ItemSet<T> validValues, T value) : base(name, validValues, value) { }
    53     public ConstrainedValueParameter(string name, ItemSet<T> validValues, T value, bool getsCollected) : base(name, validValues, value, getsCollected) { }
    5451    public ConstrainedValueParameter(string name, string description) : base(name, description) { }
    55     public ConstrainedValueParameter(string name, string description, bool getsCollected) : base(name, description, getsCollected) { }
    5652    public ConstrainedValueParameter(string name, string description, ItemSet<T> validValues) : base(name, description, validValues) { }
    57     public ConstrainedValueParameter(string name, string description, ItemSet<T> validValues, bool getsCollected) : base(name, description, validValues, getsCollected) { }
    5853    public ConstrainedValueParameter(string name, string description, ItemSet<T> validValues, T value) : base(name, description, validValues, value) { }
    59     public ConstrainedValueParameter(string name, string description, ItemSet<T> validValues, T value, bool getsCollected) : base(name, description, validValues, value, getsCollected) { }
    6054
    6155    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Parameters/3.3/FixedValueParameter.cs

    r16565 r16875  
    2121
    2222using System;
     23using HEAL.Attic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
    25 using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Parameters {
    … …  
    3131  [Item("FixedValueParameter", "A parameter whose value is defined in the parameter itself and cannot be set.")]
    3232  [StorableType("7787B99D-5F32-4639-B47A-76CB4D204392")]
    33   public class FixedValueParameter<T> : ValueParameter<T>, IFixedValueParameter<T> where T : class,IItem, new() {
     33  public class FixedValueParameter<T> : ValueParameter<T>, IFixedValueParameter<T> where T : class, IItem, new() {
    3434
    3535    public override T Value {
    … …  
    4646    public FixedValueParameter() : base() { }
    4747    public FixedValueParameter(string name) : base(name) { }
    48     public FixedValueParameter(string name, bool getsCollected) : base(name, getsCollected) { }
    4948    public FixedValueParameter(string name, T value) : base(name, value) { }
    50     public FixedValueParameter(string name, T value, bool getsCollected) : base(name, value, getsCollected) { }
    5149    public FixedValueParameter(string name, string description) : base(name, description) { }
    52     public FixedValueParameter(string name, string description, bool getsCollected) : base(name, description, getsCollected) { }
    5350    public FixedValueParameter(string name, string description, T value) : base(name, description, value) { }
    54     public FixedValueParameter(string name, string description, T value, bool getsCollected) : base(name, description, value, getsCollected) { }
    5551
    5652    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Parameters/3.3/OperatorParameter.cs

    r16565 r16875  
    2020#endregion
    2121
     22using HEAL.Attic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    24 using HEAL.Attic;
    2525
    2626namespace HeuristicLab.Parameters {
    … …  
    3636    public OperatorParameter() : base("Anonymous") { }
    3737    public OperatorParameter(string name) : base(name) { }
    38     public OperatorParameter(string name, bool getsCollected) : base(name, getsCollected) { }
    3938    public OperatorParameter(string name, IOperator value) : base(name, value) { }
    40     public OperatorParameter(string name, IOperator value, bool getsCollected) : base(name, value, getsCollected) { }
    4139    public OperatorParameter(string name, string description) : base(name, description) { }
    42     public OperatorParameter(string name, string description, bool getsCollected) : base(name, description, getsCollected) { }
    4340    public OperatorParameter(string name, string description, IOperator value) : base(name, description, value) { }
    44     public OperatorParameter(string name, string description, IOperator value, bool getsCollected) : base(name, description, value, getsCollected) { }
    4541
    4642    public override IDeepCloneable Clone(Cloner cloner) {

  • trunk/HeuristicLab.Parameters/3.3/OptionalConstrainedValueParameter.cs

    r16872 r16875  
    123123      Initialize();
    124124    }
    125     public OptionalConstrainedValueParameter(string name, bool getsCollected)
    126       : base(name, typeof(T)) {
    127       this.validValues = new ItemSet<T>();
    128       this.readOnly = false;
    129       this.getsCollected = getsCollected;
    130       Initialize();
    131     }
    132125    public OptionalConstrainedValueParameter(string name, ItemSet<T> validValues)
    133126      : base(name, typeof(T)) {
    … …  
    137130      Initialize();
    138131    }
    139     public OptionalConstrainedValueParameter(string name, ItemSet<T> validValues, bool getsCollected)
    140       : base(name, typeof(T)) {
    141       this.validValues = validValues;
    142       this.readOnly = false;
    143       this.getsCollected = getsCollected;
    144       Initialize();
    145     }
    146132    public OptionalConstrainedValueParameter(string name, ItemSet<T> validValues, T value)
    147133      : base(name, typeof(T)) {
    … …  
    150136      this.readOnly = false;
    151137      this.getsCollected = true;
    152       Initialize();
    153     }
    154     public OptionalConstrainedValueParameter(string name, ItemSet<T> validValues, T value, bool getsCollected)
    155       : base(name, typeof(T)) {
    156       this.validValues = validValues;
    157       this.value = value;
    158       this.readOnly = false;
    159       this.getsCollected = getsCollected;
    160138      Initialize();
    161139    }
    … …  
    167145      Initialize();
    168146    }
    169     public OptionalConstrainedValueParameter(string name, string description, bool getsCollected)
    170       : base(name, description, typeof(T)) {
    171       this.validValues = new ItemSet<T>();
    172       this.readOnly = false;
    173       this.getsCollected = getsCollected;
    174       Initialize();
    175     }
    176147    public OptionalConstrainedValueParameter(string name, string description, ItemSet<T> validValues)
    177148      : base(name, description, typeof(T)) {
    … …  
    181152      Initialize();
    182153    }
    183     public OptionalConstrainedValueParameter(string name, string description, ItemSet<T> validValues, bool getsCollected)
    184       : base(name, description, typeof(T)) {
    185       this.validValues = validValues;
    186       this.readOnly = false;
    187       this.getsCollected = getsCollected;
    188       Initialize();
    189     }
    190154    public OptionalConstrainedValueParameter(string name, string description, ItemSet<T> validValues, T value)
    191155      : base(name, description, typeof(T)) {
    … …  
    194158      this.readOnly = false;
    195159      this.getsCollected = true;
    196       Initialize();
    197     }
    198     public OptionalConstrainedValueParameter(string name, string description, ItemSet<T> validValues, T value, bool getsCollected)
    199       : base(name, description, typeof(T)) {
    200       this.validValues = validValues;
    201       this.value = value;
    202       this.readOnly = false;
    203       this.getsCollected = getsCollected;
    204160      Initialize();
    205161    }

  • trunk/HeuristicLab.Parameters/3.3/OptionalValueParameter.cs

    r16872 r16875  
    137137      this.reactOnValueToStringChangedAndValueItemImageChanged = true;
    138138    }
    139     public OptionalValueParameter(string name, bool getsCollected)
    140       : base(name, typeof(T)) {
    141       this.readOnly = false;
    142       this.getsCollected = getsCollected;
    143       this.reactOnValueToStringChangedAndValueItemImageChanged = true;
    144     }
    145139    public OptionalValueParameter(string name, T value)
    146140      : base(name, typeof(T)) {
    … …  
    151145      RegisterValueEvents();
    152146    }
    153     public OptionalValueParameter(string name, T value, bool getsCollected)
    154       : base(name, typeof(T)) {
    155       this.value = value;
    156       this.readOnly = false;
    157       this.getsCollected = getsCollected;
    158       this.reactOnValueToStringChangedAndValueItemImageChanged = true;
    159       RegisterValueEvents();
    160     }
    161147    public OptionalValueParameter(string name, string description)
    162148      : base(name, description, typeof(T)) {
    … …  
    165151      this.reactOnValueToStringChangedAndValueItemImageChanged = true;
    166152    }
    167     public OptionalValueParameter(string name, string description, bool getsCollected)
    168       : base(name, description, typeof(T)) {
    169       this.readOnly = false;
    170       this.getsCollected = getsCollected;
    171       this.reactOnValueToStringChangedAndValueItemImageChanged = true;
    172     }
     153
    173154    public OptionalValueParameter(string name, string description, T value)
    174155      : base(name, description, typeof(T)) {
    … …  
    176157      this.readOnly = false;
    177158      this.getsCollected = true;
    178       this.reactOnValueToStringChangedAndValueItemImageChanged = true;
    179       RegisterValueEvents();
    180     }
    181     public OptionalValueParameter(string name, string description, T value, bool getsCollected)
    182       : base(name, description, typeof(T)) {
    183       this.value = value;
    184       this.readOnly = false;
    185       this.getsCollected = getsCollected;
    186159      this.reactOnValueToStringChangedAndValueItemImageChanged = true;
    187160      RegisterValueEvents();

  • trunk/HeuristicLab.Parameters/3.3/ValueLookupParameter.cs

    r16872 r16875  
    112112      this.getsCollected = true;
    113113    }
    114     public ValueLookupParameter(string name, bool getsCollected)
    115       : base(name) {
    116       this.readOnly = false;
    117       this.Hidden = false;
    118       this.getsCollected = getsCollected;
    119     }
    120114    public ValueLookupParameter(string name, T value)
    121115      : base(name) {
    … …  
    126120      RegisterValueEvents();
    127121    }
    128     public ValueLookupParameter(string name, T value, bool getsCollected)
    129       : base(name) {
    130       this.value = value;
    131       this.readOnly = false;
    132       this.Hidden = false;
    133       this.getsCollected = getsCollected;
    134       RegisterValueEvents();
    135     }
    136122    public ValueLookupParameter(string name, string description)
    137123      : base(name, description) {
    … …  
    139125      this.Hidden = false;
    140126      this.getsCollected = true;
    141     }
    142     public ValueLookupParameter(string name, string description, bool getsCollected)
    143       : base(name, description) {
    144       this.readOnly = false;
    145       this.Hidden = false;
    146       this.getsCollected = getsCollected;
    147127    }
    148128    public ValueLookupParameter(string name, string description, T value)
    … …  
    154134      RegisterValueEvents();
    155135    }
    156     public ValueLookupParameter(string name, string description, T value, bool getsCollected)
    157       : base(name, description) {
    158       this.value = value;
    159       this.readOnly = false;
    160       this.Hidden = false;
    161       this.getsCollected = getsCollected;
    162       RegisterValueEvents();
    163     }
    164136    public ValueLookupParameter(string name, string description, string actualName)
    165137      : base(name, description, actualName) {
    … …  
    167139      this.Hidden = false;
    168140      this.getsCollected = true;
    169     }
    170     public ValueLookupParameter(string name, string description, string actualName, bool getsCollected)
    171       : base(name, description, actualName) {
    172       this.readOnly = false;
    173       this.Hidden = false;
    174       this.getsCollected = getsCollected;
    175141    }
    176142    #endregion

  • trunk/HeuristicLab.Parameters/3.3/ValueParameter.cs

    r16565 r16875  
    2222using System;
    2323using System.Reflection;
     24using HEAL.Attic;
    2425using HeuristicLab.Common;
    2526using HeuristicLab.Core;
    26 using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Parameters {
    … …  
    4747    public ValueParameter() : base() { }
    4848    public ValueParameter(string name) : base(name) { base.Value = CreateDefaultValue(); }
    49     public ValueParameter(string name, bool getsCollected) : base(name, getsCollected) { base.Value = CreateDefaultValue(); }
    5049    public ValueParameter(string name, T value) : base(name, value) { }
    51     public ValueParameter(string name, T value, bool getsCollected) : base(name, value, getsCollected) { }
    5250    public ValueParameter(string name, string description) : base(name, description) { base.Value = CreateDefaultValue(); }
    53     public ValueParameter(string name, string description, bool getsCollected) : base(name, description, getsCollected) { base.Value = CreateDefaultValue(); }
    5451    public ValueParameter(string name, string description, T value) : base(name, description, value) { }
    55     public ValueParameter(string name, string description, T value, bool getsCollected) : base(name, description, value, getsCollected) { }
    56                                                                                  
     52
    5753    protected T CreateDefaultValue() {
    5854      Type type = typeof(T);
Note: See TracChangeset for help on using the changeset viewer.