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

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)
• Crossover/SinglePointCrossover.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/Crossover/SinglePointCrossover.cs

@@ -54 +54 @@
 
       if (parent1.Count != parent2.Count && parent1.VirtualLength != parent2.VirtualLength
-        && parent1Condition.Count != parent2Condition.Count && parent1Condition.VirtualLength != parent2Condition.VirtualLength
-        && parent1Action.Count != parent2Action.Count && parent1Action.VirtualLength != parent2Action.VirtualLength)
+        && parent1Condition.VariableDictionary.Count != parent2Condition.VariableDictionary.Count && parent1Condition.VirtualLength != parent2Condition.VirtualLength
+        && parent1Action.VariableDictionary.Count != parent2Action.VariableDictionary.Count && parent1Action.VirtualLength != parent2Action.VirtualLength)
         throw new ArgumentException("SinglePointCrossover: The parents are of different length.");
 
       int conditionLength = parent1Condition.VirtualLength;
       int breakPoint = random.Next(1, conditionLength);
-      IList<IVariable> newCondition = new List<IVariable>(parent1Condition.Count);
+      IList<IVariable> newCondition = new List<IVariable>(parent1Condition.VariableDictionary.Count);
 
       var keyEnumerator = parent1Condition.Order.GetEnumerator();
 
       int index = 0;
-      IVariable curVariable;
+      IVariable curVariable = null;
       while (index < breakPoint) {
-        keyEnumerator.MoveNext();
-        curVariable = parent1Condition[keyEnumerator.Current];
-        if (curVariable.VirtualLength == 1 || index + curVariable.VirtualLength - 1 < breakPoint) {
+        if (!keyEnumerator.MoveNext()) { throw new IndexOutOfRangeException("Enumerator has no next element!"); }
+        curVariable = parent1Condition.VariableDictionary[keyEnumerator.Current];
+        if (index + curVariable.VirtualLength <= breakPoint) {
           newCondition.Add(curVariable.GetSetCopy());
-          index += curVariable.VirtualLength;
         }
+        index += curVariable.VirtualLength;
       }
 
       // breakpoint is in between a variable
       if (index != breakPoint) {
-        newCondition.Add(parent1Condition[keyEnumerator.Current].CrossParentsAtPosition(parent2Condition[keyEnumerator.Current], breakPoint - index - 1));
+        newCondition.Add(parent1Condition.VariableDictionary[keyEnumerator.Current].CrossParentsAtPosition(parent2Condition.VariableDictionary[keyEnumerator.Current], breakPoint - (index - curVariable.VirtualLength)));
       }
 
       while (index < conditionLength) {
         keyEnumerator.MoveNext();
-        curVariable = parent2Condition[keyEnumerator.Current];
+        curVariable = parent2Condition.VariableDictionary[keyEnumerator.Current];
         newCondition.Add(curVariable.GetSetCopy());
         index += curVariable.VirtualLength;
       }
 
-      var action = random.Next(2) == 1 ? parent1Action.Values.Select(x => x.GetSetCopy()) : parent2Action.Values.Select(x => x.GetSetCopy());
+      var action = random.Next(2) == 1 ? parent1Action.VariableDictionary.Values.Select(x => x.GetSetCopy()) : parent2Action.VariableDictionary.Values.Select(x => x.GetSetCopy());
 
       return new VariableVector(newCondition, action);

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