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

Timestamp:

01/28/13 17:54:46 (12 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/ActionSelection

Files:

• ActionSelector.cs (modified) (2 diffs)
• MaxValueActionSelector.cs (modified) (3 diffs)
• OldActionSelector.cs (modified) (3 diffs)
• RandomActionSelector.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/ActionSelection/ActionSelector.cs

@@ -37 +37 @@
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public IValueLookupParameter<IClassifier> SelectedActionParameter {
-      get { return (IValueLookupParameter<IClassifier>)Parameters["SelectedAction"]; }
+    public IValueLookupParameter<IAction> SelectedActionParameter {
+      get { return (IValueLookupParameter<IAction>)Parameters["SelectedAction"]; }
     }
-    public ILookupParameter<IItemDictionary<IClassifier, DoubleValue>> PredictionArrayParameter {
-      get { return (ILookupParameter<IItemDictionary<IClassifier, DoubleValue>>)Parameters["PredictionArray"]; }
+    public ILookupParameter<IItemDictionary<IAction, DoubleValue>> PredictionArrayParameter {
+      get { return (ILookupParameter<IItemDictionary<IAction, DoubleValue>>)Parameters["PredictionArray"]; }
     }
     public ILookupParameter<PercentValue> ExplorationProbabilityParameter {
@@ -55 +55 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random"));
-      Parameters.Add(new ValueLookupParameter<IClassifier>("SelectedAction", "Action, which has been selected."));
-      Parameters.Add(new LookupParameter<IItemDictionary<IClassifier, DoubleValue>>("PredictionArray"));
+      Parameters.Add(new ValueLookupParameter<IAction>("SelectedAction", "Action, which has been selected."));
+      Parameters.Add(new LookupParameter<IItemDictionary<IAction, DoubleValue>>("PredictionArray"));
       Parameters.Add(new LookupParameter<PercentValue>("ExplorationProbability"));
     }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/ActionSelection/MaxValueActionSelector.cs

@@ -36 +36 @@
       get { return (ILookupParameter<ItemArray<DoubleValue>>)Parameters["ValueParameter"]; }
     }
+    public ILookupParameter<IClassifierComparer> ClassifierComparerParameter {
+      get { return (ILookupParameter<IClassifierComparer>)Parameters["ClassifierComparer"]; }
+    }
 
     [StorableConstructor]
@@ -43 +46 @@
       : base() {
       Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("ValueParameter", "DoubleValue which will be summed up."));
+      Parameters.Add(new LookupParameter<IClassifierComparer>("ClassifierComparer"));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -48 +52 @@
     }
 
-    protected override IClassifier SelectAction(List<IScope> scopes) {
-      Dictionary<IClassifier, double> actionSet = new Dictionary<IClassifier, double>();
+    protected override IAction SelectAction(List<IScope> scopes) {
+      Dictionary<IAction, double> actionSet = new Dictionary<IAction, double>(ClassifierComparerParameter.ActualValue);
       for (int i = 0; i < MatchParameter.ActualValue.Length; i++) {
         var action = MatchParameter.ActualValue[i].Action;

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/ActionSelection/OldActionSelector.cs

@@ -38 +38 @@
       get { return (ILookupParameter<ItemArray<IClassifier>>)Parameters["MatchParameter"]; }
     }
-    public IValueLookupParameter<IClassifier> SelectedActionParameter {
-      get { return (IValueLookupParameter<IClassifier>)Parameters["SelectedAction"]; }
+    public IValueLookupParameter<IAction> SelectedActionParameter {
+      get { return (IValueLookupParameter<IAction>)Parameters["SelectedAction"]; }
     }
 
@@ -54 +54 @@
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope from which sub-scopes should be selected."));
       Parameters.Add(new ScopeTreeLookupParameter<IClassifier>("MatchParameter", "The matching encoding contained in each sub-scope which is used for selection."));
-      Parameters.Add(new ValueLookupParameter<IClassifier>("SelectedAction", "Action, which has been selected."));
+      Parameters.Add(new ValueLookupParameter<IAction>("SelectedAction", "Action, which has been selected."));
     }
 
@@ -63 +63 @@
     }
 
-    protected abstract IClassifier SelectAction(List<IScope> scopes);
+    protected abstract IAction SelectAction(List<IScope> scopes);
   }
 }

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/ActionSelection/RandomActionSelector.cs

@@ -45 +45 @@
     }
 
-    protected override IClassifier SelectAction(List<IScope> scopes) {
+    protected override IAction SelectAction(List<IScope> scopes) {
       IRandom random = RandomParameter.ActualValue;
       int index = random.Next(MatchParameter.ActualValue.Length);