Changeset 9242 for branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/VariableVectorCondition.cs

Timestamp:

02/25/13 12:37:18 (11 years ago)

Author:

sforsten

Message:

#1980:

• fixed several bugs (crossover, subsumption, serialization etc.)
• added ModuloOperator
• CombinedIntegerVectorClassificationProblem\Data and VariableVectorClassificationProblem\Data inherit from ConditionActionClassificationProblem\Data
• it can now be set how often the analyzers have to be executed
• VariableVectorAction, VariableVectorCondition and VariableVectorInput now inherit from Item

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3

Files:

• . (modified) (1 prop)
• VariableVectorCondition.cs (modified) (7 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3

@@ -1 +1 @@
 obj
+Plugin.cs

@@ -1 +1 @@
 obj
+Plugin.cs

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Text;
@@ -33 +31 @@
   [StorableClass]
   [Item("VariableVectorCondition", "")]
-  public class VariableVectorCondition : Dictionary<string, IVariable>, ICondition {
+  public class VariableVectorCondition : Item, ICondition {
 
-    public IOrderedEnumerable<string> Order { get { return this.Keys.OrderBy(x => x); } }
+    [Storable]
+    private Dictionary<string, IVariable> variableDictionary;
+    public Dictionary<string, IVariable> VariableDictionary {
+      get { return variableDictionary; }
+      protected set { variableDictionary = value; }
+    }
 
-    public int VirtualLength { get { return this.Values.Sum(x => x.VirtualLength); } }
+    public IOrderedEnumerable<string> Order { get { return VariableDictionary.Keys.OrderBy(x => x); } }
+
+    public int VirtualLength { get { return VariableDictionary.Values.Sum(x => x.VirtualLength); } }
 
     [StorableConstructor]
     protected VariableVectorCondition(bool deserializing) { }
     protected VariableVectorCondition(VariableVectorCondition original, Cloner cloner) {
-      foreach (var item in original) {
-        Add((string)item.Key.Clone(), (IVariable)item.Value.Clone());
+      VariableDictionary = new Dictionary<string, IVariable>(original.VariableDictionary.Count);
+      foreach (var item in original.VariableDictionary) {
+        VariableDictionary.Add(item.Key, cloner.Clone(item.Value));
       }
     }
-    public VariableVectorCondition() : base() { }
-    public VariableVectorCondition(int capacity) : base(capacity) { }
-    public VariableVectorCondition(IDictionary<string, IVariable> dictionary) : base(dictionary) { }
+    public VariableVectorCondition()
+      : base() {
+      VariableDictionary = new Dictionary<string, IVariable>();
+    }
+    public VariableVectorCondition(int capacity)
+      : base() {
+      VariableDictionary = new Dictionary<string, IVariable>(capacity);
+    }
+    public VariableVectorCondition(IDictionary<string, IVariable> dictionary)
+      : base() {
+      VariableDictionary = new Dictionary<string, IVariable>(dictionary);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new VariableVectorCondition(this, cloner);
+    }
 
     public bool Match(IInput target) {
       var targetCast = target as VariableVectorInput;
       if (targetCast == null) { return false; }
-      if (!this.Keys.All(x => targetCast.Keys.Contains(x))) { return false; }
-      foreach (var key in this.Keys) {
-        if (!this[key].MatchInput(targetCast[key])) {
+      foreach (var key in VariableDictionary.Keys) {
+        if (!targetCast.InputDictionary.ContainsKey(key) || !VariableDictionary[key].MatchInput(targetCast.InputDictionary[key])) {
           return false;
         }
@@ -64 +81 @@
     public void Add(IEnumerable<IVariable> condition) {
       foreach (var variable in condition) {
-        this.Add(variable.VariableName, variable);
+        VariableDictionary.Add(variable.VariableName, variable);
       }
     }
@@ -71 +88 @@
       StringBuilder sb = new StringBuilder();
       bool first = true;
-      foreach (var variable in this.Values) {
+      foreach (var variable in VariableDictionary.Values) {
         if (first) {
           first = false;
@@ -83 +100 @@
 
     public void Randomize(IRandom random, double spreadPercentage) {
-      foreach (var variable in this.Values) {
+      foreach (var variable in VariableDictionary.Values) {
         if (variable is DoubleVariable) {
           ((DoubleVariable)variable).Randomize(random, spreadPercentage);
@@ -94 +111 @@
     public bool Identical(VariableVectorCondition target) {
       if (!this.Order.SequenceEqual(target.Order)) { return false; }
-      foreach (var keyValuePair in target) {
-        if (!this[keyValuePair.Key].Identical(keyValuePair.Value)) {
+      foreach (var keyValuePair in target.VariableDictionary) {
+        if (!VariableDictionary[keyValuePair.Key].Identical(keyValuePair.Value)) {
           return false;
         }
@@ -101 +118 @@
       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 VariableVectorCondition(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 @@
 obj
+Plugin.cs