Changeset 8087


Ignore:
Timestamp:
06/22/12 11:15:13 (10 years ago)
Author:
mkommend
Message:

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

Location:
branches/HeuristicLab.MetaOptimization
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine.Views/3.3/Plugin.cs.frame

    r6984 r8087  
    2626  [PluginFile("HeuristicLab.HiveEngine.Views-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]
    28   [PluginDependency("HeuristicLab.Clients.Hive.Views", "3.3")]
    29   [PluginDependency("HeuristicLab.Collections", "3.3")]
    30   [PluginDependency("HeuristicLab.Common", "3.3")]
     28  [PluginDependency("HeuristicLab.Clients.Hive.JobManager", "3.3")]
    3129  [PluginDependency("HeuristicLab.Core", "3.3")]
    3230  [PluginDependency("HeuristicLab.Core.Views", "3.3")]
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine/3.3/Plugin.cs.frame

    r7585 r8087  
    2727  [PluginDependency("HeuristicLab.Clients.Hive", "3.3")]
    2828  [PluginDependency("HeuristicLab.Collections", "3.3")]
    29   [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3029  [PluginDependency("HeuristicLab.Common", "3.3")]
    3130  [PluginDependency("HeuristicLab.Core", "3.3")]
    32   [PluginDependency("HeuristicLab.Hive", "3.3")]
    3331  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    34   [PluginDependency("HeuristicLab.Random", "3.3")]
    3532  [PluginDependency("HeuristicLab.SequentialEngine", "3.3")]
    3633  public class HeuristicLabHiveEnginePlugin : PluginBase {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/Plugin.cs.frame

    r7101 r8087  
    3939  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    4040  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    41   [PluginDependency("HeuristicLab.Parameters", "3.3")]
    42   [PluginDependency("HeuristicLab.Parameters.Views", "3.3")]
    4341  [PluginDependency("HeuristicLab.Problems.MetaOptimization", "3.3")]
    4442  [PluginDependency("HeuristicLab.SequentialEngine", "3.3")]
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/ParameterConfiguration.cs

    r7153 r8087  
    210210      }
    211211    }
    212     public ParameterConfiguration() { }
     212    protected ParameterConfiguration() { }
    213213    [StorableConstructor]
    214214    protected ParameterConfiguration(bool deserializing) { }
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/ParameterConfigurations/SingleValuedParameterConfiguration.cs

    r6197 r8087  
    88  [StorableClass]
    99  public class SingleValuedParameterConfiguration : ParameterConfiguration {
    10    
     10
    1111    #region Constructors and Cloning
    1212    [StorableConstructor]
     
    1818      this.ValueConfigurations.Single().Optimize = true;
    1919    }
    20     public SingleValuedParameterConfiguration(string parameterName, IValueConfiguration valueConfiguration) {
     20    public SingleValuedParameterConfiguration(string parameterName, IValueConfiguration valueConfiguration)
     21      : base() {
    2122      this.ParameterName = parameterName;
    2223      this.parameterDataType = valueConfiguration.ActualValue.ValueDataType;
     
    3637        this.IsNullable);
    3738    }
    38     public SingleValuedParameterConfiguration() { }
    3939    protected SingleValuedParameterConfiguration(SingleValuedParameterConfiguration original, Cloner cloner)
    4040      : base(original, cloner) {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/DoubleValueRange.cs

    r6090 r8087  
    1818      }
    1919    }
    20    
     20
    2121    public DoubleValueRange(DoubleValue lowerBound, DoubleValue upperBound, DoubleValue stepSize) : base(lowerBound, upperBound, stepSize) { }
    22     public DoubleValueRange() { }
    2322    [StorableConstructor]
    2423    protected DoubleValueRange(bool deserializing) : base(deserializing) { }
     
    5958      double range = UpperBound.Value - LowerBound.Value;
    6059      double diff = Math.Abs(a.Value - b.Value);
    61       return Math.Max(0, (range - (diff*2)) / range);
     60      return Math.Max(0, (range - (diff * 2)) / range);
    6261    }
    6362  }
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/IntValueRange.cs

    r5522 r8087  
    11using System;
    22using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     3using HeuristicLab.Common;
     4using HeuristicLab.Core;
    55using HeuristicLab.Data;
    6 using HeuristicLab.Common;
    76using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    8 using HeuristicLab.Core;
    97
    108namespace HeuristicLab.Problems.MetaOptimization {
     
    1311
    1412    public IntValueRange(IntValue lowerBound, IntValue upperBound, IntValue stepSize) : base(lowerBound, upperBound, stepSize) { }
    15     public IntValueRange() { }
    1613    [StorableConstructor]
    1714    protected IntValueRange(bool deserializing) : base(deserializing) { }
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/PercentValueRange.cs

    r5522 r8087  
    11using System;
    22using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     3using HeuristicLab.Common;
     4using HeuristicLab.Core;
    55using HeuristicLab.Data;
    6 using HeuristicLab.Common;
    76using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    8 using HeuristicLab.Core;
    97
    108namespace HeuristicLab.Problems.MetaOptimization {
     
    1311
    1412    public PercentValueRange(PercentValue lowerBound, PercentValue upperBound, PercentValue stepSize) : base(lowerBound, upperBound, stepSize) { }
    15     public PercentValueRange() { }
    1613    [StorableConstructor]
    1714    protected PercentValueRange(bool deserializing) : base(deserializing) { }
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/RangeConstraints/Range.cs

    r6090 r8087  
    8686    }
    8787
    88     public Range() { }
    8988    [StorableConstructor]
    9089    protected Range(bool deserializing) : base(deserializing) { }
    91     protected Range(Range<T> original, Cloner cloner) : base(original, cloner) {
     90    protected Range(Range<T> original, Cloner cloner)
     91      : base(original, cloner) {
    9292      this.LowerBound = cloner.Clone(original.LowerBound);
    9393      this.UpperBound = cloner.Clone(original.UpperBound);
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encoding/SymbolicExpressionGrammar/SymbolValueConfiguration.cs

    r6197 r8087  
    2222    [StorableConstructor]
    2323    protected SymbolValueConfiguration(bool deserializing) : base(deserializing) { }
    24     public SymbolValueConfiguration() : base() { }
    2524    public SymbolValueConfiguration(Symbol symbol)
    2625      : base() {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Plugin.cs.frame

    r7153 r8087  
    3535  [PluginDependency("HeuristicLab.Core", "3.3")]
    3636  [PluginDependency("HeuristicLab.Data", "3.3")]
    37   [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
    3837  [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
    3938  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
     
    4544  [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
    4645  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic", "3.4")]
    47   [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")]
    4846  [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
    4947  [PluginDependency("HeuristicLab.Random", "3.3")]
    50   [PluginDependency("HeuristicLab.Selection", "3.3")]
    5148  [PluginDependency("HeuristicLab.SequentialEngine", "3.3")]
    5249  public class HeuristicLabProblemsMetaOptimizationPlugin : PluginBase {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/TypeValue.cs

    r7242 r8087  
    5959
    6060    public override string ToString() {
     61      if (value == null) return "No Type information";
    6162      return value.Name;
    6263    }
Note: See TracChangeset for help on using the changeset viewer.