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

Timestamp:

05/08/13 14:12:00 (12 years ago)

Author:

sforsten

Message:

#1980:

• added ProportionalTournamentSelector for XCS
• fixed bug: if an initial population is created in XCS, the initial population also creates general classifier, not only specific ones
• merged r9204:9466 HeuristicLab.Core from trunk to branch

Location:

branches/LearningClassifierSystems

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ConditionActionClassification/3.3/ConditionActionClassificationProblem.cs (modified) (4 diffs)

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

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.Instances;
@@ -42 +43 @@
     private const string ActionExecuterParameterName = "ActionExecuter";
     private const string ActionSetSubsumptionOperatorParameterName = "ActionSetSubsumption";
+    private const string MaximizationParameterName = "Maximization";
 
     public abstract string ChildName { get; }
+
+    public IFixedValueParameter<BoolValue> MaximizationParameter {
+      get { return (IFixedValueParameter<BoolValue>)Parameters[MaximizationParameterName]; }
+    }
+    IParameter IConditionActionProblem.MaximizationParameter {
+      get { return MaximizationParameter; }
+    }
 
     IXCSEvaluator IConditionActionProblem.Evaluator {
@@ -149 +158 @@
     public ConditionActionClassificationProblem(V problemData, XCSEvaluator evaluator, T solutionCreator, ICoveringSolutionCreator coveringSolutionCreator)
       : base(evaluator, solutionCreator) {
+      Parameters.Add(new FixedValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized.", new BoolValue((true))));
       Parameters.Add(new ValueParameter<V>("ProblemData", "", problemData));
       Parameters.Add(new FixedValueParameter<DoubleValue>("PositiveReward", "", new DoubleValue(1000)));
@@ -207 +217 @@
       Operators.Add(new BestTrainingXCSSolutionAnalyzer());
       Operators.Add(new CurrentXCSSolutionAnalyzer());
+      Operators.AddRange(ApplicationManager.Manager.GetInstances<ISingleObjectiveSelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name));
     }