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

Timestamp:

02/25/13 12:37:18 (12 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)
• Variable/DoubleVariable.cs (modified) (7 diffs)
• Variable/IVariable.cs (modified) (1 diff)
• Variable/IntVariable.cs (modified) (1 diff)
• Variable/StringVariable.cs (modified) (1 diff)
• Variable/Variable.cs (modified) (1 diff)

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

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

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

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

@@ -66 +66 @@
       min = original.min;
       max = original.max;
+      currentSpread = original.currentSpread;
+      currentCenter = original.currentCenter;
     }
     public DoubleVariable() : base() { }
@@ -89 +91 @@
 
     public override string ToString() {
-      return (currentCenter - currentCenter) + " - " + (currentCenter + currentSpread);
+      return (currentCenter - currentSpread) + " - " + (currentCenter + currentSpread);
     }
 
@@ -97 +99 @@
 
     public override bool Match(double target) {
-      return currentCenter - currentSpread < target && target < currentCenter + currentSpread;
+      return currentCenter - currentSpread <= target && target <= currentCenter + currentSpread;
     }
 
@@ -128 +130 @@
       var targetCast = target as DoubleVariable;
       if (targetCast == null) { return false; }
-      if (variableName != targetCast.variableName || currentCenter != targetCast.currentCenter
-        || currentSpread != targetCast.currentSpread || max != targetCast.max
-        || min != targetCast.min) { return false; }
+      if (variableName != targetCast.variableName || currentCenter.IsAlmost(targetCast.currentCenter)
+        || currentSpread.IsAlmost(targetCast.currentSpread) || max.IsAlmost(targetCast.max)
+        || min.IsAlmost(targetCast.min)) { return false; }
 
       return true;
@@ -149 +151 @@
     }
 
-    public new DoubleVariable CrossParentsAtPosition(IVariable parent2, int pos) {
-      var parent2Cast = parent2 as DoubleVariable;
+    public override IVariable CrossParentsAtPosition(IVariable parent2, int pos) {
+      DoubleVariable parent2Cast = parent2 as DoubleVariable;
       if (parent2Cast == null) { throw new ArgumentException("Argument is not of the correct type."); }
       if (pos > 1 || pos < 0) { throw new ArgumentOutOfRangeException(); }
       DoubleVariable crossed = (DoubleVariable)this.GetSetCopy();
-      if (pos == 0) {
+      if (pos == 1) {
         crossed.CurrentSpread = parent2Cast.CurrentSpread;
       }
@@ -180 +182 @@
 
     public override void Cover(IRandom random, string stringValue, double changeSymbolProbability) {
-      Cover(random, stringValue, 50);
+      CoverWithSpreadPercentage(random, stringValue, changeSymbolProbability);
     }
 
@@ -186 +188 @@
       currentCenter = double.Parse(stringValue);
       double delta = max - min;
-      currentSpread = random.NextDouble() * (delta * (spreadPercentage / 100));
+      currentSpread = random.NextDouble() * (delta * spreadPercentage);
     }
   }

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

@@ -30 +30 @@
 
     IVariable GetEmptyCopy();
+    //GetSetCopy is used instead of Clone, so that data doesn't have to be duplicated
     IVariable GetSetCopy();
 

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

@@ -149 +149 @@
     }
 
-    public new IntVariable CrossParentsAtPosition(IVariable parent2, int pos) {
+    public override IVariable CrossParentsAtPosition(IVariable parent2, int pos) {
       var parent2Cast = parent2 as IntVariable;
       if (parent2Cast == null) { throw new ArgumentException("Argument is not of the correct type."); }
       if (pos != 0) { throw new ArgumentOutOfRangeException(); }
-      return (IntVariable)this.GetSetCopy();
+      return (IntVariable)parent2.GetSetCopy();
     }
 

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

@@ -198 +198 @@
     }
 
-    public new StringVariable CrossParentsAtPosition(IVariable parent2, int pos) {
+    public override IVariable CrossParentsAtPosition(IVariable parent2, int pos) {
       var parent2Cast = parent2 as StringVariable;
       if (parent2Cast == null) { throw new ArgumentException("Argument is not of the correct type."); }
       if (pos != 0) { throw new ArgumentOutOfRangeException(); }
-      return (StringVariable)this.GetSetCopy();
+      return (StringVariable)parent2.GetSetCopy();
     }
 

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

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

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