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.SimulatedAnnealing/3.3/SimulatedAnnealing.cs

    r8085 r8206  
    5959      get { return (ValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; }
    6060    }
    61     public ConstrainedValueParameter<IMultiMoveGenerator> MoveGeneratorParameter {
    62       get { return (ConstrainedValueParameter<IMultiMoveGenerator>)Parameters["MoveGenerator"]; }
    63     }
    64     public ConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
    65       get { return (ConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
    66     }
    67     public ConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
    68       get { return (ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
    69     }
    70     public ConstrainedValueParameter<IDiscreteDoubleValueModifier> AnnealingOperatorParameter {
    71       get { return (ConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["AnnealingOperator"]; }
     61    public IConstrainedValueParameter<IMultiMoveGenerator> MoveGeneratorParameter {
     62      get { return (IConstrainedValueParameter<IMultiMoveGenerator>)Parameters["MoveGenerator"]; }
     63    }
     64    public IConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
     65      get { return (IConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
     66    }
     67    public IConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
     68      get { return (IConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
     69    }
     70    public IConstrainedValueParameter<IDiscreteDoubleValueModifier> AnnealingOperatorParameter {
     71      get { return (IConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["AnnealingOperator"]; }
    7272    }
    7373    private ValueParameter<IntValue> MaximumIterationsParameter {
  • branches/GP-MoveOperators/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.cs

    r8085 r8206  
    6767      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
    6868    }
    69     private ConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
    70       get { return (ConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
    71     }
    72     private ConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
    73       get { return (ConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
    74     }
    75     private ConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
    76       get { return (ConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
     69    public IConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {
     70      get { return (IConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }
     71    }
     72    public IConstrainedValueParameter<IMoveMaker> MoveMakerParameter {
     73      get { return (IConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }
     74    }
     75    public IConstrainedValueParameter<ISingleObjectiveMoveEvaluator> MoveEvaluatorParameter {
     76      get { return (IConstrainedValueParameter<ISingleObjectiveMoveEvaluator>)Parameters["MoveEvaluator"]; }
    7777    }
    7878    private IValueLookupParameter<IntValue> InnerIterationsParameter {
     
    8888      get { return (ValueParameter<DoubleValue>)Parameters["EndTemperature"]; }
    8989    }
    90     private ConstrainedValueParameter<IDiscreteDoubleValueModifier> AnnealingOperatorParameter {
    91       get { return (ConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["AnnealingOperator"]; }
     90    public IConstrainedValueParameter<IDiscreteDoubleValueModifier> AnnealingOperatorParameter {
     91      get { return (IConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["AnnealingOperator"]; }
    9292    }
    9393    public ScopeTreeLookupParameter<DoubleValue> QualityParameter {
     
    115115      get { return MoveMakerParameter.Value; }
    116116      set { MoveMakerParameter.Value = value; }
     117    }
     118    public IDiscreteDoubleValueModifier AnnealingOperator {
     119      get { return AnnealingOperatorParameter.Value; }
     120      set { AnnealingOperatorParameter.Value = value; }
    117121    }
    118122    public ISingleObjectiveMoveEvaluator MoveEvaluator {
     
    279283            foreach (IScopeTreeLookupParameter param in clone.Parameters.OfType<IScopeTreeLookupParameter>())
    280284              param.Depth = 0;
    281             Analyzer.Operators.Add(clone, clone.EnabledByDefault);
     285            Analyzer.Operators.Add(clone, false);
    282286          }
    283287        }
    284288      }
    285       Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);
     289      Analyzer.Operators.Add(qualityAnalyzer, false);
    286290    }
    287291
Note: See TracChangeset for help on using the changeset viewer.