Changeset 5359 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations

Timestamp:

01/24/11 01:33:29 (14 years ago)

Author:

cneumuel

Message:

#1215

• renamed RunsAnalyzer to SolutionCacheAnalyzer
• only most recent results will stay in cache to avoid memory problems
• some minor tweaks and bugfixes

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations

Files:

• CheckedValueConfigurationCollection.cs (modified) (2 diffs)
• ValueConfiguration.cs (modified) (6 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/CheckedValueConfigurationCollection.cs

@@ -50 +50 @@
 
     private void RegisterEvents() {
+      this.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
       this.ItemsRemoved += new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
     }
@@ -55 +56 @@
     private void DeregisterEvents() {
       this.ItemsRemoved -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsRemoved);
+      this.ItemsAdded -= new CollectionItemsChangedEventHandler<IndexedItem<IValueConfiguration>>(CheckedValueConfigurationList_ItemsAdded);
+    }
+
+    void CheckedValueConfigurationList_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<IValueConfiguration>> e) {
+      foreach (var item in e.Items) {
+        if(this.Where(x => x.ItemName == item.Value.ItemName).Count() > 0) {
+          int maxNumber = this.Where(x => x.ItemName == item.Value.ItemName).Select(x => x.Number).Max();
+          item.Value.Number = maxNumber + 1;
+        }
+      }
     }
 

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ValueConfigurations/ValueConfiguration.cs

@@ -15 +15 @@
   // TODO: ItemName/Descr, storability
   [StorableClass]
-  public class ValueConfiguration : Item, IValueConfiguration {
+  public class ValueConfiguration : NamedItem, IValueConfiguration {
+    public override bool CanChangeName {
+      get { return true; }
+    }
+
+    public override bool CanChangeDescription {
+      get { return true; }
+    }
+
     [Storable]
     protected bool isOptimizable;
@@ -80 +88 @@
           rangeConstraint = value;
           RegisterActualValueEvents();
+        }
+      }
+    }
+
+    [Storable]
+    protected int number = -1;
+    public int Number {
+      get { return number; }
+      set {
+        if (value != number) {
+          number = value;
+          OnToStringChanged();
         }
       }
@@ -113 +133 @@
       this.isOptimizable = original.isOptimizable;
       this.optimize = original.optimize;
+      this.number = original.number;
       RegisterActualValueEvents();
       RegisterRangeConstraintEvents();
@@ -193 +214 @@
     public override string ToString() {
       if (ActualValue != null && ActualValue.Value != null) {
+        string name = NumberedName;
+
         if (ActualValue.Value is IParameterizedItem) {
           if (Optimize) {
-            return string.Format("{0} (Optimize)", ActualValue.Value.ItemName);
+            return string.Format("{0} (Optimize)", name);
           } else {
-            return string.Format("{0}", ActualValue.Value.ItemName);
+            return string.Format("{0}", name);
           }
         } else {
           if (Optimize) {
-            return string.Format("{0} (Optimize: {1})", ActualValue.Value.ItemName, RangeConstraint);
+            return string.Format("{0} (Optimize: {1})", name, RangeConstraint);
           } else {
-            return string.Format("{0}: {1}", ActualValue.Value.ItemName, ActualValue.Value);
+            return string.Format("{0}: {1}", name, ActualValue.Value);
           }
         }
       } else {
         return base.ToString();
+      }
+    }
+
+    public string NumberedName {
+      get {
+        if (this.number == 0) {
+          return ActualValue.Value.ItemName;
+        } else {
+          return string.Format("{0} {1}", ActualValue.Value.ItemName, number);
+        }
       }
     }
@@ -227 +260 @@
     public virtual void Parameterize(IParameterizedItem item) {
       foreach (IParameterConfiguration pc in this.ParameterConfigurations) {
-        pc.Parameterize((IValueParameter)item.Parameters[pc.ParameterName]);
+        if(pc.Optimize) pc.Parameterize((IValueParameter)item.Parameters[pc.ParameterName]);
       }
     }
@@ -287 +320 @@
       }
     }
+
+    public IEnumerable<string> GetOptimizedParameterNames() {
+      var list = new List<string>();
+      this.CollectOptimizedParameterNames(list, "");
+      return list;
+    }
   }
 }