Changeset 9090 for branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering

Timestamp:

12/29/12 20:15:48 (11 years ago)

Author:

sforsten

Message:

#1980: implemented covering and changed SinglePointCrossover for CombinedIntegerVectorEncoding

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3

Files:

• . (modified) (1 prop)
• Covering/CoveringOperator.cs (modified) (3 diffs)
• Covering/ICovering.cs (modified) (1 diff)
• Covering/ICoveringSolutionCreator.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/CoveringOperator.cs

@@ -35 +35 @@
 
     #region Parameter Properties
-    public ILookupParameter<IClassifier> CoverClassifierParameter {
-      get { return (ILookupParameter<IClassifier>)Parameters["CoverClassifier"]; }
-    }
     public ILookupParameter<IItemSet<IClassifier>> ActionsInMatchSetParameter {
       get { return (ILookupParameter<IItemSet<IClassifier>>)Parameters["ActionsInMatchSet"]; }
@@ -48 +45 @@
     }
     public IValueLookupParameter<IOperator> EvaluatorParameter {
-      get { return (IValueLookupParameter<IOperator>)Parameters[" Evaluator"]; }
+      get { return (IValueLookupParameter<IOperator>)Parameters["Evaluator"]; }
     }
     public IValueLookupParameter<ICoveringSolutionCreator> SolutionCreatorParameter {
@@ -78 +75 @@
       : base() {
       Parameters.Add(new LookupParameter<IClassifier>("CoverClassifier"));
-      Parameters.Add(new ScopeTreeLookupParameter<IClassifier>("ActionsInMatchSet"));
-      Parameters.Add(new ScopeTreeLookupParameter<IClassifier>("PossibleActions"));
+      Parameters.Add(new LookupParameter<IItemSet<IClassifier>>("ActionsInMatchSet"));
+      Parameters.Add(new LookupParameter<IItemSet<IClassifier>>("PossibleActions"));
       Parameters.Add(new LookupParameter<IntValue>("MinimalNumberOfUniqueActions"));
       Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator"));

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/ICovering.cs

@@ -26 +26 @@
 namespace HeuristicLab.Encodings.ConditionActionEncoding {
   public interface ICovering : IStochasticOperator {
-    ILookupParameter<IClassifier> CoverClassifierParameter { get; }
     ILookupParameter<IItemSet<IClassifier>> ActionsInMatchSetParameter { get; }
     ILookupParameter<IItemSet<IClassifier>> PossibleActionsParameter { get; }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Covering/ICoveringSolutionCreator.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Encodings.ConditionActionEncoding {
-  public interface ICoveringSolutionCreator : IOperator, IParameterizedNamedItem, INamedItem, IParameterizedItem, IItem, IContent, IDeepCloneable, ICloneable {
+  public interface ICoveringSolutionCreator : IOperator, IParameterizedNamedItem, INamedItem, IParameterizedItem, IItem, IContent, IDeepCloneable, ICloneable, IStochasticOperator {
     ILookupParameter<IClassifier> CoverClassifierParameter { get; }
     ILookupParameter<IClassifier> ActionParameter { get; }
 
     IValueLookupParameter<IClassifier> CreatedClassifierParameter { get; }
+    ILookupParameter<PercentValue> ChangeSymbolProbabilityParameter { get; }
   }
 }