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

Timestamp:

02/25/13 12:37:18 (12 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

Location:

branches/LearningClassifierSystems/HeuristicLab.Problems.VariableVectorClassification/3.3

Files:

• VariableVectorClassificationProblem.cs (modified) (6 diffs)
• VariableVectorClassificationProblemData.cs (modified) (4 diffs)

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

@@ -33 +33 @@
 using HeuristicLab.Problems.DataAnalysis;
 
-namespace HeuristicLab.Problems.CombinedIntegerVectorClassification {
+namespace HeuristicLab.Problems.VariableVectorClassification {
   [StorableClass]
   public class VariableVectorClassificationProblem : ConditionActionClassificationProblem<UniformRandomVariableVectorCreator,
                                                             VariableVectorActionComparer,
-                                                            VariableVectorClassificationProblemData> {
+                                                            VariableVectorClassificationProblemData>, IVariableVectorClassificationProblem {
     public override string ChildName {
       get { return "VariableVector"; }
@@ -49 +49 @@
       get { return (IFixedValueParameter<VariableVectorActionComparer>)Parameters["ClassifierComparer"]; }
     }
+    public IVariableVectorCoveringCreator VariableVectorCoveringCreator {
+      get { return (IVariableVectorCoveringCreator)CoveringSolutionCreator; }
+    }
     #endregion
 
@@ -57 +60 @@
         ProblemDataParameter.Value = value;
         if (value != null) {
-          SetProblemDataSpecificParameters();
+          SetProblemDataSettings();
         }
       }
@@ -91 +94 @@
       Parameters.Add(new FixedValueParameter<ItemSet<VariableVectorAction>>("PossibleActionsConcreteClass", new ItemSet<VariableVectorAction>(ClassifierComparer)));
 
-      coveringSolutionCreator.SampleVariableVectorParameter.ActualName = problemData.SampleVariableVectorParameter.Name;
+      SolutionCreator.VariableVectorParameter.ActualName = ChildName;
 
-      SetProblemDataSpecificParameters();
+      SetProblemDataSettings();
 
       InitializeOperators();
-
-      problemData.Changed += new System.EventHandler(problemData_Changed);
     }
 
-    private void problemData_Changed(object sender, System.EventArgs e) {
-      SetProblemDataSpecificParameters();
-    }
+    protected override void SetProblemDataSettings() {
+      SolutionCreator.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
 
-    private void SetProblemDataSpecificParameters() {
-      SolutionCreator.SampleVariableVectorParameter.Value = ProblemData.SampleVariableVectorParameter.Value;
-      SolutionCreator.VariableVectorParameter.ActualName = ChildName;
-      SolutionCreator.SpreadPercentageParameter.Value = ProblemData.SpreadPercentageParameter.Value;
+      VariableVectorCoveringCreator.ProblemDataParameter.ActualName = ProblemDataParameter.Name;
 
       SetPossibleActions();
@@ -130 +127 @@
       var sampleAction = ProblemData.SampleVariableVector.Action;
       var actionKeys = sampleAction.Order;
-      var actionsEnumeratorList = sampleAction.ToDictionary(x => x.Key, y => y.Value.GetAllPossibleActions().ToList());
+      var actionsEnumeratorList = sampleAction.VariableDictionary.ToDictionary(x => x.Key, y => y.Value.GetAllPossibleActions().ToList());
       int[] curPos = new int[actionsEnumeratorList.Count];
       //initialize curPos
@@ -145 +142 @@
         cur = 0;
         foreach (var key in actionKeys) {
-          curAction[key].SetTo(actionsEnumeratorList[key][curPos[cur]]);
+          curAction.VariableDictionary[key].SetTo(actionsEnumeratorList[key][curPos[cur]]);
           cur++;
         }

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);