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

Timestamp:

02/25/13 12:37:18 (11 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)
• VariableVector.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3

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

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

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

@@ -43 +43 @@
 
     public int Count {
-      get { return condition.Count + action.Count; }
+      get { return condition.VariableDictionary.Count + action.VariableDictionary.Count; }
     }
 
     public int VirtualLength {
-      get { return condition.Values.Sum(x => x.VirtualLength) + action.Values.Sum(x => x.VirtualLength); }
+      get { return condition.VariableDictionary.Values.Sum(x => x.VirtualLength) + action.VariableDictionary.Values.Sum(x => x.VirtualLength); }
     }
 
@@ -73 +73 @@
 
     public VariableVector GetEmptyCopy() {
-      return new VariableVector(Condition.Values.Select(x => x.GetEmptyCopy()), Action.Values.Select(x => x.GetEmptyCopy()));
+      return new VariableVector(Condition.VariableDictionary.Values.Select(x => x.GetEmptyCopy()), Action.VariableDictionary.Values.Select(x => x.GetEmptyCopy()));
     }
 
@@ -112 +112 @@
 
     public bool IsMoreGeneral(ICondition target) {
-      var targetCast = target as VariableVector;
+      var targetCast = target as VariableVectorCondition;
       if (targetCast == null) { return false; }
-      if (Condition.Keys.Except(targetCast.Condition.Keys).Count() != 0
-        || targetCast.Condition.Keys.Except(Condition.Keys).Count() != 0) { return false; }
+      if (Condition.VariableDictionary.Keys.Except(targetCast.VariableDictionary.Keys).Count() != 0
+        || targetCast.VariableDictionary.Keys.Except(Condition.VariableDictionary.Keys).Count() != 0) { return false; }
 
-      double thisGenerality = Condition.Values.Sum(x => x.GetGenerality());
-      double targetGenerality = Condition.Values.Sum(x => x.GetGenerality());
+      double thisGenerality = Condition.VariableDictionary.Values.Sum(x => x.GetGenerality());
+      double targetGenerality = targetCast.VariableDictionary.Values.Sum(x => x.GetGenerality());
       if (thisGenerality <= targetGenerality) { return false; }
 
-      foreach (var variables in targetCast.Condition) {
-        if (!Condition[variables.Key].IsGreaterThanOrEquallyGeneral(variables.Value)) {
+      foreach (var variables in targetCast.VariableDictionary) {
+        if (!Condition.VariableDictionary[variables.Key].IsGreaterThanOrEquallyGeneral(variables.Value)) {
           return false;
         }

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