Changeset 9226 for branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Variable

Timestamp:

02/18/13 16:51:42 (12 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/Variable/DoubleVariable.cs (modified) (2 diffs)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/IActionVariable.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/IVariable.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/IntVariable.cs (modified) (5 diffs)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/StringVariable.cs (modified) (5 diffs)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/Variable.cs (modified) (1 diff)

branches/LearningClassifierSystems

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

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

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Variable/DoubleVariable.cs

@@ -100 +100 @@
     }
 
-    public new DoubleVariable GetEmptyCopy() {
+    public override IVariable GetEmptyCopy() {
       return new DoubleVariable(variableName, min, max);
     }
-    public new DoubleVariable GetSetCopy() {
-      DoubleVariable copy = GetEmptyCopy();
+    public override IVariable GetSetCopy() {
+      DoubleVariable copy = (DoubleVariable)GetEmptyCopy();
       copy.CurrentCenter = this.CurrentCenter;
       copy.CurrentSpread = this.CurrentSpread;
@@ -153 +153 @@
       if (parent2Cast == null) { throw new ArgumentException("Argument is not of the correct type."); }
       if (pos > 1 || pos < 0) { throw new ArgumentOutOfRangeException(); }
-      DoubleVariable crossed = this.GetSetCopy();
+      DoubleVariable crossed = (DoubleVariable)this.GetSetCopy();
       if (pos == 0) {
         crossed.CurrentSpread = parent2Cast.CurrentSpread;

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Variable/IActionVariable.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 
 namespace HeuristicLab.Encodings.VariableVector {
   // variables which can be used in the action
   public interface IActionVariable : IVariable {
+    new IActionVariable GetEmptyCopy();
+    new IActionVariable GetSetCopy();
+
+    void SetTo(string value);
+    IEnumerable<string> GetAllPossibleActions();
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Variable/IVariable.cs

@@ -31 +31 @@
     IVariable GetEmptyCopy();
     IVariable GetSetCopy();
+
     void Randomize(IRandom random);
     bool MatchInput(string target);

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Variable/IntVariable.cs

@@ -63 +63 @@
       this.possibleFeatures = new List<int>(original.possibleFeatures);
       this.Wildcard = original.Wildcard;
+      this.currentValue = original.currentValue;
     }
     public IntVariable()
@@ -70 +71 @@
     public IntVariable(string variableName, IEnumerable<int> variableValues)
       : base(variableName) {
-      if (variableValues.Count() != variableValues.Distinct().Count()) {
-        throw new ArgumentException("variableValues have to be distinct.");
+      if (variableValues.Count() > 0 && variableValues.Count() != variableValues.Distinct().Count()) {
+        throw new ArgumentException("variableValues have to be distinct and there has to be at least one value.");
       }
       possibleFeatures = variableValues;
       Wildcard = false;
+      currentValue = possibleFeatures.First();
     }
     public IntVariable(string variableName, IEnumerable<int> variableValues, int currentValue)
@@ -102 +104 @@
     }
 
-    public new IntVariable GetEmptyCopy() {
+    public override IVariable GetEmptyCopy() {
       return new IntVariable(variableName, possibleFeatures);
     }
-    public new IntVariable GetSetCopy() {
-      IntVariable copy = GetEmptyCopy();
+
+    public override IVariable GetSetCopy() {
+      IntVariable copy = (IntVariable)GetEmptyCopy();
       copy.Wildcard = this.Wildcard;
       copy.CurrentValue = this.CurrentValue;
       return copy;
+    }
+
+    IActionVariable IActionVariable.GetEmptyCopy() {
+      return (IntVariable)GetEmptyCopy();
+    }
+    IActionVariable IActionVariable.GetSetCopy() {
+      return (IntVariable)GetSetCopy();
     }
 
@@ -143 +153 @@
       if (parent2Cast == null) { throw new ArgumentException("Argument is not of the correct type."); }
       if (pos != 0) { throw new ArgumentOutOfRangeException(); }
-      return this.GetSetCopy();
+      return (IntVariable)this.GetSetCopy();
     }
 
@@ -160 +170 @@
       }
     }
+
+    public override int GetHashCode() {
+      int result = 1;
+      int wildcardInt = Wildcard ? 1 : 0;
+      result = 37 * result + wildcardInt;
+      result = 37 * result + currentValue;
+      foreach (var feature in possibleFeatures) {
+        result = 37 * result + feature;
+      }
+      return result;
+    }
+
+    #region IActionVariable Members
+    public void SetTo(string value) {
+      currentValue = int.Parse(value);
+    }
+
+    public IEnumerable<string> GetAllPossibleActions() {
+      return possibleFeatures.Select(x => x.ToString());
+    }
+    #endregion
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Variable/StringVariable.cs

@@ -74 +74 @@
       this.featureMapping = new Dictionary<int, string>(original.featureMapping);
       this.Wildcard = original.Wildcard;
+      this.currentValue = original.currentValue;
     }
     public StringVariable()
@@ -150 +151 @@
     }
 
-    public new StringVariable GetEmptyCopy() {
+    public override IVariable GetEmptyCopy() {
       return new StringVariable(variableName, featureMapping);
     }
-    public new StringVariable GetSetCopy() {
-      StringVariable copy = GetEmptyCopy();
+    public override IVariable GetSetCopy() {
+      StringVariable copy = (StringVariable)GetEmptyCopy();
       copy.Wildcard = this.Wildcard;
       copy.CurrentValue = this.CurrentValue;
       return copy;
+    }
+    IActionVariable IActionVariable.GetEmptyCopy() {
+      return (StringVariable)GetEmptyCopy();
+    }
+    IActionVariable IActionVariable.GetSetCopy() {
+      return (StringVariable)GetSetCopy();
     }
 
@@ -195 +202 @@
       if (parent2Cast == null) { throw new ArgumentException("Argument is not of the correct type."); }
       if (pos != 0) { throw new ArgumentOutOfRangeException(); }
-      return this.GetSetCopy();
+      return (StringVariable)this.GetSetCopy();
     }
 
@@ -202 +209 @@
       Wildcard = !Wildcard;
       if (!Wildcard) {
-        int newValue = featureMapping.First(x => x.Value.Equals(stringValue)).Key;
-        currentValue = newValue;
+        currentValue = featureMapping.First(x => x.Value.Equals(stringValue)).Key;
       }
     }
@@ -210 +216 @@
       Wildcard = random.NextDouble() < changeSymbolProbability;
       if (!Wildcard) {
-        int newValue = featureMapping.First(x => x.Value.Equals(stringValue)).Key;
-        currentValue = newValue;
-      }
-    }
+        currentValue = featureMapping.First(x => x.Value.Equals(stringValue)).Key;
+      }
+    }
+
+    public override int GetHashCode() {
+      int result = 1;
+      int wildcardInt = Wildcard ? 1 : 0;
+      result = 37 * result + wildcardInt;
+      result = 37 * result + currentValue;
+      foreach (var feature in featureMapping) {
+        result = 37 * result + feature.Key;
+        result = 37 * result + feature.Value.GetHashCode();
+      }
+      return result;
+    }
+
+    #region IActionVariable Members
+    public void SetTo(string value) {
+      currentValue = featureMapping.First(x => x.Value.Equals(value)).Key;
+    }
+
+    public IEnumerable<string> GetAllPossibleActions() {
+      return featureMapping.Values;
+    }
+    #endregion
   }
 }

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

@@ -52 +52 @@
     }
 
-    public virtual IVariable GetEmptyCopy() { throw new NotSupportedException("This method is not supported. It should be implemented by every non abstract class."); }
-    public virtual IVariable GetSetCopy() { throw new NotSupportedException("This method is not supported. It should be implemented by every non abstract class."); }
+    public abstract IVariable GetEmptyCopy();
+    public abstract IVariable GetSetCopy();
 
     public abstract void Randomize(IRandom random);

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