Context Navigation

Variable

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:

branches/LearningClassifierSystems
- Property svn:mergeinfo set to
  /trunk/sources/HeuristicLab.Core merged eligible

-                      r9392
+                      r9467
+    }
+    // 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.");

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

r9242	r9467
33	33	IVariable GetSetCopy();
34	34
35		void Randomize(IRandom random);
	35	void Randomize(IRandom random, double changeSymbolProbability);
36	36	bool MatchInput(string target);
37	37	bool MatchVariable(IVariable target);

-                      r9392
+                      r9467
+    }
+    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);

-                      r9392
+                      r9467
+    }
+    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);

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

Note: See TracChangeset for help on using the changeset viewer.