Changeset 9242 for branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Covering/VariableVectorCoveringCreator.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

Location:

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3

Files:

• . (modified) (1 prop)
• Covering/VariableVectorCoveringCreator.cs (modified) (3 diffs)

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3

@@ -1 +1 @@
 obj
+Plugin.cs

@@ -1 +1 @@
 obj
+Plugin.cs

branches/LearningClassifierSystems/HeuristicLab.Encodings.VariableVector/3.3/Covering/VariableVectorCoveringCreator.cs

@@ -34 +34 @@
   public class VariableVectorCoveringCreator : CoveringSolutionCreator, IVariableVectorCoveringCreator {
 
-    public IValueLookupParameter<VariableVector> SampleVariableVectorParameter {
-      get { return (IValueLookupParameter<VariableVector>)Parameters["SampleVariableVector"]; }
+    public IValueLookupParameter<IVariableVectorClassificationProblemData> ProblemDataParameter {
+      get { return (IValueLookupParameter<IVariableVectorClassificationProblemData>)Parameters["ProblemData"]; }
+    }
+
+    private IVariableVectorClassificationProblemData ProblemData {
+      get { return ProblemDataParameter.ActualValue; }
     }
 
@@ -45 +49 @@
     public VariableVectorCoveringCreator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<VariableVector>("SampleVariableVector"));
+      Parameters.Add(new ValueLookupParameter<IVariableVectorClassificationProblemData>("ProblemData"));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -55 +59 @@
       var actionCast = action as VariableVectorAction;
 
-      VariableVectorCondition sampleVariableVectorCondition = SampleVariableVectorParameter.ActualValue.Condition;
+      VariableVectorCondition sampleVariableVectorCondition = ProblemData.SampleVariableVectorParameter.Value.Condition;
       IEnumerable<IVariable> newCondition = CoverInput(inputCast, sampleVariableVectorCondition, random, changeSymbolProbability);
 
-      return new VariableVector(newCondition, actionCast.Values);
+      return new VariableVector(newCondition, actionCast.VariableDictionary.Values);
     }
 
     private IEnumerable<IVariable> CoverInput(VariableVectorInput input, VariableVectorCondition sample, IRandom random, double changeSymbolProbability) {
-      var conditionVariables = new List<IVariable>();
-      if (!sample.Keys.All(x => input.ContainsKey(x))) {
+      List<IVariable> conditionVariables = new List<IVariable>();
+      if (!sample.VariableDictionary.Keys.All(x => input.InputDictionary.ContainsKey(x))) {
         throw new ArgumentException("Input does not contain all variable names from sample");
       }
-      foreach (var keyValuePair in sample) {
+      foreach (var keyValuePair in sample.VariableDictionary) {
         IVariable variable = keyValuePair.Value.GetEmptyCopy();
-        variable.Cover(random, input[keyValuePair.Key], changeSymbolProbability);
+        variable.Cover(random, input.InputDictionary[keyValuePair.Key], changeSymbolProbability);
         conditionVariables.Add(variable);
       }

@@ -1 +1 @@
 obj
+Plugin.cs