Changeset 9204 for branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3

Timestamp:

02/04/13 16:16:38 (12 years ago)

Author:

sforsten

Message:

#1980:

• deleted not needed interface IMatching
• finished VariableVector encoding
• the algorithm LearningClassifierSystem is now independent of a specific encoding. It still needs the ConditionActionEncoding.
• merged r9191:9203 HeuristicLab.Core from trunk to branch

File:

• branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -29 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.Instances;
@@ -233 +235 @@
 
     private void InitializeOperators() {
+      Operators.AddRange(ApplicationManager.Manager.GetInstances<ICombinedIntegerVectorCrossover>());
+      Operators.AddRange(AddManipulators());
       Operators.Add(new BestTrainingXCSSolutionAnalyzer());
       Operators.Add(new CurrentXCSSolutionAnalyzer());
 
-      ParameterizeAnalyzers();
-    }
-
-    private void ParameterizeAnalyzers() {
-      foreach (XCSSolutionAnalyzer xcsAnalyzer in Operators.Where(x => x is XCSSolutionAnalyzer)) {
+      ParameterizeOperators();
+    }
+
+    private IEnumerable<ICombinedIntegerVectorManipulator> AddManipulators() {
+      var manipulator = new UniformSomePositionManipulator();
+      manipulator.ChildParameter.ActualName = "CombinedIntegerVector";
+      manipulator.FetchedInputParameter.ActualName = ClassifierFetcher.CurrentInputToMatchParameter.ActualName;
+      manipulator.PossibleActionsParameter.ActualName = PossibleActionsConcreteClassParameter.Name;
+      return new List<ICombinedIntegerVectorManipulator>() { manipulator };
+    }
+
+    private void ParameterizeOperators() {
+      foreach (XCSSolutionAnalyzer xcsAnalyzer in Operators.OfType<XCSSolutionAnalyzer>()) {
         xcsAnalyzer.ClassifierParameter.ActualName = SolutionCreator.CombinedIntegerVectorParameter.ActualName;
         xcsAnalyzer.PredictionParameter.ActualName = Evaluator.PredictionParameter.ActualName;