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

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.Problems.ConditionActionClassification/3.3

Files:

• HeuristicLab.Problems.ConditionActionClassification-3.3.csproj (modified) (2 diffs)
• Implementation/ConditionActionClassificationProblem.cs (modified) (7 diffs)
• Implementation/ConditionActionClassificationProblemData.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/HeuristicLab.Problems.ConditionActionClassification-3.3.csproj

@@ -44 +44 @@
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HeuristicLab.Core-3.3">
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -100 +96 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
+      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
+      <Name>HeuristicLab.Core-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Encodings.CombinedIntegerVectorEncoding\3.3\HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj">
       <Project>{CE7163C5-BFFE-45F0-9BD0-E10EF24E8BD2}</Project>

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

@@ -69 +69 @@
       get { return (IFixedValueParameter<DoubleValue>)Parameters["InitialFitness"]; }
     }
-    public IFixedValueParameter<ItemSet<IClassifier>> PossibleActionsParameter {
-      get { return (IFixedValueParameter<ItemSet<IClassifier>>)Parameters["PossibleActions"]; }
+    public IFixedValueParameter<ItemSet<IAction>> PossibleActionsParameter {
+      get { return (IFixedValueParameter<ItemSet<IAction>>)Parameters["PossibleActions"]; }
     }
     public IFixedValueParameter<ItemSet<CombinedIntegerVector>> PossibleActionsConcreteClassParameter {
@@ -77 +77 @@
     public IFixedValueParameter<IntValue> ThetaMinimalNumberOfActionsParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters["ThetaMinimalNumberOfActions"]; }
+    }
+    public IFixedValueParameter<HeuristicLab.Encodings.CombinedIntegerVectorEncoding.CombinedIntegerVector.CombinedIntegerVectorComparer> ClassifierComparerParameter {
+      get { return (IFixedValueParameter<HeuristicLab.Encodings.CombinedIntegerVectorEncoding.CombinedIntegerVector.CombinedIntegerVectorComparer>)Parameters["ClassifierComparer"]; }
     }
     #endregion
@@ -108 +111 @@
     //  get { return PossibleActions; }
     //}
-    public ItemSet<IClassifier> PossibleActions {
+    public ItemSet<IAction> PossibleActions {
       get { return PossibleActionsParameter.Value; }
     }
@@ -148 +151 @@
     IParameter IConditionActionProblem.CoveringSolutionCreatorParameter {
       get { return CoveringSolutionCreatorParameter; }
+    }
+    public IClassifierComparer ClassifierComparer {
+      get { return ClassifierComparerParameter.Value; }
+    }
+    IParameter IConditionActionProblem.ClassifierComparerParameter {
+      get { return ClassifierComparerParameter; }
     }
     #endregion
@@ -177 +186 @@
       Parameters.Add(new ValueParameter<IActionExecuter>(ActionExecuterParameterName, "", new ActionExecuter()));
       Parameters.Add(new ValueParameter<ClassifierFetcher>(ClassifierFetcherParameterName, "", new ClassifierFetcher()));
-      Parameters.Add(new FixedValueParameter<ItemSet<IClassifier>>("PossibleActions"));
-      Parameters.Add(new FixedValueParameter<ItemSet<CombinedIntegerVector>>("PossibleActionsConcreteClass"));
+      Parameters.Add(new FixedValueParameter<HeuristicLab.Encodings.CombinedIntegerVectorEncoding.CombinedIntegerVector.CombinedIntegerVectorComparer>("ClassifierComparer", new HeuristicLab.Encodings.CombinedIntegerVectorEncoding.CombinedIntegerVector.CombinedIntegerVectorComparer()));
+      Parameters.Add(new FixedValueParameter<ItemSet<IAction>>("PossibleActions", new ItemSet<IAction>(ClassifierComparer)));
+      Parameters.Add(new FixedValueParameter<ItemSet<CombinedIntegerVector>>("PossibleActionsConcreteClass", new ItemSet<CombinedIntegerVector>(ClassifierComparer)));
       Parameters.Add(new FixedValueParameter<IntValue>("ThetaMinimalNumberOfActions", "Minimal number of actions, which have to be present in the match set, or else covering will occure.", new IntValue(1)));
 
@@ -191 +201 @@
 
       coveringSolutionCreator.ChangeSymbolProbabilityParameter.ActualName = ChangeSymbolProbabilityInCoveringParameter.Name;
-      coveringSolutionCreator.CoverClassifierParameter.ActualName = ClassifierFetcher.CurrentClassifierToMatchParameter.ActualName;
+      coveringSolutionCreator.CoverInputParameter.ActualName = ClassifierFetcher.CurrentInputToMatchParameter.ActualName;
       coveringSolutionCreator.CreatedClassifierParameter.ActualName = "CombinedIntegerVector";
 
       ClassifierFetcher.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
 
-      ActionExecuter.CurrentClassifierToMatchParameter.ActualName = ClassifierFetcher.CurrentClassifierToMatchParameter.ActualName;
+      ActionExecuter.CurrentActionToMatchParameter.ActualName = ClassifierFetcher.CurrentActionToMatchParameter.ActualName;
       ActionExecuter.NegativeRewardParameter.ActualName = NegativeRewardParameter.Name;
       ActionExecuter.PositiveRewardParameter.ActualName = PositiveRewardParameter.Name;
@@ -241 +251 @@
         xcsAnalyzer.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
         xcsAnalyzer.ResultsParameter.ActualName = "Results";
+        xcsAnalyzer.ClassifierComparerParameter.ActualName = ClassifierComparerParameter.Name;
       }
     }

branches/LearningClassifierSystems/HeuristicLab.Problems.ConditionActionClassification/3.3/Implementation/ConditionActionClassificationProblemData.cs

@@ -119 +119 @@
     #endregion
 
-    private IDictionary<int, IClassifier> fetchClassifiersCache = new Dictionary<int, IClassifier>();
-
-
     [StorableConstructor]
     protected ConditionActionClassificationProblemData(bool deserializing) : base(deserializing) { }
@@ -201 +198 @@
     }
 
-    public IEnumerable<IClassifier> FetchClassifier(IEnumerable<int> rows) {
+    public IEnumerable<IInput> FetchInput(IEnumerable<int> rows) {
       foreach (var row in rows) {
-        yield return FetchClassifier(row);
-      }
-    }
-
-    public IClassifier FetchClassifier(int rowNumber) {
+        yield return FetchInput(row);
+      }
+    }
+    public IInput FetchInput(int rowNumber) {
+      return FetchClassifier(rowNumber).Condition as IInput;
+    }
+    public IEnumerable<IAction> FetchAction(IEnumerable<int> rows) {
+      foreach (var row in rows) {
+        yield return FetchAction(row);
+      }
+    }
+    public IAction FetchAction(int rowNumber) {
+      return FetchClassifier(rowNumber).Action;
+    }
+    #region fetchHelper
+    private IDictionary<int, IClassifier> fetchClassifiersCache = new Dictionary<int, IClassifier>();
+
+    private IClassifier FetchClassifier(int rowNumber) {
       if (!fetchClassifiersCache.ContainsKey(rowNumber)) {
         int[] elements = new int[Length.Value];
@@ -231 +241 @@
       return fetchClassifiersCache[rowNumber];
     }
+    #endregion
   }
 }