Changeset 9605 for branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Crossover

Timestamp:

06/11/13 13:32:32 (12 years ago)

Author:

sforsten

Message:

#1980:

• set plugin dependencies
• added smart initialization
• added hierarchical selection
• fixed major and minor default rule
• fixed several smaller bugs
• some refactoring has been done

File:

• branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Crossover/SinglePointCrossover.cs (modified) (2 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.DecisionList/3.3/Crossover/SinglePointCrossover.cs

@@ -48 +48 @@
 
     public static DecisionList Apply(IRandom random, DecisionList parent1, DecisionList parent2) {
-      if (!parent1.DefaultAction.Match(parent2.DefaultAction)) { throw new ArgumentException("Default action of parents have to match!"); }
+      if (parent1 == null && parent1 != parent2) { throw new ArgumentException("Either both parents have a default action or none does."); }
+      if (parent1.DefaultAction != null && !parent1.DefaultAction.Match(parent2.DefaultAction)) { throw new ArgumentException("Default action of parents have to match!"); }
 
       int rulesP1 = random.Next(0, parent1.Rules.Count());
@@ -64 +65 @@
       }
 
+      if (parent1.DefaultAction == null) {
+        return new DecisionList(rules);
+      }
       return new DecisionList(rules, parent1.DefaultAction);
     }