Free cookie consent management tool by TermsFeed Policy Generator

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

#1215 worked on MetaOptimization

  • split configurations into ValueConfigurations and ParameterConfigurations
Location:
branches/HeuristicLab.MetaOptimization
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.MetaOptimization

    • Property svn:ignore
      •  

        old new  
        11HeuristicLab.MetaOptimization.suo
         2HeuristicLab.MetaOptimization.Test
  • 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);
Note: See TracChangeset for help on using the changeset viewer.