Changeset 8574 for branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3

Timestamp:

09/05/12 11:11:56 (12 years ago)

Author:

jkarder

Message:

#1853:

• extracted experiment generation from encoding
• added creators
• added crossovers
• added manipulators
• added support for parameters of type IFixedValueParameter
• minor code improvements

Location:

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3

Files:

• ConstrainedItemList.cs (deleted)
• ConstrainedTypeValue.cs (deleted)
• Creators (added)
• Creators/RandomParameterConfigurationCreator.cs (added)
• Crossovers (added)
• Crossovers/ParameterConfigurationCrossover.cs (added)
• ExperimentFactory.cs (added)
• HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3.csproj (modified) (5 diffs)
• Interfaces/IParameterConfigurationCreator.cs (added)
• Interfaces/IParameterConfigurationCrossover.cs (added)
• Interfaces/IParameterConfigurationEvaluator.cs (added)
• Interfaces/IParameterConfigurationManipulator.cs (added)
• Interfaces/IParameterConfigurationOperator.cs (added)
• Interfaces/IRange.cs (modified) (1 diff)
• Manipulators (added)
• Manipulators/ParameterConfigurationAllPositionsManipulator.cs (added)
• Manipulators/ParameterConfigurationManipulator.cs (added)
• Manipulators/ParameterConfigurationOnePositionsManipulator.cs (added)
• Operators (added)
• Operators/Crossovers (added)
• Operators/Crossovers/DoubleValue (added)
• Operators/Crossovers/DoubleValue/AverageDoubleValueCrossover.cs (added)
• Operators/Crossovers/DoubleValue/DiscreteDoubleValueCrossover.cs (added)
• Operators/Crossovers/DoubleValue/NormalDoubleValueCrossover.cs (added)
• Operators/Crossovers/IntValue (added)
• Operators/Crossovers/IntValue/AverageIntValueCrossover.cs (added)
• Operators/Crossovers/IntValue/DiscreteIntValueCrossover.cs (added)
• Operators/Crossovers/IntValue/MultiIntValueCrossover.cs (added)
• Operators/Crossovers/IntValue/NormalIntValueCrossover.cs (added)
• Operators/Crossovers/SymbolicExpressionGrammar (added)
• Operators/Crossovers/SymbolicExpressionGrammar/SymbolicExpressionGrammarCrossover.cs (added)
• Operators/Interfaces (added)
• Operators/Interfaces/IDoubleValueCrossover.cs (added)
• Operators/Interfaces/IDoubleValueManipulator.cs (added)
• Operators/Interfaces/IIntValueCrossover.cs (added)
• Operators/Interfaces/IIntValueManipulator.cs (added)
• Operators/Interfaces/IValueManipulator.cs (added)
• Operators/Manipulators (added)
• Operators/Manipulators/DoubleValue (added)
• Operators/Manipulators/DoubleValue/NormalDoubleValueManipulator.cs (added)
• Operators/Manipulators/DoubleValue/UniformDoubleValueManipulator.cs (added)
• Operators/Manipulators/IntValue (added)
• Operators/Manipulators/IntValue/NormalIntValueManipulator.cs (added)
• Operators/Manipulators/IntValue/UniformIntValueManipulator.cs (added)
• ParameterConfigurationTree.cs (modified) (3 diffs)
• ParameterConfigurations/ParameterConfiguration.cs (modified) (1 diff)
• Plugin.cs.frame (modified) (1 diff)
• RangeConstraints/Range.cs (modified) (1 diff)

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/HeuristicLab.Encodings.ParameterConfigurationEncoding-3.3.csproj

@@ -58 +58 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Optimization-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
@@ -78 +81 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.DataAnalysis-3.4, Version=3.4.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="HeuristicLab.Problems.DataAnalysis.Symbolic-3.4">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.dll</HintPath>
@@ -85 +89 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -94 +100 @@
     <Compile Include="AlgorithmProblemItem.cs" />
     <None Include="Plugin.cs.frame" />
-    <Compile Include="ConstrainedItemList.cs" />
-    <Compile Include="ConstrainedTypeValue.cs" />
+    <Compile Include="Creators\RandomParameterConfigurationCreator.cs" />
+    <Compile Include="Crossovers\ParameterConfigurationCrossover.cs" />
+    <Compile Include="ExperimentFactory.cs" />
     <Compile Include="Interfaces\ICheckedValueConfigurationCollection.cs" />
     <Compile Include="Interfaces\IOptimizable.cs" />
     <Compile Include="Interfaces\IParameterConfiguration.cs" />
+    <Compile Include="Interfaces\IParameterConfigurationCreator.cs" />
+    <Compile Include="Interfaces\IParameterConfigurationCrossover.cs" />
+    <Compile Include="Interfaces\IParameterConfigurationEvaluator.cs" />
+    <Compile Include="Interfaces\IParameterConfigurationManipulator.cs" />
+    <Compile Include="Interfaces\IParameterConfigurationOperator.cs" />
     <Compile Include="Interfaces\IRange.cs" />
     <Compile Include="Interfaces\IValueConfiguration.cs" />
+    <Compile Include="Manipulators\ParameterConfigurationAllPositionsManipulator.cs" />
+    <Compile Include="Manipulators\ParameterConfigurationManipulator.cs" />
+    <Compile Include="Manipulators\ParameterConfigurationOnePositionsManipulator.cs" />
     <Compile Include="NullValue.cs" />
+    <Compile Include="Operators\Crossovers\DoubleValue\AverageDoubleValueCrossover.cs" />
+    <Compile Include="Operators\Crossovers\DoubleValue\DiscreteDoubleValueCrossover.cs" />
+    <Compile Include="Operators\Crossovers\DoubleValue\NormalDoubleValueCrossover.cs" />
+    <Compile Include="Operators\Crossovers\IntValue\AverageIntValueCrossover.cs" />
+    <Compile Include="Operators\Crossovers\IntValue\DiscreteIntValueCrossover.cs" />
+    <Compile Include="Operators\Crossovers\IntValue\MultiIntValueCrossover.cs" />
+    <Compile Include="Operators\Crossovers\IntValue\NormalIntValueCrossover.cs" />
+    <Compile Include="Operators\Interfaces\IDoubleValueCrossover.cs" />
+    <Compile Include="Operators\Interfaces\IDoubleValueManipulator.cs" />
+    <Compile Include="Operators\Interfaces\IIntValueCrossover.cs" />
+    <Compile Include="Operators\Interfaces\IIntValueManipulator.cs" />
+    <Compile Include="Operators\Interfaces\IValueManipulator.cs" />
+    <Compile Include="Operators\Manipulators\DoubleValue\NormalDoubleValueManipulator.cs" />
+    <Compile Include="Operators\Manipulators\DoubleValue\UniformDoubleValueManipulator.cs" />
+    <Compile Include="Operators\Manipulators\IntValue\NormalIntValueManipulator.cs" />
+    <Compile Include="Operators\Manipulators\IntValue\UniformIntValueManipulator.cs" />
     <Compile Include="ParameterCombinationsEnumerator.cs" />
     <Compile Include="ParameterConfigurations\ParameterConfiguration.cs" />
@@ -126 +157 @@
     <None Include="HeuristicLab.snk" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Operators\Crossovers\SymbolicExpressionGrammar\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Interfaces/IRange.cs

@@ -42 +42 @@
   }
 
-  public interface IRange<T> : IRange, IItem where T : class {
+  public interface IRange<T> : IRange where T : class {
     new T LowerBound { get; set; }
     new T UpperBound { get; set; }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurationTree.cs

@@ -166 +166 @@
       get { return parameters; }
       set { parameters = value; }
-    }
-
-    [Storable]
-    private double experimentGenerationProgress;
-    public double ExperimentGenerationProgress {
-      get { return experimentGenerationProgress; }
-      private set {
-        if (experimentGenerationProgress != value) {
-          experimentGenerationProgress = value;
-          OnExperimentGenerationProgressChanged();
-        }
-      }
     }
 
@@ -291 +279 @@
       CombinationsCount = GetCombinationCount(0);
     }
-
-    public event EventHandler ExperimentGenerationProgressChanged;
-    private void OnExperimentGenerationProgressChanged() {
-      var handler = ExperimentGenerationProgressChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
     #endregion
 
@@ -308 +290 @@
 
       algorithm.CollectParameterValues(this.Parameters);
-    }
-
-    public Experiment GenerateExperiment(IAlgorithm algorithm, bool createBatchRuns, int repetitions, Dictionary<IProblemInstanceProvider, HashSet<IDataDescriptor>> problemInstances, CancellationToken ct) {
-      Experiment experiment = new Experiment();
-      var algorithms = new List<IAlgorithm>(1 + problemInstances.Values.Count) { (IAlgorithm)algorithm.Clone() };
-      foreach (var provider in problemInstances) {
-        foreach (var descriptor in provider.Value) {
-          var alg = (IAlgorithm)algorithm.Clone();
-          ProblemInstanceManager.LoadData(provider.Key, descriptor, (IProblemInstanceConsumer)alg.Problem);
-          algorithms.Add(alg);
-        }
-      }
-      ExperimentGenerationProgress = 0;
-      foreach (var alg in algorithms) {
-        foreach (ParameterizedValueConfiguration combination in this) {
-          ct.ThrowIfCancellationRequested();
-          var clonedAlg = (IAlgorithm)alg.Clone();
-          clonedAlg.Name = combination.ParameterInfoString;
-          combination.Parameterize(clonedAlg);
-          clonedAlg.StoreAlgorithmInEachRun = false;
-          if (createBatchRuns) {
-            BatchRun batchRun = new BatchRun(string.Format("BatchRun: {0}", combination.ParameterInfoString));
-            batchRun.Optimizer = clonedAlg;
-            batchRun.Repetitions = repetitions;
-            experiment.Optimizers.Add(batchRun);
-          } else {
-            experiment.Optimizers.Add(clonedAlg);
-          }
-          ExperimentGenerationProgress = (double)experiment.Optimizers.Count / (this.GetCombinationCount(0) * algorithms.Count);
-        }
-      }
-      return experiment;
-    }
-
-    public Experiment GenerateExperiment(IAlgorithm algorithm) {
-      return GenerateExperiment(algorithm, false, 0, null, CancellationToken.None);
-    }
-
-    public Experiment GenerateExperiment(IAlgorithm algorithm, bool createBatchRuns, int repetitions) {
-      return GenerateExperiment(algorithm, createBatchRuns, repetitions, null, CancellationToken.None);
     }
 

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/ParameterConfigurations/ParameterConfiguration.cs

@@ -573 +573 @@
         }
       }
+
       var clonedValue = this.ActualValue.Value != null ? (IItem)this.ActualValue.Value.Clone() : null;
       if (clonedValue != null) AdaptValidValues(parameter, clonedValue);
-      parameter.Value = clonedValue;
+
+      if (!(parameter is IFixedValueParameter)) {
+        parameter.Value = clonedValue;
+      } else {
+        var original = (dynamic)parameter.Value;
+        var clone = (dynamic)clonedValue;
+        if (typeof(ValueTypeValue<>).IsAssignableFrom(parameter.DataType) && !original.ReadOnly) {
+          original.Value = clone.Value;
+        } else if (typeof(ValueTypeArray<>).IsAssignableFrom(parameter.DataType) && !original.ReadOnly) {
+          for (int i = 0; i < original.Length; i++)
+            original[i] = clone[i];
+        } else if (typeof(ValueTypeMatrix<>).IsAssignableFrom(parameter.DataType) && !original.ReadOnly) {
+          for (int i = 0; i < original.Rows; i++)
+            for (int j = 0; j < original.Columns; j++)
+              original[i, j] = clone[i, j];
+        } // StringConvertibleValueTuple<,> not supported
+      }
     }
 

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/Plugin.cs.frame

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.SymbolicExpressionTreeEncoding", "3.4")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
+  [PluginDependency("HeuristicLab.Random", "3.3")]
   public class HeuristicLabEncodingsParameterConfigurationEncodingPlugin : PluginBase {
   }

branches/ParameterConfigurationEncoding/HeuristicLab.Encodings.ParameterConfigurationEncoding/3.3/RangeConstraints/Range.cs

@@ -219 +219 @@
         errorMessage = "Could not parse range."; return false;
       }
-
       if (lowerBound.SetValue(parts2[0]) &&
           upperBound.SetValue(parts2[1]) &&