Changeset 9194 for branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement

Timestamp:

01/28/13 17:54:46 (11 years ago)

Author:

sforsten

Message:

#1980:

• added necessary interface ICondition, IAction, IInput
• removed not used class MatchSelector and interface IMatchSelector
• added constructors to ItemDictionary
• added new encoding

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement

Files:

• ActionExecuter.cs (modified) (3 diffs)
• ClassifierFetcher.cs (modified) (3 diffs)
• IActionExecuter.cs (modified) (1 diff)
• IClassifierFetcher.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement/ActionExecuter.cs

@@ -33 +33 @@
 
     #region parameter
-    public IValueLookupParameter<IClassifier> SelectedActionParameter {
-      get { return (IValueLookupParameter<IClassifier>)Parameters["SelectedAction"]; }
+    public IValueLookupParameter<IAction> SelectedActionParameter {
+      get { return (IValueLookupParameter<IAction>)Parameters["SelectedAction"]; }
     }
-    public IValueLookupParameter<IClassifier> CurrentClassifierToMatchParameter {
-      get { return (IValueLookupParameter<IClassifier>)Parameters["CurrentClassifierToMatch"]; }
+    public IValueLookupParameter<IAction> CurrentActionToMatchParameter {
+      get { return (IValueLookupParameter<IAction>)Parameters["CurrentActionToMatch"]; }
     }
     public IValueLookupParameter<DoubleValue> CurrentPayoffParameter {
@@ -61 +61 @@
     public ActionExecuter()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IClassifier>("SelectedAction"));
-      Parameters.Add(new ValueLookupParameter<IClassifier>("CurrentClassifierToMatch"));
+      Parameters.Add(new ValueLookupParameter<IAction>("SelectedAction"));
+      Parameters.Add(new ValueLookupParameter<IAction>("CurrentActionToMatch"));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("CurrentPayoff"));
       Parameters.Add(new ValueLookupParameter<DoubleValue>("NegativeReward"));
@@ -69 +69 @@
 
     public override IOperation Apply() {
-      if (SelectedActionParameter.ActualValue.MatchAction(CurrentClassifierToMatchParameter.ActualValue)) {
+      if (SelectedActionParameter.ActualValue.Match(CurrentActionToMatchParameter.ActualValue)) {
         CurrentPayoffParameter.ActualValue = PositiveRewardParameter.ActualValue;
       } else {

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement/ClassifierFetcher.cs

@@ -33 +33 @@
   [StorableClass]
   public class ClassifierFetcher : SingleSuccessorOperator, IClassifierFetcher {
+
     #region parameters
-    public IValueLookupParameter<IClassifier> CurrentClassifierToMatchParameter {
-      get { return (IValueLookupParameter<IClassifier>)Parameters["CurrentClassifierToMatch"]; }
+    public IValueLookupParameter<IInput> CurrentInputToMatchParameter {
+      get { return (IValueLookupParameter<IInput>)Parameters["CurrentConditionToMatch"]; }
+    }
+    public IValueLookupParameter<IAction> CurrentActionToMatchParameter {
+      get { return (IValueLookupParameter<IAction>)Parameters["CurrentActionToMatch"]; }
     }
     public ILookupParameter<IConditionActionProblemData> ProblemDataParameter {
@@ -56 +60 @@
     public ClassifierFetcher()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IClassifier>("CurrentClassifierToMatch"));
+      Parameters.Add(new ValueLookupParameter<IInput>("CurrentConditionToMatch"));
+      Parameters.Add(new ValueLookupParameter<IAction>("CurrentActionToMatch"));
       Parameters.Add(new LookupParameter<IConditionActionProblemData>("ProblemData"));
       Parameters.Add(new LookupParameter<IntValue>("Iteration"));
@@ -68 +73 @@
       var trainingIndices = ProblemData.TrainingIndices.ToList();
       int index = IterationParameter.ActualValue.Value % trainingIndices.Count;
-      CurrentClassifierToMatchParameter.ActualValue = ProblemDataParameter.ActualValue.FetchClassifier(trainingIndices[index]);
+      CurrentInputToMatchParameter.ActualValue = ProblemDataParameter.ActualValue.FetchInput(trainingIndices[index]);
+      CurrentActionToMatchParameter.ActualValue = ProblemDataParameter.ActualValue.FetchAction(trainingIndices[index]);
       return base.Apply();
     }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement/IActionExecuter.cs

@@ -27 +27 @@
 namespace HeuristicLab.Encodings.ConditionActionEncoding {
   public interface IActionExecuter : IOperator, IParameterizedNamedItem, INamedItem, IParameterizedItem, IItem, IContent, IDeepCloneable, ICloneable {
-    IValueLookupParameter<IClassifier> SelectedActionParameter { get; }
-    IValueLookupParameter<IClassifier> CurrentClassifierToMatchParameter { get; }
+    IValueLookupParameter<IAction> SelectedActionParameter { get; }
+    IValueLookupParameter<IAction> CurrentActionToMatchParameter { get; }
     IValueLookupParameter<DoubleValue> CurrentPayoffParameter { get; }
     ILookupParameter<DoubleValue> NegativeRewardParameter { get; }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/Reinforcement/IClassifierFetcher.cs

@@ -27 +27 @@
 namespace HeuristicLab.Encodings.ConditionActionEncoding {
   public interface IClassifierFetcher : IOperator, IParameterizedNamedItem, INamedItem, IParameterizedItem, IItem, IContent, IDeepCloneable, ICloneable {
-    IValueLookupParameter<IClassifier> CurrentClassifierToMatchParameter { get; }
+    IValueLookupParameter<IInput> CurrentInputToMatchParameter { get; }
+    IValueLookupParameter<IAction> CurrentActionToMatchParameter { get; }
     ILookupParameter<IConditionActionProblemData> ProblemDataParameter { get; }
     ILookupParameter<IntValue> IterationParameter { get; }