Free cookie consent management tool by TermsFeed Policy Generator

Changeset 8332 for branches


Ignore:
Timestamp:
07/26/12 11:26:24 (12 years ago)
Author:
jkarder
Message:

#1331:

  • adjusted parameter types
  • changed access levels
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

    r8319 r8332  
    5858      get { return (IValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
    5959    }
    60     public ConstrainedValueParameter<ICrossover> CrossoverParameter {
    61       get { return (ConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
     60    public IConstrainedValueParameter<ICrossover> CrossoverParameter {
     61      get { return (IConstrainedValueParameter<ICrossover>)Parameters["Crossover"]; }
    6262    }
    6363    public IValueParameter<BoolValue> ExecutePathRelinkingParameter {
    6464      get { return (IValueLookupParameter<BoolValue>)Parameters["ExecutePathRelinking"]; }
    6565    }
    66     public ConstrainedValueParameter<IImprovementOperator> ImproverParameter {
    67       get { return (ConstrainedValueParameter<IImprovementOperator>)Parameters["Improver"]; }
     66    public IConstrainedValueParameter<IImprovementOperator> ImproverParameter {
     67      get { return (IConstrainedValueParameter<IImprovementOperator>)Parameters["Improver"]; }
    6868    }
    6969    public IValueParameter<IntValue> MaximumIterationsParameter {
     
    7373      get { return (IValueParameter<IntValue>)Parameters["NumberOfHighQualitySolutions"]; }
    7474    }
    75     public ConstrainedValueParameter<IPathRelinker> PathRelinkerParameter {
    76       get { return (ConstrainedValueParameter<IPathRelinker>)Parameters["PathRelinker"]; }
     75    public IConstrainedValueParameter<IPathRelinker> PathRelinkerParameter {
     76      get { return (IConstrainedValueParameter<IPathRelinker>)Parameters["PathRelinker"]; }
    7777    }
    7878    public IValueParameter<IntValue> PopulationSizeParameter {
     
    8888      get { return (IValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
    8989    }
    90     public ConstrainedValueParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter {
    91       get { return (ConstrainedValueParameter<ISolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; }
     90    public IConstrainedValueParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter {
     91      get { return (IConstrainedValueParameter<ISolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; }
    9292    }
    9393    #endregion
    9494
    9595    #region Properties
    96     private MultiAnalyzer Analyzer {
     96    public MultiAnalyzer Analyzer {
    9797      get { return AnalyzerParameter.Value; }
    9898      set { AnalyzerParameter.Value = value; }
    9999    }
    100     private ICrossover Crossover {
     100    public ICrossover Crossover {
    101101      get { return CrossoverParameter.Value; }
    102102      set { CrossoverParameter.Value = value; }
    103103    }
    104     private BoolValue ExecutePathRelinking {
     104    public BoolValue ExecutePathRelinking {
    105105      get { return ExecutePathRelinkingParameter.Value; }
    106106      set { ExecutePathRelinkingParameter.Value = value; }
    107107    }
    108     private IImprovementOperator Improver {
     108    public IImprovementOperator Improver {
    109109      get { return ImproverParameter.Value; }
    110110      set { ImproverParameter.Value = value; }
    111111    }
    112     private IntValue MaximumIterations {
     112    public IntValue MaximumIterations {
    113113      get { return MaximumIterationsParameter.Value; }
    114114      set { MaximumIterationsParameter.Value = value; }
    115115    }
    116     private IntValue NumberOfHighQualitySolutions {
     116    public IntValue NumberOfHighQualitySolutions {
    117117      get { return NumberOfHighQualitySolutionsParameter.Value; }
    118118      set { NumberOfHighQualitySolutionsParameter.Value = value; }
    119119    }
    120     private IPathRelinker PathRelinker {
     120    public IPathRelinker PathRelinker {
    121121      get { return PathRelinkerParameter.Value; }
    122122      set { PathRelinkerParameter.Value = value; }
    123123    }
    124     private IntValue PopulationSize {
     124    public IntValue PopulationSize {
    125125      get { return PopulationSizeParameter.Value; }
    126126      set { PopulationSizeParameter.Value = value; }
    127127    }
    128     private IntValue ReferenceSetSize {
     128    public IntValue ReferenceSetSize {
    129129      get { return ReferenceSetSizeParameter.Value; }
    130130      set { ReferenceSetSizeParameter.Value = value; }
    131131    }
    132     private IntValue Seed {
     132    public IntValue Seed {
    133133      get { return SeedParameter.Value; }
    134134      set { SeedParameter.Value = value; }
    135135    }
    136     private BoolValue SetSeedRandomly {
     136    public BoolValue SetSeedRandomly {
    137137      get { return SetSeedRandomlyParameter.Value; }
    138138      set { SetSeedRandomlyParameter.Value = value; }
    139139    }
    140     private ISolutionSimilarityCalculator SimilarityCalculator {
     140    public ISolutionSimilarityCalculator SimilarityCalculator {
    141141      get { return SimilarityCalculatorParameter.Value; }
    142142      set { SimilarityCalculatorParameter.Value = value; }
Note: See TracChangeset for help on using the changeset viewer.