Changeset 9242 for branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3

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.CombinedIntegerVectorEncoding/3.3

Files:

• CombinedIntegerVectorCreator.cs (modified) (2 diffs)
• Covering/CombinedIntegerVectorCoveringCreator.cs (modified) (1 diff)
• HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj (modified) (1 diff)
• Interfaces/ICombinedIntegerVectorClassificationProblem.cs (added)
• Interfaces/ICombinedIntegerVectorClassificationProblemData.cs (added)
• Interfaces/ICombinedIntegerVectorCreator.cs (modified) (1 diff)

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/CombinedIntegerVectorCreator.cs

@@ -41 +41 @@
       get { return (LookupParameter<IRandom>)Parameters["Random"]; }
     }
-    public IValueLookupParameter<IntValue> LengthParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["Length"]; }
+    public IValueLookupParameter<ICombinedIntegerVectorClassificationProblemData> ProblemDataParameter {
+      get { return (IValueLookupParameter<ICombinedIntegerVectorClassificationProblemData>)Parameters["ProblemData"]; }
     }
-    public IValueLookupParameter<IntMatrix> BoundsParameter {
-      get { return (IValueLookupParameter<IntMatrix>)Parameters["Bounds"]; }
+    public ILookupParameter<CombinedIntegerVector> CombinedIntegerVectorParameter {
+      get { return (ILookupParameter<CombinedIntegerVector>)Parameters["CombinedIntegerVector"]; }
     }
 
-    public IValueLookupParameter<IntValue> ActionPartLengthParameter {
-      get { return (IValueLookupParameter<IntValue>)Parameters["ActionPartLength"]; }
-    }
-
-    public ILookupParameter<CombinedIntegerVector> CombinedIntegerVectorParameter {
-      get { return (ILookupParameter<CombinedIntegerVector>)Parameters["CombinedIntegerVector"]; }
+    protected ICombinedIntegerVectorClassificationProblemData ProblemData {
+      get { return ProblemDataParameter.ActualValue; }
     }
 
@@ -62 +58 @@
       : base() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The pseudo random number generator which should be used for stochastic manipulation operators."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("Length", "The length of the vector."));
-      Parameters.Add(new ValueLookupParameter<IntMatrix>("Bounds", "The bounds matrix can contain one row for each dimension with three columns specifying minimum (inclusive), maximum (exclusive), and step size. If less rows are given the matrix is cycled."));
+      Parameters.Add(new ValueLookupParameter<ICombinedIntegerVectorClassificationProblemData>("ProblemData", ""));
       Parameters.Add(new LookupParameter<CombinedIntegerVector>("CombinedIntegerVector", "The vector which should be manipulated."));
-      Parameters.Add(new ValueLookupParameter<IntValue>("ActionPartLength", "The length of the vector."));
     }
 
     public sealed override IOperation Apply() {
-      CombinedIntegerVectorParameter.ActualValue = Create(RandomParameter.ActualValue, LengthParameter.ActualValue, BoundsParameter.ActualValue, ActionPartLengthParameter.ActualValue);
+      CombinedIntegerVectorParameter.ActualValue = Create(RandomParameter.ActualValue, ProblemData.LengthParameter.Value, ProblemData.BoundsParameter.Value, ProblemData.ActionLengthParameter.Value);
       return base.Apply();
     }

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Covering/CombinedIntegerVectorCoveringCreator.cs

@@ -43 +43 @@
 
     protected override IClassifier CreateCoveredClassifier(IInput input, IAction action, IRandom random, double changeSymbolProbability) {
-      CombinedIntegerVector newCondition = (CombinedIntegerVector)input.Clone();
+      CombinedIntegerVector newCondition = (CombinedIntegerVector)((CombinedIntegerVector)input.Clone()).Condition;
 
       CombinedIntegerVector condition = (CombinedIntegerVector)input;

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/HeuristicLab.Encodings.CombinedIntegerVectorEncoding-3.3.csproj

@@ -128 +128 @@
     <Compile Include="Creators\UniformRandomCombinedIntegerVectorCreator.cs" />
     <Compile Include="Crossovers\SinglePointCrossover.cs" />
+    <Compile Include="Interfaces\ICombinedIntegerVectorClassificationProblem.cs" />
+    <Compile Include="Interfaces\ICombinedIntegerVectorClassificationProblemData.cs" />
     <Compile Include="Interfaces\ICombinedIntegerVectorManipulator.cs" />
     <Compile Include="Interfaces\ICombinedIntegerVectorCrossover.cs" />
-    <Compile Include="Interfaces\IBoundedCombinedIntegerVectorOperator.cs" />
     <Compile Include="Interfaces\ICombinedIntegerVectorCreator.cs" />
     <Compile Include="Interfaces\ICombinedIntegerVectorOperator.cs" />

branches/LearningClassifierSystems/HeuristicLab.Encodings.CombinedIntegerVectorEncoding/3.3/Interfaces/ICombinedIntegerVectorCreator.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 
 namespace HeuristicLab.Encodings.CombinedIntegerVectorEncoding {
-  public interface ICombinedIntegerVectorCreator : ISolutionCreator, IBoundedCombinedIntegerVectorOperator, ICombinedIntegerVectorOperator, IOperator, IParameterizedNamedItem, INamedItem, IParameterizedItem, IItem, IContent, IDeepCloneable, ICloneable {
-    IValueLookupParameter<IntValue> LengthParameter { get; }
-    IValueLookupParameter<IntValue> ActionPartLengthParameter { get; }
+  public interface ICombinedIntegerVectorCreator : ISolutionCreator, ICombinedIntegerVectorOperator, IOperator, IParameterizedNamedItem, INamedItem, IParameterizedItem, IItem, IContent, IDeepCloneable, ICloneable {
+    IValueLookupParameter<ICombinedIntegerVectorClassificationProblemData> ProblemDataParameter { get; }
     ILookupParameter<CombinedIntegerVector> CombinedIntegerVectorParameter { get; }
   }