Changeset 9226 for branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/VariableVectorAction.cs

Timestamp:

02/18/13 16:51:42 (11 years ago)

Author:

sforsten

Message:

#1980:

• made classes in Problems.ConditionActionClassification abstract
• added Problems.VariableVectorClassification and Problems.CombinedIntegerVectorClassification
• LCS works now with arbitrary problems, which implement ConditionActionClassificationProblem

Location:

branches/LearningClassifierSystems

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.VariableVector/3.3/VariableVectorAction.cs (modified) (7 diffs)

branches/LearningClassifierSystems

@@ -1 +1 @@
 *.suo
+bin

@@ -1 +1 @@
 *.suo
+bin

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/VariableVectorAction.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Text;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.ConditionActionEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +33 @@
   [StorableClass]
   [Item("VariableVectorAction", "")]
-  public class VariableVectorAction : ItemDictionary<StringValue, IActionVariable>, IAction {
+  public class VariableVectorAction : Dictionary<string, IActionVariable>, IAction {
 
-    public IOrderedEnumerable<StringValue> Order { get { return this.Keys.OrderBy(x => x.Value); } }
+    public IOrderedEnumerable<string> Order { get { return this.Keys.OrderBy(x => x); } }
 
     public int VirtualLength { get { return this.Values.Sum(x => x.VirtualLength); } }
 
     [StorableConstructor]
-    protected VariableVectorAction(bool deserializing) : base(deserializing) { }
-    protected VariableVectorAction(VariableVectorAction original, Cloner cloner)
-      : base(original, cloner) {
+    protected VariableVectorAction(bool deserializing) { }
+    protected VariableVectorAction(VariableVectorAction original, Cloner cloner) {
+      foreach (var item in original) {
+        Add((string)item.Key.Clone(), (IActionVariable)item.Value.Clone());
+      }
     }
     public VariableVectorAction() : base() { }
     public VariableVectorAction(int capacity) : base(capacity) { }
-    public VariableVectorAction(IDictionary<StringValue, IActionVariable> dictionary) : base(dictionary) { }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new VariableVectorAction(this, cloner);
+    public VariableVectorAction(IDictionary<string, IActionVariable> dictionary) : base(dictionary) { }
+
+    //protected override void OnItemsAdded(IEnumerable<KeyValuePair<string, IActionVariable>> items) {
+    //  foreach (var item in items) {
+    //    if (!(item.Value is StringVariable || item.Value is IntVariable)) {
+    //      throw new ArgumentException("Value has to be of type 'StringVariable' or 'IntVariable'");
+    //    }
+    //  }
+    //}
+
+    public VariableVectorAction GetEmptyCopy() {
+      VariableVectorAction emptyCopy = new VariableVectorAction(this.Count);
+      foreach (var keyValuePair in this) {
+        emptyCopy.Add(keyValuePair.Key, keyValuePair.Value.GetEmptyCopy());
+      }
+      return emptyCopy;
     }
 
-    protected override void OnItemsAdded(IEnumerable<KeyValuePair<StringValue, IActionVariable>> items) {
-      foreach (var item in items) {
-        if (!(item.Value is StringVariable || item.Value is IntVariable)) {
-          throw new ArgumentException("Value has to be of type 'StringVariable' or 'IntVariable'");
-        }
+    public VariableVectorAction GetSetCopy() {
+      VariableVectorAction setCopy = new VariableVectorAction(this.Count);
+      foreach (var keyValuePair in this) {
+        setCopy.Add(keyValuePair.Key, keyValuePair.Value.GetSetCopy());
       }
-      base.OnItemsAdded(items);
+      return setCopy;
     }
 
@@ -63 +77 @@
       var targetCast = target as VariableVectorAction;
       if (targetCast == null) { return false; }
-      if (this.Order.SequenceEqual(targetCast.Order)) { return false; }
+      if (!this.Order.SequenceEqual(targetCast.Order)) { return false; }
       foreach (var keyValuePair in targetCast) {
         if (!this[keyValuePair.Key].MatchVariable(keyValuePair.Value)) {
@@ -74 +88 @@
     public void Add(IEnumerable<IActionVariable> action) {
       foreach (var variable in action) {
-        this.Add(new StringValue(variable.VariableName), variable);
+        this.Add(variable.VariableName, variable);
       }
     }
@@ -82 +96 @@
       bool first = true;
       foreach (var variable in this.Values) {
-        if (!first) {
+        if (first) {
           first = false;
         } else {
@@ -98 +112 @@
     }
 
-    public bool Identical(VariableVectorCondition target) {
+    public bool Identical(VariableVectorAction target) {
       if (this.Order.SequenceEqual(target.Order)) { return false; }
       foreach (var keyValuePair in target) {
@@ -107 +121 @@
       return true;
     }
+
+    public virtual string ItemName {
+      get { return ItemAttribute.GetName(this.GetType()); }
+    }
+    public virtual string ItemDescription {
+      get { return ItemAttribute.GetDescription(this.GetType()); }
+    }
+    public Version ItemVersion {
+      get { return ItemAttribute.GetVersion(this.GetType()); }
+    }
+    public static Image StaticItemImage {
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Class; }
+    }
+    public virtual Image ItemImage {
+      get { return ItemAttribute.GetImage(this.GetType()); }
+    }
+
+    public virtual IDeepCloneable Clone(Cloner cloner) {
+      return new VariableVectorAction(this, cloner);
+    }
+
+    public object Clone() {
+      return Clone(new Cloner());
+    }
+
+    public event EventHandler ItemImageChanged;
+    protected virtual void OnItemImageChanged() {
+      EventHandler handler = ItemImageChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
+    public event EventHandler ToStringChanged;
+    protected virtual void OnToStringChanged() {
+      EventHandler handler = ToStringChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
+    }
   }
 }

@@ -1 +1 @@
 *.suo
+bin