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

Timestamp:

04/30/13 16:54:43 (12 years ago)

Author:

sforsten

Message:

#1980:

• added multiple discretizer to GAssist
• created ensembles for LCS problems and edited CrossValidation to use them

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3

Files:

• HeuristicLab.Encodings.VariableVector-3.3.csproj (modified) (1 diff)
• VariableVectorAction.cs (modified) (1 diff)
• VariableVectorActionComparer.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/HeuristicLab.Encodings.VariableVector-3.3.csproj

@@ -129 +129 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
+      <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis-3.4</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup />

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

@@ -83 +83 @@
       var targetCast = target as VariableVectorAction;
       if (targetCast == null) { return false; }
-      if (!this.Order.SequenceEqual(targetCast.Order)) { return false; }
-      foreach (var keyValuePair in targetCast.VariableDictionary) {
-        if (!VariableDictionary[keyValuePair.Key].MatchVariable(keyValuePair.Value)) {
+      foreach (var key in targetCast.VariableDictionary.Keys) {
+        if (!VariableDictionary.ContainsKey(key) || !VariableDictionary[key].MatchVariable(targetCast.VariableDictionary[key])) {
           return false;
         }

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

@@ -42 +42 @@
 
     public bool Equals(VariableVectorAction x, VariableVectorAction y) {
-      //if (!x.Order.SequenceEqual(y.Order)) return false;
       var xEnumerator = x.VariableDictionary.Keys.GetEnumerator();
       var yEnumerator = y.VariableDictionary.Keys.GetEnumerator();
-      while (xEnumerator.MoveNext() && yEnumerator.MoveNext())
-        foreach (var key in x.VariableDictionary.Keys) {
-          if (xEnumerator.Current != yEnumerator.Current ||
-            !x.VariableDictionary[xEnumerator.Current].Identical(y.VariableDictionary[yEnumerator.Current])) {
-            return false;
-          }
+      while (xEnumerator.MoveNext() && yEnumerator.MoveNext()) {
+        if (xEnumerator.Current != yEnumerator.Current ||
+          !x.VariableDictionary[xEnumerator.Current].Identical(y.VariableDictionary[yEnumerator.Current])) {
+          return false;
         }
+      }
       return !xEnumerator.MoveNext() && !yEnumerator.MoveNext();
     }