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

Timestamp:

02/25/13 12:37:18 (11 years ago)

Author:

sforsten

Message:

#1980:

• fixed several bugs (crossover, subsumption, serialization etc.)
• added ModuloOperator
• CombinedIntegerVectorClassificationProblem\Data and VariableVectorClassificationProblem\Data inherit from ConditionActionClassificationProblem\Data
• it can now be set how often the analyzers have to be executed
• VariableVectorAction, VariableVectorCondition and VariableVectorInput now inherit from Item

File:

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

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

@@ -33 +33 @@
 using HeuristicLab.Problems.DataAnalysis;
 
-namespace HeuristicLab.Problems.CombinedIntegerVectorClassification {
+namespace HeuristicLab.Problems.VariableVectorClassification {
   [StorableClass]
   [Item("CombinedIntegerVectorClassificationProblemData", "A problem data for LCS.")]
-  public class VariableVectorClassificationProblemData : ConditionActionClassificationProblemData {
+  public class VariableVectorClassificationProblemData : ConditionActionClassificationProblemData, IVariableVectorClassificationProblemData {
 
     #region parameter properites
@@ -90 +90 @@
           var doubleValues = (variableValues as List<double>).Distinct();
           if (doubleValues.All(x => x % 1 == 0)) {
-            variable = new IntVariable(variableName, doubleValues.Select(x => Convert.ToInt32(x)));
+            // ToList call is necessary, because otherwise it wouldn't be possible to serialize it
+            variable = new IntVariable(variableName, doubleValues.Select(x => Convert.ToInt32(x)).ToList());
           } else {
             variable = new DoubleVariable(variableName, doubleValues);
@@ -105 +106 @@
       if (!fetchInputCache.ContainsKey(rowNumber)) {
         VariableVectorInput input = new VariableVectorInput();
-        IEnumerable<string> variableNames = SampleVariableVector.Condition.Keys.Union(SampleVariableVector.Action.Keys);
+        IEnumerable<string> variableNames = SampleVariableVector.Condition.VariableDictionary.Keys.Union(SampleVariableVector.Action.VariableDictionary.Keys);
         foreach (var variableName in variableNames) {
-          input.Add(variableName, Dataset.GetValue(rowNumber, variableName));
+          input.InputDictionary.Add(variableName, Dataset.GetValue(rowNumber, variableName));
         }
         fetchInputCache.Add(rowNumber, input);
@@ -118 +119 @@
       if (!fetchActionCache.ContainsKey(rowNumber)) {
         var action = SampleVariableVector.Action.GetEmptyCopy();
-        foreach (var variableName in action.Keys) {
-          action[variableName].SetTo(Dataset.GetValue(rowNumber, variableName));
+        foreach (var variableName in action.VariableDictionary.Keys) {
+          action.VariableDictionary[variableName].SetTo(Dataset.GetValue(rowNumber, variableName));
         }
         fetchActionCache.Add(rowNumber, action);