Changeset 9467 for branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector

Timestamp:

05/08/13 14:12:00 (12 years ago)

Author:

sforsten

Message:

#1980:

• added ProportionalTournamentSelector for XCS
• fixed bug: if an initial population is created in XCS, the initial population also creates general classifier, not only specific ones
• merged r9204:9466 HeuristicLab.Core from trunk to branch

Location:

branches/LearningClassifierSystems

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.VariableVector/3.3/Creators/UniformRandomVariableVectorCreator.cs (modified) (4 diffs)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/DoubleVariable.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/IActionVariable.cs (modified) (2 diffs)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/IVariable.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/IntVariable.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/StringVariable.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/Variable/Variable.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/VariableVector.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/VariableVectorAction.cs (modified) (1 diff)
• HeuristicLab.Encodings.VariableVector/3.3/VariableVectorCondition.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Creators/UniformRandomVariableVectorCreator.cs

@@ -22 +22 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +32 @@
 
     #region Parameter Properties
+    public ILookupParameter<PercentValue> ChangeSymbolProbabilityParameter {
+      get { return (ILookupParameter<PercentValue>)Parameters["ChangeSymbolProbability"]; }
+    }
     #endregion
 
@@ -39 +44 @@
     public UniformRandomVariableVectorCreator()
       : base() {
+        Parameters.Add(new LookupParameter<PercentValue>("ChangeSymbolProbability"));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -46 +52 @@
     protected override VariableVector Create(IRandom random, VariableVector sampleVariableVector, double spreadPercentage) {
       var result = sampleVariableVector.GetEmptyCopy();
-      result.Randomize(random, spreadPercentage);
+      result.Randomize(random, ChangeSymbolProbabilityParameter.ActualValue.Value, spreadPercentage);
       return result;
     }

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

@@ -112 +112 @@
     }
 
-    // Important! If this mehtod is called instead of the more concrete "Randomize(IRandom random, double spreadPercentage)"
-    // spread percentage is 50%
-    public override void Randomize(IRandom random) {
-      Randomize(random, 50);
+    // this method is not implemented on purpose, because it may lead to confusion or errors if the wrong parameter would be used (changeSymbolProbability instead of spreadPercentage)
+    public override void Randomize(IRandom random, double changeSymbolProbability) {
+      throw new NotImplementedException("The method DoubleVariable.Randomize(IRandom, double) should not be used. Use DoubleVariable.Randomize(IRandom, double, double) instead.");
     }
 
-    public void Randomize(IRandom random, double spreadPercentage) {
+    // changeSymbolProbability is not used on purpose
+    public void Randomize(IRandom random, double changeSymbolProbability, double spreadPercentage) {
       if (spreadPercentage < 0 || spreadPercentage > 100) {
         throw new ArgumentException("Spread percentage has to be between 0 and 100.");

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Encodings.VariableVector {
@@ -30 +31 @@
     void SetTo(string value);
     IEnumerable<string> GetAllPossibleActions();
+
+    void RandomizeAction(IRandom random);
   }
 }

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

@@ -33 +33 @@
     IVariable GetSetCopy();
 
-    void Randomize(IRandom random);
+    void Randomize(IRandom random, double changeSymbolProbability);
     bool MatchInput(string target);
     bool MatchVariable(IVariable target);

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

@@ -122 +122 @@
     }
 
-    public override void Randomize(IRandom random) {
+    public void RandomizeAction(IRandom random) {
+      int index = random.Next(possibleFeatures.Count());
+      currentValue = possibleFeatures.ElementAt(index);
+    }
+
+    public override void Randomize(IRandom random, double changeSymbolProbability) {
+      Wildcard = random.NextDouble() < changeSymbolProbability;
       int index = random.Next(possibleFeatures.Count());
       currentValue = possibleFeatures.ElementAt(index);

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

@@ -167 +167 @@
     }
 
-    public override void Randomize(IRandom random) {
+    public void RandomizeAction(IRandom random) {
+      int index = random.Next(possibleFeatures.Count());
+      currentValue = possibleFeatures.ElementAt(index);
+    }
+
+    public override void Randomize(IRandom random, double changeSymbolProbability) {
+      Wildcard = random.NextDouble() < changeSymbolProbability;
       int index = random.Next(possibleFeatures.Count());
       currentValue = possibleFeatures.ElementAt(index);

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

@@ -55 +55 @@
     public abstract IVariable GetSetCopy();
 
-    public abstract void Randomize(IRandom random);
+    public abstract void Randomize(IRandom random, double changeSymbolProbability);
 
     public virtual bool MatchVariable(IVariable target) { throw new NotSupportedException("This method is not supported by this kind of Variable."); }

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

@@ -86 +86 @@
     }
 
-    public void Randomize(IRandom random, double spreadPercentage) {
-      condition.Randomize(random, spreadPercentage);
+    public void Randomize(IRandom random, double changeSymbolProbability, double spreadPercentage) {
+      condition.Randomize(random, changeSymbolProbability, spreadPercentage);
       action.Randomize(random);
     }

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

@@ -113 +113 @@
     public void Randomize(IRandom random) {
       foreach (var variable in VariableDictionary.Values) {
-        variable.Randomize(random);
+        variable.RandomizeAction(random);
       }
     }

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

@@ -97 +97 @@
     }
 
-    public void Randomize(IRandom random, double spreadPercentage) {
+    public void Randomize(IRandom random, double changeSymbolProbability, double spreadPercentage) {
       foreach (var variable in VariableDictionary.Values) {
         if (variable is DoubleVariable) {
-          ((DoubleVariable)variable).Randomize(random, spreadPercentage);
+          ((DoubleVariable)variable).Randomize(random, changeSymbolProbability, spreadPercentage);
         } else {
-          variable.Randomize(random);
+          variable.Randomize(random, changeSymbolProbability);
         }
       }