Context Navigation

Changeset 9827 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3

Timestamp:

07/31/13 14:33:08 (11 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:

Files:

-                      r9823
+                      r9827
+    }
-    public ParameterConfigurationTree()
-      : base() {
-      Name = "Parameter Configuration Tree";
+    }
     [StorableConstructor]
     protected ParameterConfigurationTree(bool deserializing) : base(deserializing) { }

-                      r9823
+                      r9827
     [StorableConstructor]
     protected SymbolicExpressionGrammarValueConfiguration(bool deserializing) : base(deserializing) { }
-    public SymbolicExpressionGrammarValueConfiguration()
-      : base() {
-      Name = "Symbolic Expression Grammar Value Configuration";
+    }
     public SymbolicExpressionGrammarValueConfiguration(ISymbolicExpressionGrammar grammar) {
       this.IsOptimizable = true;
       this.ActualValue = new ConstrainedValue(grammar, grammar.GetType(), new ItemSet<IItem> { grammar }, false);
+      this.Name = grammar.ItemName;
+    }
     protected SymbolicExpressionGrammarValueConfiguration(SymbolicExpressionGrammarValueConfiguration original, Cloner cloner)

-                      r9823
+                      r9827
   [StorableClass]
   public class NullValueConfiguration : ValueConfiguration {
     public NullValueConfiguration()
       : base() {
       ActualValue = new ConstrainedValue(null, null, null, true);
       IsOptimizable = false;
       Name = "Null Value Configuration";
+      Name = "NullValueConfiguration";
+    }
     [StorableConstructor]

-                      r9823
+                      r9827
     [StorableConstructor]
     protected ParameterizedValueConfiguration(bool deserializing) : base(deserializing) { }
     public ParameterizedValueConfiguration()
+    protected ParameterizedValueConfiguration()
       : base() {
+      Name = "Parameterized Value Configuration";
+      ParameterConfigurations = new ItemList<IParameterConfiguration>();
+      this.ParameterConfigurations = new ItemList<IParameterConfiguration>();
+    }
     public ParameterizedValueConfiguration(IItem value, Type valueDataType, bool discoverValidValues)

-                      r9823
+                      r9827
     [StorableConstructor]
     protected RangeValueConfiguration(bool deserializing) : base(deserializing) { }
-    public RangeValueConfiguration()
-      : base() {
-      Name = "Range Value Configuration";
+    }
     protected RangeValueConfiguration(RangeValueConfiguration original, Cloner cloner)
       : base(original, cloner) {
 …
     public RangeValueConfiguration(IItem value, Type valueDataType)
       : base(value, valueDataType) {
+      this.Name = value.ItemName;
       if (actualValue.ValueDataType == typeof(IntValue)) {
         RangeConstraint = new IntValueRange(new IntValue(0), (IntValue)value.Clone(), new IntValue(1));

-                      r6489
+                      r9827
   [StorableClass]
   public abstract class ValueConfiguration : NamedItem, IValueConfiguration {
-    public override bool CanChangeName {
-      get { return true; }
+    }
-    public override bool CanChangeDescription {
-      get { return true; }
+    }
     [Storable]
     protected bool isOptimizable;
 …
     #region Constructors and Cloning
     public ValueConfiguration(IItem value, Type valueDataType) {
+    protected ValueConfiguration(IItem value, Type valueDataType) {
       this.ActualValue = new ConstrainedValue(value, valueDataType, new ItemSet<IItem> { value }, false);
       this.IsOptimizable = true;
+      this.Name = value == null ? "ValueConfiguration" : value.ItemName;
+    }
     public ValueConfiguration() { }
+    protected ValueConfiguration() { }
     [StorableConstructor]
     protected ValueConfiguration(bool deserializing) { }

Note: See TracChangeset for help on using the changeset viewer.