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

Timestamp:

02/04/13 16:16:38 (11 years ago)

Author:

sforsten

Message:

#1980:

• deleted not needed interface IMatching
• finished VariableVector encoding
• the algorithm LearningClassifierSystem is now independent of a specific encoding. It still needs the ConditionActionEncoding.
• merged r9191:9203 HeuristicLab.Core from trunk to branch

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3

Files:

• . (modified) (1 prop)
• Variable/DoubleVariable.cs (modified) (2 diffs)
• Variable/IVariable.cs (modified) (1 diff)
• Variable/IntVariable.cs (modified) (2 diffs)
• Variable/StringVariable.cs (modified) (2 diffs)
• Variable/Variable.cs (modified) (1 diff)

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

@@ -137 +137 @@
     public override double GetGenerality() {
       double delta = max - min;
-      double intervalWidth = 2 * currentSpread;
-      double generality = intervalWidth / delta;
+      double intervalInBoundsWidth = Math.Min(max, currentCenter + currentSpread) - Math.Max(min, currentCenter - currentSpread);
+      double generality = intervalInBoundsWidth / delta;
       return generality > 1 ? 1 : generality;
     }
@@ -159 +159 @@
       return crossed;
     }
+
+    public override void Manipulate(IRandom random, string stringValue, int pos) {
+      if (pos > 1 || pos < 0) { throw new ArgumentOutOfRangeException(); }
+      Manipulate(random, pos, 10);
+    }
+
+    public void Manipulate(IRandom random, int pos, double percentage) {
+      if (pos > 1 || pos < 0) { throw new ArgumentOutOfRangeException(); }
+      double delta = max - min;
+      double maxChange = delta * (percentage / 100);
+      double actualChange = (random.NextDouble() * maxChange * 2) - maxChange;
+      if (pos == 0) {
+        currentCenter += actualChange;
+      } else if (pos == 1) {
+        currentSpread += actualChange;
+        //otherwise the interval could be corrupt and no input could match the rule.
+        currentSpread = currentSpread > 0 ? currentSpread : 0;
+      }
+    }
+
+    public override void Cover(IRandom random, string stringValue, double changeSymbolProbability) {
+      Cover(random, stringValue, 50);
+    }
+
+    public void CoverWithSpreadPercentage(IRandom random, string stringValue, double spreadPercentage) {
+      currentCenter = double.Parse(stringValue);
+      double delta = max - min;
+      currentSpread = random.NextDouble() * (delta * (spreadPercentage / 100));
+    }
   }
 }

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

@@ -41 +41 @@
 
     IVariable CrossParentsAtPosition(IVariable parent2, int pos);
+
+    void Manipulate(IRandom random, string stringValue, int pos);
+
+    void Cover(IRandom random, string stringValue, double changeSymbolProbability);
   }
 }

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

@@ -86 +86 @@
 
     public override string ToString() {
-      return currentValue.ToString();
+      return Wildcard ? "#" : currentValue.ToString();
     }
 
@@ -145 +145 @@
       return this.GetSetCopy();
     }
+
+    public override void Manipulate(IRandom random, string stringValue, int pos) {
+      if (pos != 0) { throw new ArgumentOutOfRangeException(); }
+      Wildcard = !Wildcard;
+      if (!Wildcard) {
+        currentValue = int.Parse(stringValue);
+      }
+    }
+
+    public override void Cover(IRandom random, string stringValue, double changeSymbolProbability) {
+      Wildcard = random.NextDouble() < changeSymbolProbability;
+      if (!Wildcard) {
+        currentValue = int.Parse(stringValue);
+      }
+    }
   }
 }

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

@@ -134 +134 @@
 
     public override string ToString() {
-      return CurrentStringValue;
+      return Wildcard ? "#" : CurrentStringValue;
     }
 
@@ -197 +197 @@
       return this.GetSetCopy();
     }
+
+    public override void Manipulate(IRandom random, string stringValue, int pos) {
+      if (pos != 0) { throw new ArgumentOutOfRangeException(); }
+      Wildcard = !Wildcard;
+      if (!Wildcard) {
+        int newValue = featureMapping.First(x => x.Value.Equals(stringValue)).Key;
+        currentValue = newValue;
+      }
+    }
+
+    public override void Cover(IRandom random, string stringValue, double changeSymbolProbability) {
+      Wildcard = random.NextDouble() < changeSymbolProbability;
+      if (!Wildcard) {
+        int newValue = featureMapping.First(x => x.Value.Equals(stringValue)).Key;
+        currentValue = newValue;
+      }
+    }
   }
 }

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

@@ -69 +69 @@
 
     public virtual IVariable CrossParentsAtPosition(IVariable parent2, int pos) { throw new NotSupportedException("This method is not supported."); }
+
+    public abstract void Manipulate(IRandom random, string stringValue, int pos);
+
+    public abstract void Cover(IRandom random, string stringValue, double changeSymbolProbability);
   }
 }