Changeset 4839


Ignore:
Timestamp:
11/18/10 17:18:51 (9 years ago)
Author:
cneumuel
Message:

#1215 worked on MetaOptimization

  • split configurations into ValueConfigurations and ParameterConfigurations
Location:
branches/HeuristicLab.MetaOptimization
Files:
24 added
15 deleted
18 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.MetaOptimization

    • Property svn:ignore
      •  

        old new  
        11HeuristicLab.MetaOptimization.suo
         2HeuristicLab.MetaOptimization.Test
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.sln

    r4516 r4839  
    88Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.MetaOptimization.Views-3.3", "HeuristicLab.Problems.MetaOptimization.Views\3.3\HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj", "{59567338-A551-4386-8405-A8C0DF3E376D}"
    99EndProject
     10Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.MetaOptimization.Test", "HeuristicLab.MetaOptimization.Test\HeuristicLab.MetaOptimization.Test.csproj", "{0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}"
     11EndProject
    1012Global
    1113  GlobalSection(SolutionConfigurationPlatforms) = preSolution
    1214    Debug|Any CPU = Debug|Any CPU
     15    Debug|Mixed Platforms = Debug|Mixed Platforms
     16    Debug|x86 = Debug|x86
    1317    Release|Any CPU = Release|Any CPU
     18    Release|Mixed Platforms = Release|Mixed Platforms
     19    Release|x86 = Release|x86
    1420  EndGlobalSection
    1521  GlobalSection(ProjectConfigurationPlatforms) = postSolution
    1622    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1723    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Debug|Any CPU.Build.0 = Debug|Any CPU
     24    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     25    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     26    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Debug|x86.ActiveCfg = Debug|Any CPU
    1827    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1928    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Release|Any CPU.Build.0 = Release|Any CPU
     29    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     30    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Release|Mixed Platforms.Build.0 = Release|Any CPU
     31    {ABBC1DF6-FCC6-4F86-AB75-B6B3A72E7D17}.Release|x86.ActiveCfg = Release|Any CPU
    2032    {59567338-A551-4386-8405-A8C0DF3E376D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    2133    {59567338-A551-4386-8405-A8C0DF3E376D}.Debug|Any CPU.Build.0 = Debug|Any CPU
     34    {59567338-A551-4386-8405-A8C0DF3E376D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
     35    {59567338-A551-4386-8405-A8C0DF3E376D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
     36    {59567338-A551-4386-8405-A8C0DF3E376D}.Debug|x86.ActiveCfg = Debug|Any CPU
    2237    {59567338-A551-4386-8405-A8C0DF3E376D}.Release|Any CPU.ActiveCfg = Release|Any CPU
    2338    {59567338-A551-4386-8405-A8C0DF3E376D}.Release|Any CPU.Build.0 = Release|Any CPU
     39    {59567338-A551-4386-8405-A8C0DF3E376D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
     40    {59567338-A551-4386-8405-A8C0DF3E376D}.Release|x86.ActiveCfg = Release|Any CPU
     41    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     42    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     43    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
     44    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Debug|Mixed Platforms.Build.0 = Debug|x86
     45    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Debug|x86.ActiveCfg = Debug|x86
     46    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Debug|x86.Build.0 = Debug|x86
     47    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Release|Any CPU.ActiveCfg = Release|x86
     48    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Release|Mixed Platforms.ActiveCfg = Release|x86
     49    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Release|Mixed Platforms.Build.0 = Release|x86
     50    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Release|x86.ActiveCfg = Release|x86
     51    {0E232F46-FD0B-4FEA-8C22-AF18DE0D151E}.Release|x86.Build.0 = Release|x86
    2452  EndGlobalSection
    2553  GlobalSection(SolutionProperties) = preSolution
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3

    • Property svn:ignore
      •  

        old new  
        11bin
        22obj
         3HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj.user
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj

    r4830 r4839  
    5454      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Core.Views-3.3.dll</HintPath>
    5555    </Reference>
    56     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     56    <Reference Include="HeuristicLab.Data-3.3">
     57      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
     58    </Reference>
    5759    <Reference Include="HeuristicLab.Data.Views-3.3">
    5860      <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Data.Views-3.3.dll</HintPath>
     
    8385  </ItemGroup>
    8486  <ItemGroup>
    85     <Compile Include="RootParameterConfigurationView.cs">
     87    <Compile Include="ValueConfigurationViews\ValueConfigurationCheckedItemList.cs">
    8688      <SubType>UserControl</SubType>
    8789    </Compile>
    88     <Compile Include="RootParameterConfigurationView.Designer.cs">
    89       <DependentUpon>RootParameterConfigurationView.cs</DependentUpon>
     90    <Compile Include="ValueConfigurationViews\ValueConfigurationCheckedItemList.Designer.cs">
     91      <DependentUpon>ValueConfigurationCheckedItemList.cs</DependentUpon>
    9092    </Compile>
    91     <Compile Include="NumericRangeView.cs">
     93    <Compile Include="ValueConfigurationViews\NumericRangeView.cs">
    9294      <SubType>UserControl</SubType>
    9395    </Compile>
    94     <Compile Include="NumericRangeView.Designer.cs">
     96    <Compile Include="ValueConfigurationViews\NumericRangeView.Designer.cs">
    9597      <DependentUpon>NumericRangeView.cs</DependentUpon>
    9698    </Compile>
     
    101103      <DependentUpon>ObjectSelectorDialog.cs</DependentUpon>
    102104    </Compile>
    103     <Compile Include="ParameterConfigurationListView.cs">
     105    <Compile Include="ParameterConfigurationViews\ParameterConfigurationListView.cs">
    104106      <SubType>UserControl</SubType>
    105107    </Compile>
    106     <Compile Include="ParameterConfigurationListView.Designer.cs">
     108    <Compile Include="ParameterConfigurationViews\ParameterConfigurationListView.Designer.cs">
    107109      <DependentUpon>ParameterConfigurationListView.cs</DependentUpon>
    108110    </Compile>
    109111    <Compile Include="HeuristicLabProblemsMetaOptimizationViewsPlugin.cs" />
    110     <Compile Include="ParameterConfigurationView.cs">
     112    <Compile Include="ParameterConfigurationViews\ParameterConfigurationView.cs">
    111113      <SubType>UserControl</SubType>
    112114    </Compile>
    113     <Compile Include="ParameterConfigurationView.Designer.cs">
     115    <Compile Include="ParameterConfigurationViews\ParameterConfigurationView.Designer.cs">
    114116      <DependentUpon>ParameterConfigurationView.cs</DependentUpon>
    115117    </Compile>
    116118    <Compile Include="Properties\AssemblyInfo.cs" />
    117     <Compile Include="ValueView.cs">
     119    <Compile Include="ValueConfigurationViews\ValueConfigurationView.cs">
    118120      <SubType>UserControl</SubType>
    119121    </Compile>
    120     <Compile Include="ValueView.Designer.cs">
     122    <Compile Include="ValueConfigurationViews\ValueConfigurationView.Designer.cs">
     123      <DependentUpon>ValueConfigurationView.cs</DependentUpon>
     124    </Compile>
     125    <Compile Include="ValueConfigurationViews\ValueView.cs">
     126      <SubType>UserControl</SubType>
     127    </Compile>
     128    <Compile Include="ValueConfigurationViews\ValueView.Designer.cs">
    121129      <DependentUpon>ValueView.cs</DependentUpon>
    122130    </Compile>
     
    133141  </ItemGroup>
    134142  <ItemGroup>
    135     <EmbeddedResource Include="RootParameterConfigurationView.resx">
    136       <DependentUpon>RootParameterConfigurationView.cs</DependentUpon>
    137     </EmbeddedResource>
    138     <EmbeddedResource Include="NumericRangeView.resx">
     143    <EmbeddedResource Include="ValueConfigurationViews\NumericRangeView.resx">
    139144      <DependentUpon>NumericRangeView.cs</DependentUpon>
    140145    </EmbeddedResource>
     
    142147      <DependentUpon>ObjectSelectorDialog.cs</DependentUpon>
    143148    </EmbeddedResource>
    144     <EmbeddedResource Include="ParameterConfigurationListView.resx">
     149    <EmbeddedResource Include="ParameterConfigurationViews\ParameterConfigurationListView.resx">
    145150      <DependentUpon>ParameterConfigurationListView.cs</DependentUpon>
    146151    </EmbeddedResource>
    147     <EmbeddedResource Include="ParameterConfigurationView.resx">
     152    <EmbeddedResource Include="ParameterConfigurationViews\ParameterConfigurationView.resx">
    148153      <DependentUpon>ParameterConfigurationView.cs</DependentUpon>
    149154    </EmbeddedResource>
    150     <EmbeddedResource Include="ValueView.resx">
     155    <EmbeddedResource Include="ValueConfigurationViews\ValueConfigurationView.resx">
     156      <DependentUpon>ValueConfigurationView.cs</DependentUpon>
     157    </EmbeddedResource>
     158    <EmbeddedResource Include="ValueConfigurationViews\ValueView.resx">
    151159      <DependentUpon>ValueView.cs</DependentUpon>
    152160    </EmbeddedResource>
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Analyzers/BestParameterConfigurationAnalyzer.cs

    r4832 r4839  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     1using System.Linq;
     2using HeuristicLab.Common;
     3using HeuristicLab.Core;
     4using HeuristicLab.Data;
    55using HeuristicLab.Operators;
    66using HeuristicLab.Optimization;
     7using HeuristicLab.Parameters;
    78using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    8 using HeuristicLab.Core;
    9 using HeuristicLab.Parameters;
    10 using HeuristicLab.Data;
    11 using HeuristicLab.Common;
    129
    1310namespace HeuristicLab.Problems.MetaOptimization {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Creators/RandomParameterConfigurationCreator.cs

    r4830 r4839  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     1using HeuristicLab.Common;
    52using HeuristicLab.Core;
     3using HeuristicLab.Operators;
     4using HeuristicLab.Optimization;
     5using HeuristicLab.Parameters;
    66using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    7 using HeuristicLab.Operators;
    8 using HeuristicLab.Parameters;
    9 using HeuristicLab.Common;
    10 using HeuristicLab.Optimization;
    117
    128namespace HeuristicLab.Problems.MetaOptimization {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/Crossovers/ParameterConfigurationCrossover.cs

    r4832 r4839  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     1using HeuristicLab.Common;
     2using HeuristicLab.Core;
     3using HeuristicLab.Data;
     4using HeuristicLab.Encodings.IntegerVectorEncoding;
     5using HeuristicLab.Encodings.RealVectorEncoding;
    56using HeuristicLab.Operators;
     7using HeuristicLab.Optimization;
     8using HeuristicLab.Parameters;
    69using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    7 using HeuristicLab.Core;
    8 using HeuristicLab.Parameters;
    9 using HeuristicLab.Encodings.RealVectorEncoding;
    10 using HeuristicLab.Encodings.BinaryVectorEncoding;
    11 using HeuristicLab.Encodings.IntegerVectorEncoding;
    12 using HeuristicLab.Collections;
    13 using HeuristicLab.Data;
    14 using HeuristicLab.Optimization;
    15 using HeuristicLab.Common;
    1610
    1711namespace HeuristicLab.Problems.MetaOptimization.Encodings.Crossovers {
     
    7973      IntegerVector integerChild = HeuristicLab.Encodings.IntegerVectorEncoding.DiscreteCrossover.Apply(
    8074        RandomParameter.ActualValue,
    81         new IntegerVector(new IntArray(new int[] { ((IntValue)parameter1.Value).Value })),
    82         new IntegerVector(new IntArray(new int[] { ((IntValue)parameter2.Value).Value })));
     75        new IntegerVector(new IntArray(new int[] { ((IntValue)parameter1.ActualValueConfiguration).Value })),
     76        new IntegerVector(new IntArray(new int[] { ((IntValue)parameter2.ActualValueConfiguration).Value })));
    8377      return new IntValue(integerChild[0]);
    8478    }
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Encodings/ValueTypeParameterConfiguration.cs

    r4832 r4839  
    1818    }
    1919
    20     public ValueTypeParameterConfiguration(ParameterConfiguration parentConfiguration, string parameterName, IValueParameter valueParameter) : base(parentConfiguration, parameterName, valueParameter) {
     20    public ValueTypeParameterConfiguration(string parameterName, IValueParameter valueParameter) : base(parameterName, valueParameter) {
    2121      this.ranges = new ItemList<IRange<T>>();
    2222      this.ranges.ItemsAdded += new CollectionItemsChangedEventHandler<IndexedItem<IRange<T>>>(ranges_ItemsAdded);
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Evaluators/MetaOptimizationEvaluator.cs

    r4830 r4839  
    11using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    5 using HeuristicLab.Operators;
    6 using HeuristicLab.Data;
    7 using HeuristicLab.Parameters;
    8 using HeuristicLab.Core;
    9 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    10 using HeuristicLab.Optimization;
    112using System.Threading;
    123using HeuristicLab.Common;
     4using HeuristicLab.Core;
     5using HeuristicLab.Data;
     6using HeuristicLab.Operators;
     7using HeuristicLab.Optimization;
     8using HeuristicLab.Parameters;
     9using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    1310
    1411namespace HeuristicLab.Problems.MetaOptimization {
     
    6562      AlgorithmParameter.ActualValue.Prepare();
    6663      //ParameterizeAlgorithm();
    67       ParameterConfigurationParameter.ActualValue.Parameterize(AlgorithmParameter.ActualValue);
     64      //ParameterConfigurationParameter.ActualValue.Parameterize(AlgorithmParameter.ActualValue);
    6865      algorithmStopped = false;
    6966      AlgorithmParameter.ActualValue.Stopped += new EventHandler(ActualValue_Stopped);
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/HeuristicLab.Problems.MetaOptimization-3.3.csproj

    r4832 r4839  
    8888  <ItemGroup>
    8989    <Compile Include="Analyzers\BestParameterConfigurationAnalyzer.cs" />
     90    <Compile Include="Encodings\ValueConfigurations\ValueConfiguration.cs" />
    9091    <Compile Include="Interfaces\IParameterConfigurationCreator.cs" />
    9192    <Compile Include="Creators\RandomParameterConfigurationCreator.cs" />
    9293    <Compile Include="Encodings\Crossovers\ParameterConfigurationCrossover.cs" />
    93     <Compile Include="Encodings\IntValueParameterConfiguration.cs" />
    94     <Compile Include="Encodings\ValueTypeParameterConfiguration.cs">
    95       <SubType>Code</SubType>
    96     </Compile>
    97     <Compile Include="Encodings\RootParameterConfiguration.cs" />
    9894    <Compile Include="Interfaces\IParameterConfigurationOperator.cs" />
    9995    <Compile Include="Interfaces\IRange.cs" />
     
    10197    <Compile Include="Interfaces\IMetaOptimizationEvaluator.cs" />
    10298    <Compile Include="Interfaces\IParameterConfiguration.cs" />
    103     <Compile Include="Encodings\ParameterConfiguration.cs" />
     99    <Compile Include="Encodings\ParameterConfigurations\ParameterConfiguration.cs" />
     100    <Compile Include="Interfaces\IValueConfiguration.cs" />
    104101    <Compile Include="Range.cs" />
    105102    <Compile Include="Properties\AssemblyInfo.cs" />
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IMetaOptimizationEvaluator.cs

    r4516 r4839  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    5 using HeuristicLab.Optimization;
     1using HeuristicLab.Optimization;
    62
    73namespace HeuristicLab.Problems.MetaOptimization {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterConfiguration.cs

    r4832 r4839  
    11using System;
     2using HeuristicLab.Core;
    23using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    5 using HeuristicLab.Core;
    64
    75namespace HeuristicLab.Problems.MetaOptimization {
     
    97    bool OptimizationEnabled { get; set; }
    108    string ParameterName { get; set; }
    11     //IParameter Parameter { get; }
    12     Type ParameterType { get; }
    13     Type ValueType { get; }
    14     IItem Value { get; set; }
    15     IItemList<IParameterConfiguration> ChildParameterConfigurations { get; }
    16 
    17     void Parameterize(IParameterizedItem parameterizedItem);
     9    Type ParameterDataType { get; }
     10    ICheckedItemList<IValueConfiguration> ValueConfigurations { get; }
     11    IValueConfiguration ActualValueConfiguration { get; set; }
     12    Type ValueDataType { get; }
     13    IEnumerable<IItem> ValidValues { get; }
    1814
    1915    event EventHandler OptimizationEnabledChanged;
    20     event EventHandler ValueChanging;
    21     event EventHandler ValueChanged;
    2216  }
    2317}
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterConfigurationCreator.cs

    r4830 r4839  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    5 using HeuristicLab.Optimization;
     1using HeuristicLab.Optimization;
    62
    73namespace HeuristicLab.Problems.MetaOptimization {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IParameterConfigurationOperator.cs

    r4830 r4839  
    1 using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    5 using HeuristicLab.Core;
     1using HeuristicLab.Core;
    62
    73namespace HeuristicLab.Problems.MetaOptimization {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Interfaces/IRange.cs

    r4830 r4839  
    11using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
    52using HeuristicLab.Common;
     3using HeuristicLab.Core;
    64using HeuristicLab.Data;
    7 using HeuristicLab.Core;
    85
    96namespace HeuristicLab.Problems.MetaOptimization {
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/MetaOptimizationProblem.cs

    r4830 r4839  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.Linq;
    25 using System.Drawing;
     24using HeuristicLab.Common;
     25using HeuristicLab.Core;
     26using HeuristicLab.Data;
     27using HeuristicLab.Optimization;
     28using HeuristicLab.Parameters;
    2629using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    27 using HeuristicLab.Core;
    28 using HeuristicLab.Optimization;
    29 using HeuristicLab.Common;
    30 using HeuristicLab.Parameters;
    31 using HeuristicLab.Data;
    3230using HeuristicLab.PluginInfrastructure;
    3331
     
    4947      get { return (ValueParameter<IItemList<ISingleObjectiveProblem>>)Parameters[ProblemsParameterName]; }
    5048    }
    51     public ValueParameter<IParameterConfiguration> AlgorithmParameterConfigurationParameter {
    52       get { return (ValueParameter<IParameterConfiguration>)Parameters[AlgorithmParameterConfigurationParameterName]; }
     49    public ValueParameter<IValueConfiguration> AlgorithmParameterConfigurationParameter {
     50      get { return (ValueParameter<IValueConfiguration>)Parameters[AlgorithmParameterConfigurationParameterName]; }
    5351    }
    5452    //public ValueParameter<IItemList<IParameterConfiguration>> ProblemParametersConfigurationParameter {
     
    6664      set { ProblemsParameter.Value = value; }
    6765    }
    68     public IParameterConfiguration AlgorithmParameterConfiguration {
     66    public IValueConfiguration AlgorithmParameterConfiguration {
    6967      get { return AlgorithmParameterConfigurationParameter.Value; }
    7068      set { AlgorithmParameterConfigurationParameter.Value = value; }
     
    8078      Parameters.Add(new ValueParameter<IAlgorithm>(AlgorithmParameterName, "The algorithm which's parameters should be optimized."));
    8179      Parameters.Add(new ValueParameter<IItemList<IProblem>>(ProblemsParameterName, "The problems that should be evaluated.", new ItemList<IProblem>()));
    82       Parameters.Add(new ValueParameter<IParameterConfiguration>(AlgorithmParameterConfigurationParameterName, "List of algorithm parameters that should be optimized."));
     80      Parameters.Add(new ValueParameter<IValueConfiguration>(AlgorithmParameterConfigurationParameterName, "List of algorithm parameters that should be optimized."));
    8381      //Parameters.Add(new ValueParameter<IItemList<IParameterConfiguration>>(ProblemParametersConfigurationParameterName, "List of problem parameters that should be optimized.", new ItemList<IParameterConfiguration>()));
    8482     
     
    155153      if (Algorithm != null) {
    156154        Algorithm.ProblemChanged += new EventHandler(BaseLevelAlgorithm_ProblemChanged);
    157         AlgorithmParameterConfiguration = ParameterConfiguration.Create(Algorithm);
     155        AlgorithmParameterConfiguration = new ValueConfiguration(Algorithm, Algorithm.GetType());
    158156      }
    159157      BaseLevelAlgorithm_ProblemChanged(sender, e);
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Properties/AssemblyInfo.cs

    r4516 r4839  
    11using System.Reflection;
    2 using System.Runtime.CompilerServices;
    32using System.Runtime.InteropServices;
    43
  • branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization/3.3/Range.cs

    r4830 r4839  
    11using System;
    2 using System.Collections.Generic;
    3 using System.Linq;
    4 using System.Text;
     2using HeuristicLab.Common;
    53using HeuristicLab.Core;
    64using HeuristicLab.Data;
    75using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    8 using HeuristicLab.Common;
    96
    107namespace HeuristicLab.Problems.MetaOptimization {
Note: See TracChangeset for help on using the changeset viewer.