Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/03/12 16:46:35 (12 years ago)
Author:
gkronber
Message:

#1847: merged r8084:8205 from trunk into GP move operators branch

Location:
branches/GP-MoveOperators
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/GP-MoveOperators

  • branches/GP-MoveOperators/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.cs

    r8085 r8206  
    5858      get { return (ValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
    5959    }
    60     public ConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
    61       get { return (ConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
    62     }
    63     public ConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
    64       get { return (ConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
    65     }
    66     public ConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
    67       get { return (ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
     60    public IConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
     61      get { return (IConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
     62    }
     63    public IConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
     64      get { return (IConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
     65    }
     66    public IConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
     67      get { return (IConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
    6868    }
    6969    private ValueParameter<IntValue> MaximumIterationsParameter {
  • branches/GP-MoveOperators/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.cs

    r8085 r8206  
    6464
    6565    #region Parameter Properties
    66     public ConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
    67       get { return (ConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
    68     }
    69     public ConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
    70       get { return (ConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
    71     }
    72     public ConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
    73       get { return (ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
     66    public IConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
     67      get { return (IConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
     68    }
     69    public IConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
     70      get { return (IConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
     71    }
     72    public IConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
     73      get { return (IConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
    7474    }
    7575    public IValueLookupParameter<IntValue> SampleSizeParameter {
     
    255255            foreach (IScopeTreeLookupParameter param in clone.Parameters.OfType<IScopeTreeLookupParameter>())
    256256              param.Depth = 0;
    257             Analyzer.Operators.Add(clone, clone.EnabledByDefault);
     257            Analyzer.Operators.Add(clone, false);
    258258          }
    259259        }
    260260      }
    261       Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
     261      Analyzer.Operators.Add(qualityAnalyzer, false);
    262262    }
    263263
Note: See TracChangeset for help on using the changeset viewer.