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

Timestamp:

04/23/13 13:31:29 (12 years ago)

Author:

sforsten

Message:

#1980:

• several small bug fixes
• added windowing technique ILAS to GAssist
• GAssist and XCS work now with real-valued features
• severely improved the performance of XCS

Location:

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

Files:

• DoubleVariable.cs (modified) (1 diff)
• IntVariable.cs (modified) (1 diff)
• StringVariable.cs (modified) (2 diffs)

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

@@ -130 +130 @@
       var targetCast = target as DoubleVariable;
       if (targetCast == null) { return false; }
-      if (variableName != targetCast.variableName || currentCenter.IsAlmost(targetCast.currentCenter)
-        || currentSpread.IsAlmost(targetCast.currentSpread) || max.IsAlmost(targetCast.max)
-        || min.IsAlmost(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;

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

@@ -133 +133 @@
         || currentValue != targetCast.currentValue) { return false; }
 
-      if (possibleFeatures.Except(targetCast.possibleFeatures).Count() != 0
-        || targetCast.possibleFeatures.Except(possibleFeatures).Count() != 0) { return false; }
+      var thisEnumerator = possibleFeatures.GetEnumerator();
+      var castEnumerator = targetCast.possibleFeatures.GetEnumerator();
+      while (thisEnumerator.MoveNext() && castEnumerator.MoveNext()) {
+        if (thisEnumerator.Current != castEnumerator.Current)
+          return false;
+      }
 
-      return true;
+      return !thisEnumerator.MoveNext() && !castEnumerator.MoveNext();
     }
 

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

@@ -87 +87 @@
       featureMapping = new Dictionary<int, string>();
       var distinctValuesEnumerator = variableValues.Distinct().GetEnumerator();
-      possibleFeatures = Enumerable.Range(0, featureMapping.Count());
+      possibleFeatures = Enumerable.Range(0, variableValues.Count());
       var possibleFeaturesEnumerator = possibleFeatures.GetEnumerator();
       while (possibleFeaturesEnumerator.MoveNext() && distinctValuesEnumerator.MoveNext()) {
@@ -178 +178 @@
         || currentValue != targetCast.currentValue) { return false; }
 
-      if (featureMapping.Keys.Except(targetCast.featureMapping.Keys).Count() != 0
-        || targetCast.featureMapping.Keys.Except(featureMapping.Keys).Count() != 0) { return false; }
-
-      foreach (var keyValuePair in targetCast.featureMapping) {
-        if (!featureMapping[keyValuePair.Key].Equals(keyValuePair.Value)) { return false; }
-      }
-
-      return true;
+      var thisEnumerator = featureMapping.GetEnumerator();
+      var castEnumerator = targetCast.featureMapping.GetEnumerator();
+      while (thisEnumerator.MoveNext() && castEnumerator.MoveNext()) {
+        if (thisEnumerator.Current.Key != castEnumerator.Current.Key ||
+          thisEnumerator.Current.Value != castEnumerator.Current.Value)
+          return false;
+      }
+
+      return !thisEnumerator.MoveNext() && !castEnumerator.MoveNext();
     }