Changeset 9470

Timestamp:

05/08/13 15:46:53 (12 years ago)

Author:

sforsten

Message:

#1980: added better check of which variables can be an action and which can be condition variables

File:

• branches/LearningClassifierSystems/HeuristicLab.Problems.DecisionListClassification/3.3/DecisionListClassificationProblemData.cs (modified) (2 diffs)

branches/LearningClassifierSystems/HeuristicLab.Problems.DecisionListClassification/3.3/DecisionListClassificationProblemData.cs

@@ -134 +134 @@
       if (allowedConditionVariables == null) throw new ArgumentNullException("The allowedActionVariables must not be null.");
 
-      //var validTargetVariableValues = CheckVariablesForPossibleTargetVariables(dataset).Select(x => new StringValue(x).AsReadOnly()).ToList();
-      var validTargetVariableValues = dataset.VariableNames.Select(x => new StringValue(x));
+      var validTargetVariableValues = CheckVariablesForPossibleTargetVariables(dataset);
+      if (!validTargetVariableValues.Any()) {
+        throw new ArgumentException("No valid target variable found.");
+      }
+      // var validTargetVariableValues = dataset.VariableNames.Select(x => new StringValue(x));
       var target = validTargetVariableValues.Where(x => x.Value == targetVariable).DefaultIfEmpty(validTargetVariableValues.First()).First();
 
-      var conditionVariables = new CheckedItemList<StringValue>(dataset.DoubleVariables.Select(x => new StringValue(x)));
+      var conditionVariables = new CheckedItemList<StringValue>(dataset.VariableNames.Select(x => new StringValue(x)));
       foreach (StringValue x in conditionVariables) {
         conditionVariables.SetItemCheckedState(x, allowedConditionVariables.Contains(x.Value));
+      }
+      if (!targetVariable.Equals(target.Value)) {
+        var helper = conditionVariables.FirstOrDefault(x => x.Value.Equals(target.Value));
+        if (helper != null) {
+          conditionVariables.SetItemCheckedState(helper, false);
+        }
+        helper = conditionVariables.FirstOrDefault(x => x.Value.Equals(targetVariable));
+        if (helper != null) {
+          conditionVariables.SetItemCheckedState(helper, true);
+        }
       }
 
@@ -159 +172 @@
 
       RegisterParameterEvents();
+    }
+
+    private IEnumerable<StringValue> CheckVariablesForPossibleTargetVariables(DataAnalysis.Dataset dataset) {
+      var possibleTargets = new List<StringValue>();
+      foreach (var variable in dataset.VariableNames) {
+        var variableValues = dataset.GetValues(variable);
+        if (variableValues is List<string>) {
+          possibleTargets.Add(new StringValue(variable));
+        } else if (variableValues is List<double>) {
+          var doubleValues = (variableValues as List<double>).Distinct();
+          if (doubleValues.All(x => x % 1 == 0)) {
+            possibleTargets.Add(new StringValue(variable));
+          }
+        }
+      }
+      return possibleTargets;
     }
     public override IDeepCloneable Clone(Cloner cloner) {