Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/06/10 00:47:32 (15 years ago)
Author:
swagner
Message:

Worked on refactoring of algorithm analysis and tracing (#999)

  • removed SubScopesSubScopesLookupParameter
  • adapted SubScopesLookupParameter and renamed it into ScopeTreeLookupParameter
Location:
trunk/sources/HeuristicLab.Analysis/3.3
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Analysis/3.3/BestAverageWorstQualityCalculator.cs

    r3376 r3659  
    5353      : base() {
    5454      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the current problem is a maximization problem, otherwise false."));
    55       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The value contained in each sub-scope which represents the solution quality."));
     55      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value contained in each sub-scope which represents the solution quality."));
    5656      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestQuality", "The quality value of the best solution."));
    5757      Parameters.Add(new ValueLookupParameter<DoubleValue>("AverageQuality", "The average quality of all solutions."));
  • trunk/sources/HeuristicLab.Analysis/3.3/BestQualityMemorizer.cs

    r3376 r3659  
    4747      : base() {
    4848      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the current problem is a maximization problem, otherwise false."));
    49       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The value contained in each sub-scope which represents the solution quality."));
     49      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value contained in each sub-scope which represents the solution quality."));
    5050      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestQuality", "The quality value of the best solution."));
    5151    }
  • trunk/sources/HeuristicLab.Analysis/3.3/MinAverageMaxValueCalculator.cs

    r3623 r3659  
    4949    public MinAverageMaxValueCalculator()
    5050      : base() {
    51       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Value", "The value contained in each sub-scope for which the minimum, average and maximum should be calculated."));
     51      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Value", "The value contained in each sub-scope for which the minimum, average and maximum should be calculated."));
    5252      Parameters.Add(new ValueLookupParameter<DoubleValue>("MinValue", "The minimum of the value."));
    5353      Parameters.Add(new ValueLookupParameter<DoubleValue>("AverageValue", "The average of the value."));
  • trunk/sources/HeuristicLab.Analysis/3.3/PopulationBestAverageWorstQualityAnalyzer.cs

    r3658 r3659  
    3939      get { return (ValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
    4040    }
    41     public SubScopesLookupParameter<DoubleValue> QualityParameter {
    42       get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
     41    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
     42      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
    4343    }
    4444    public ValueLookupParameter<DoubleValue> BestKnownQualityParameter {
     
    8181      #region Create parameters
    8282      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
    83       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
     83      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
    8484      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestKnownQuality", "The best known quality value found so far."));
    8585      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestQuality", "The best quality value found in the current run."));
  • trunk/sources/HeuristicLab.Analysis/3.3/PopulationMinAverageMaxValueAnalyzer.cs

    r3658 r3659  
    3636  public sealed class PopulationMinAverageMaxValueAnalyzer : AlgorithmOperator, IAnalyzer {
    3737    #region Parameter properties
    38     public SubScopesLookupParameter<DoubleValue> ValueParameter {
    39       get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Value"]; }
     38    public ScopeTreeLookupParameter<DoubleValue> ValueParameter {
     39      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Value"]; }
    4040    }
    4141    public ValueLookupParameter<DoubleValue> MinValueParameter {
     
    6565    private void Initialize() {
    6666      #region Create parameters
    67       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Value", "The value contained in each solution which should be analyzed."));
     67      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Value", "The value contained in each solution which should be analyzed."));
    6868      Parameters.Add(new ValueLookupParameter<DoubleValue>("MinValue", "The minimum of the value."));
    6969      Parameters.Add(new ValueLookupParameter<DoubleValue>("AverageValue", "The average of the value."));
  • trunk/sources/HeuristicLab.Analysis/3.3/PopulationQualityAnalyzer.cs

    r3658 r3659  
    3939      get { return (ValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
    4040    }
    41     public SubScopesLookupParameter<DoubleValue> QualityParameter {
    42       get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Quality"]; }
     41    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
     42      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
    4343    }
    4444    public ValueLookupParameter<DoubleValue> BestKnownQualityParameter {
     
    7272      #region Create parameters
    7373      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
    74       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
     74      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
    7575      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestKnownQuality", "The best known quality value found so far."));
    7676      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestQuality", "The best quality value found in the current run."));
     
    9696      bestQualityMemorizer2.QualityParameter.ActualName = "Quality";
    9797
    98       dataTableValuesCollector.CollectedValues.Add(new SubScopesLookupParameter<DoubleValue>("Quality", null, "Quality"));
     98      dataTableValuesCollector.CollectedValues.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", null, "Quality"));
    9999      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality"));
    100100      dataTableValuesCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Known Quality", null, "BestKnownQuality"));
     
    106106      qualityDifferenceCalculator.SecondQualityParameter.ActualName = "BestQuality";
    107107
    108       resultsCollector.CollectedValues.Add(new SubScopesLookupParameter<DoubleValue>("Quality", null, "Quality"));
     108      resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", null, "Quality"));
    109109      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality"));
    110110      resultsCollector.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Known Quality", null, "BestKnownQuality"));
  • trunk/sources/HeuristicLab.Analysis/3.3/PopulationValueAnalyzer.cs

    r3658 r3659  
    3636  public sealed class PopulationValueAnalyzer : AlgorithmOperator, IAnalyzer {
    3737    #region Parameter properties
    38     public SubScopesLookupParameter<DoubleValue> ValueParameter {
    39       get { return (SubScopesLookupParameter<DoubleValue>)Parameters["Value"]; }
     38    public ScopeTreeLookupParameter<DoubleValue> ValueParameter {
     39      get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Value"]; }
    4040    }
    4141    public ValueLookupParameter<DataTable> ValuesParameter {
     
    5656    private void Initialize() {
    5757      #region Create parameters
    58       Parameters.Add(new SubScopesLookupParameter<DoubleValue>("Value", "The value contained in each solution which should be analyzed."));
     58      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Value", "The value contained in each solution which should be analyzed."));
    5959      Parameters.Add(new ValueLookupParameter<DataTable>("Values", "The data table to store the values."));
    6060      Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The results collection where the analysis values should be stored."));
     
    6565      ResultsCollector resultsCollector = new ResultsCollector();
    6666
    67       dataTableValuesCollector.CollectedValues.Add(new SubScopesLookupParameter<DoubleValue>("Value", null, "Value"));
     67      dataTableValuesCollector.CollectedValues.Add(new ScopeTreeLookupParameter<DoubleValue>("Value", null, "Value"));
    6868      dataTableValuesCollector.DataTableParameter.ActualName = "Values";
    6969
    70       resultsCollector.CollectedValues.Add(new SubScopesLookupParameter<DoubleValue>("Value", null, "Value"));
     70      resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<DoubleValue>("Value", null, "Value"));
    7171      resultsCollector.CollectedValues.Add(new LookupParameter<DataTable>("Values"));
    7272      resultsCollector.ResultsParameter.ActualName = "Results";
Note: See TracChangeset for help on using the changeset viewer.