Changeset 9494 for branches/LearningClassifierSystems/HeuristicLab.Problems.VariableVectorClassification/3.3/VariableVectorClassificationProblemData.cs

Timestamp:

05/14/13 16:54:01 (11 years ago)

Author:

sforsten

Message:

#1980:

• renamed algorithm Learning Classifier System to XCS
• DecisionListSolution and XCSSolution show more information
• VariableVectorClassificationProblemData can now also import datasets where the last variable is not the target variable

File:

• branches/LearningClassifierSystems/HeuristicLab.Problems.VariableVectorClassification/3.3/VariableVectorClassificationProblemData.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Problems.VariableVectorClassification/3.3/VariableVectorClassificationProblemData.cs

@@ -74 +74 @@
     public VariableVectorClassificationProblemData(Dataset dataset, IEnumerable<string> allowedConditionVariables, IEnumerable<string> allowedActionVariables) :
       base(dataset, allowedConditionVariables, allowedActionVariables) {
-      Parameters.Add(new ValueParameter<VariableVector>("SampleVariableVector", "", GenerateSampleVariableVector(dataset, allowedConditionVariables, allowedActionVariables)));
+      Parameters.Add(new ValueParameter<VariableVector>("SampleVariableVector", "", GenerateSampleVariableVector(dataset, AllowedConditionVariables, AllowedActionVariables)));
       Parameters.Add(new FixedValueParameter<PercentValue>("SpreadPercentage", "", new PercentValue(0.5)));
+    }
+
+    protected override CheckedItemList<StringValue> CheckVariablesForPossibleTargetVariables(Dataset dataset) {
+      var allVariables = GetVariablesOfDataSet(dataset, dataset.VariableNames).Where(v => v is StringVariable || v is IntVariable).Select(v => new StringValue(v.VariableName));
+      return new CheckedItemList<StringValue>(allVariables);
     }
 
@@ -81 +86 @@
       var conditionVariables = GetVariablesOfDataSet(dataset, allowedConditionVariables);
       var actionVariables = GetVariablesOfDataSet(dataset, allowedActionVariables);
-      if (actionVariables.Count() == 0 || !actionVariables.All(x => x is IActionVariable)) {
+      if (!actionVariables.All(x => x is IActionVariable)) {
         throw new ArgumentException("Action variable can not be empty and all action variables have to be of type int or string.");
       }
@@ -87 +92 @@
     }
 
-    private IEnumerable<Encodings.VariableVector.IVariable> GetVariablesOfDataSet(DataAnalysis.Dataset dataset, IEnumerable<string> allowedVariables) {
+    private IEnumerable<Encodings.VariableVector.IVariable> GetVariablesOfDataSet(Dataset dataset, IEnumerable<string> allowedVariables) {
       var variables = new List<HeuristicLab.Encodings.VariableVector.IVariable>();
       foreach (var variableName in allowedVariables) {