Changeset 8087 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization

Timestamp:

06/22/12 11:15:13 (13 years ago)

Author:

mkommend

Message:

#1877: Corrected plugin dependencies and ToString methods in MetaOpt.

Location:

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

Files:

• Encoding/ParameterConfigurations/ParameterConfiguration.cs (modified) (1 diff)
• Encoding/ParameterConfigurations/SingleValuedParameterConfiguration.cs (modified) (3 diffs)
• Encoding/RangeConstraints/DoubleValueRange.cs (modified) (2 diffs)
• Encoding/RangeConstraints/IntValueRange.cs (modified) (2 diffs)
• Encoding/RangeConstraints/PercentValueRange.cs (modified) (2 diffs)
• Encoding/RangeConstraints/Range.cs (modified) (1 diff)
• Encoding/SymbolicExpressionGrammar/SymbolValueConfiguration.cs (modified) (1 diff)
• Plugin.cs.frame (modified) (2 diffs)
• TypeValue.cs (modified) (1 diff)

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

@@ -210 +210 @@
       }
     }
-    public ParameterConfiguration() { }
+    protected ParameterConfiguration() { }
     [StorableConstructor]
     protected ParameterConfiguration(bool deserializing) { }

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

@@ -8 +8 @@
   [StorableClass]
   public class SingleValuedParameterConfiguration : ParameterConfiguration {
-    
+
     #region Constructors and Cloning
     [StorableConstructor]
@@ -18 +18 @@
       this.ValueConfigurations.Single().Optimize = true;
     }
-    public SingleValuedParameterConfiguration(string parameterName, IValueConfiguration valueConfiguration) {
+    public SingleValuedParameterConfiguration(string parameterName, IValueConfiguration valueConfiguration)
+      : base() {
       this.ParameterName = parameterName;
       this.parameterDataType = valueConfiguration.ActualValue.ValueDataType;
@@ -36 +37 @@
         this.IsNullable);
     }
-    public SingleValuedParameterConfiguration() { }
     protected SingleValuedParameterConfiguration(SingleValuedParameterConfiguration original, Cloner cloner)
       : base(original, cloner) {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/DoubleValueRange.cs

@@ -18 +18 @@
       }
     }
-    
+
     public DoubleValueRange(DoubleValue lowerBound, DoubleValue upperBound, DoubleValue stepSize) : base(lowerBound, upperBound, stepSize) { }
-    public DoubleValueRange() { }
     [StorableConstructor]
     protected DoubleValueRange(bool deserializing) : base(deserializing) { }
@@ -59 +58 @@
       double range = UpperBound.Value - LowerBound.Value;
       double diff = Math.Abs(a.Value - b.Value);
-      return Math.Max(0, (range - (diff*2)) / range);
+      return Math.Max(0, (range - (diff * 2)) / range);
     }
   }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/IntValueRange.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -13 +11 @@
 
     public IntValueRange(IntValue lowerBound, IntValue upperBound, IntValue stepSize) : base(lowerBound, upperBound, stepSize) { }
-    public IntValueRange() { }
     [StorableConstructor]
     protected IntValueRange(bool deserializing) : base(deserializing) { }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/PercentValueRange.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.MetaOptimization {
@@ -13 +11 @@
 
     public PercentValueRange(PercentValue lowerBound, PercentValue upperBound, PercentValue stepSize) : base(lowerBound, upperBound, stepSize) { }
-    public PercentValueRange() { }
     [StorableConstructor]
     protected PercentValueRange(bool deserializing) : base(deserializing) { }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/Range.cs

@@ -86 +86 @@
     }
 
-    public Range() { }
     [StorableConstructor]
     protected Range(bool deserializing) : base(deserializing) { }
-    protected Range(Range<T> original, Cloner cloner) : base(original, cloner) {
+    protected Range(Range<T> original, Cloner cloner)
+      : base(original, cloner) {
       this.LowerBound = cloner.Clone(original.LowerBound);
       this.UpperBound = cloner.Clone(original.UpperBound);

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/SymbolicExpressionGrammar/SymbolValueConfiguration.cs

@@ -22 +22 @@
     [StorableConstructor]
     protected SymbolValueConfiguration(bool deserializing) : base(deserializing) { }
-    public SymbolValueConfiguration() : base() { }
     public SymbolValueConfiguration(Symbol symbol)
       : base() {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Plugin.cs.frame

@@ -35 +35 @@
   [PluginDependency("HeuristicLab.Core", "3.3")]
   [PluginDependency("HeuristicLab.Data", "3.3")]
-  [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
@@ -45 +44 @@
   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
-  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")]
   [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
   [PluginDependency("HeuristicLab.Random", "3.3")]
-  [PluginDependency("HeuristicLab.Selection", "3.3")]
   [PluginDependency("HeuristicLab.SequentialEngine", "3.3")]
   public class HeuristicLabProblemsMetaOptimizationPlugin : PluginBase {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/TypeValue.cs

@@ -59 +59 @@
 
     public override string ToString() {
+      if (value == null) return "No Type information";
       return value.Name;
     }