Changeset 9194 for branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/XCSModel.cs

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

File:

• branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/XCSModel.cs (modified) (5 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.ConditionActionEncoding/3.3/XCSModel.cs

@@ -34 +34 @@
     public int ClassifierCount { get { return Count; } }
 
+    public IClassifierComparer ClassifierComparer { get; set; }
+
     [StorableConstructor]
     protected XCSModel(bool deserializing) : base(deserializing) { }
@@ -51 +53 @@
     }
 
-    public IEnumerable<IClassifier> GetAction(IEnumerable<IClassifier> classifiers) {
+    public IEnumerable<IAction> GetAction(IEnumerable<IInput> classifiers) {
       foreach (var classifier in classifiers) {
         yield return GetAction(classifier);
@@ -57 +59 @@
     }
 
-    public IClassifier GetAction(IClassifier classifier) {
+    public IAction GetAction(IInput classifier) {
       var matchedClassifiers = new ItemCollection<XCSClassifier>();
       foreach (var xcsClassifier in this) {
-        if (xcsClassifier.Classifier.MatchCondition(classifier)) {
+        if (xcsClassifier.Classifier.MatchInput(classifier)) {
           matchedClassifiers.Add(xcsClassifier);
         }
@@ -67 +69 @@
       if (matchedClassifiers.Count == 0) { return null; }
 
-      IDictionary<IClassifier, double> predictionArray = CreatePredictionArray(matchedClassifiers);
+      IDictionary<IAction, double> predictionArray = CreatePredictionArray(matchedClassifiers);
       return predictionArray.OrderByDescending(x => x.Value).First().Key;
     }
 
-    private IDictionary<IClassifier, double> CreatePredictionArray(ItemCollection<XCSClassifier> matchedClassifiers) {
-      var predictionArray = new Dictionary<IClassifier, double>();
-      var fitnessSumPerAction = new Dictionary<IClassifier, double>();
+    private IDictionary<IAction, double> CreatePredictionArray(ItemCollection<XCSClassifier> matchedClassifiers) {
+      var predictionArray = new Dictionary<IAction, double>(ClassifierComparer);
+      var fitnessSumPerAction = new Dictionary<IAction, double>(ClassifierComparer);
 
       foreach (var xcsClassifier in matchedClassifiers) {
@@ -86 +88 @@
       }
 
-      var actions = new List<IClassifier>(predictionArray.Keys);
+      var actions = new List<IAction>(predictionArray.Keys);
       foreach (var action in actions) {
         if (fitnessSumPerAction[action] != 0) {