Changeset 9827


Ignore:
Timestamp:
07/31/13 14:33:08 (8 years ago)
Author:
jkarder
Message:

#1099:

  • adapted MetaOpt NamedItems once more
    • gave more meaningful names to some items
    • removed unreferenced default ctors
    • changed access modifiers
Location:
branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurationTree.cs

    r9823 r9827  
    167167    }
    168168
    169     public ParameterConfigurationTree()
    170       : base() {
    171       Name = "Parameter Configuration Tree";
    172     }
    173169    [StorableConstructor]
    174170    protected ParameterConfigurationTree(bool deserializing) : base(deserializing) { }
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/SymbolicExpressionGrammar/SymbolicExpressionGrammarValueConfiguration.cs

    r9823 r9827  
    1212    [StorableConstructor]
    1313    protected SymbolicExpressionGrammarValueConfiguration(bool deserializing) : base(deserializing) { }
    14 
    15     public SymbolicExpressionGrammarValueConfiguration()
    16       : base() {
    17       Name = "Symbolic Expression Grammar Value Configuration";
    18     }
    1914    public SymbolicExpressionGrammarValueConfiguration(ISymbolicExpressionGrammar grammar) {
    2015      this.IsOptimizable = true;
    2116      this.ActualValue = new ConstrainedValue(grammar, grammar.GetType(), new ItemSet<IItem> { grammar }, false);
     17      this.Name = grammar.ItemName;
    2218    }
    2319    protected SymbolicExpressionGrammarValueConfiguration(SymbolicExpressionGrammarValueConfiguration original, Cloner cloner)
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/NullValueConfiguration.cs

    r9823 r9827  
    77  [StorableClass]
    88  public class NullValueConfiguration : ValueConfiguration {
    9 
    109    public NullValueConfiguration()
    1110      : base() {
    1211      ActualValue = new ConstrainedValue(null, null, null, true);
    1312      IsOptimizable = false;
    14       Name = "Null Value Configuration";
     13      Name = "NullValueConfiguration";
    1514    }
    1615    [StorableConstructor]
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/ParameterizedValueConfiguration.cs

    r9823 r9827  
    6262    [StorableConstructor]
    6363    protected ParameterizedValueConfiguration(bool deserializing) : base(deserializing) { }
    64     public ParameterizedValueConfiguration()
     64    protected ParameterizedValueConfiguration()
    6565      : base() {
    66       Name = "Parameterized Value Configuration";
    67       ParameterConfigurations = new ItemList<IParameterConfiguration>();
     66      this.ParameterConfigurations = new ItemList<IParameterConfiguration>();
    6867    }
    6968    public ParameterizedValueConfiguration(IItem value, Type valueDataType, bool discoverValidValues)
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/RangeValueConfiguration.cs

    r9823 r9827  
    2525    [StorableConstructor]
    2626    protected RangeValueConfiguration(bool deserializing) : base(deserializing) { }
    27     public RangeValueConfiguration()
    28       : base() {
    29       Name = "Range Value Configuration";
    30     }
    3127    protected RangeValueConfiguration(RangeValueConfiguration original, Cloner cloner)
    3228      : base(original, cloner) {
     
    3632    public RangeValueConfiguration(IItem value, Type valueDataType)
    3733      : base(value, valueDataType) {
     34      this.Name = value.ItemName;
    3835      if (actualValue.ValueDataType == typeof(IntValue)) {
    3936        RangeConstraint = new IntValueRange(new IntValue(0), (IntValue)value.Clone(), new IntValue(1));
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/ValueConfiguration.cs

    r6489 r9827  
    1010  [StorableClass]
    1111  public abstract class ValueConfiguration : NamedItem, IValueConfiguration {
    12     public override bool CanChangeName {
    13       get { return true; }
    14     }
    15 
    16     public override bool CanChangeDescription {
    17       get { return true; }
    18     }
    19 
    2012    [Storable]
    2113    protected bool isOptimizable;
     
    8577
    8678    #region Constructors and Cloning
    87     public ValueConfiguration(IItem value, Type valueDataType) {
     79    protected ValueConfiguration(IItem value, Type valueDataType) {
    8880      this.ActualValue = new ConstrainedValue(value, valueDataType, new ItemSet<IItem> { value }, false);
    8981      this.IsOptimizable = true;
     82      this.Name = value == null ? "ValueConfiguration" : value.ItemName;
    9083    }
    9184
    92     public ValueConfiguration() { }
     85    protected ValueConfiguration() { }
    9386    [StorableConstructor]
    9487    protected ValueConfiguration(bool deserializing) { }
Note: See TracChangeset for help on using the changeset viewer.