Changeset 6017 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding

Timestamp:

04/17/11 11:03:48 (13 years ago)

Author:

cneumuel

Message:

#1215

• fixed import of existing algorithm
• moved operators in subfolders
• extended tests for SymbolicExpressionGrammar

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding

Files:

• Crossovers/ParameterConfigurationCrossover.cs (modified) (2 diffs)
• Manipulators/ParameterConfigurationManipulator.cs (modified) (1 diff)
• ParameterConfigurations/ParameterConfiguration.cs (modified) (6 diffs)
• SymbolicRegression (deleted)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Crossovers/ParameterConfigurationCrossover.cs

@@ -1 @@
-using HeuristicLab.Common;
+using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
-using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using System;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -96 +94 @@
     }
 
-    private static void Cross(IRandom random, IOptimizable configuartion, IOptimizable other, IIntValueCrossover intValueCrossover, IDoubleValueCrossover doubleValueCrossover) {
-      var vc = configuartion as RangeValueConfiguration;
-      var pc = configuartion as IParameterConfiguration;
+    public static void Cross(IRandom random, IOptimizable configuration, IOptimizable other, IIntValueCrossover intValueCrossover, IDoubleValueCrossover doubleValueCrossover) {
+      var vc = configuration as RangeValueConfiguration;
+      var pc = configuration as IParameterConfiguration;
       if (vc != null) {
         var value = vc.ActualValue.Value;

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/Manipulators/ParameterConfigurationManipulator.cs

@@ -51 +51 @@
     }
 
-    protected static void Mutate(IRandom random, IOptimizable configuration, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) {
+    public static void Mutate(IRandom random, IOptimizable configuration, IIntValueManipulator intValueManipulator, IDoubleValueManipulator doubleValueManipulator) {
       var vc = configuration as RangeValueConfiguration;
       var pc = configuration as IParameterConfiguration;

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs

@@ -138 +138 @@
     protected IItemSet<IItem> validValues;
 
+    [Storable]
+    private bool autoPopulateValueConfigurations = true;
+    public bool AutoPopulateValueConfigurations {
+      get { return autoPopulateValueConfigurations; }
+      set { autoPopulateValueConfigurations = value; }
+    }
+    
+
     #region Constructors and Cloning
     public ParameterConfiguration(string parameterName, IValueParameter valueParameter, bool discoverValidValues) {
+      this.AutoPopulateValueConfigurations = true;
       this.ParameterName = parameterName;
       this.parameterDataType = valueParameter.GetType();
@@ -162 +171 @@
     }
     public ParameterConfiguration(string parameterName, Type type, IItem actualValue, IEnumerable<IValueConfiguration> valueConfigurations) {
+      this.AutoPopulateValueConfigurations = false;
       this.ParameterName = parameterName;
       this.parameterDataType = type;
@@ -174 +184 @@
     }
     public ParameterConfiguration(string parameterName, Type type, IItem actualValue) {
+      this.AutoPopulateValueConfigurations = true;
       this.ParameterName = parameterName;
       this.parameterDataType = type;
@@ -206 +217 @@
       this.discoverValidValues = original.discoverValidValues;
       if (this.valueConfigurations != null) RegisterValueConfigurationEvents();
+      this.AutoPopulateValueConfigurations = original.AutoPopulateValueConfigurations;
     }
 
@@ -238 +250 @@
 
     protected virtual void PopulateValueConfigurations() {
+      if (!this.AutoPopulateValueConfigurations)
+        return;
+
       foreach (Type t in this.validTypes) {
         if (t == typeof(NullValue)) {
@@ -266 +281 @@
 
     protected virtual void ClearValueConfigurations() {
+      if (!this.AutoPopulateValueConfigurations)
+        return;
+
       this.ValueConfigurations.Clear();
     }