- Timestamp:
- 07/03/12 16:46:35 (12 years ago)
- Location:
- branches/GP-MoveOperators
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/GP-MoveOperators
- Property svn:mergeinfo changed
/trunk/sources merged: 8084,8088-8090,8092-8100,8102-8113,8115,8117-8132,8134-8146,8148-8156,8158-8160,8163-8170,8173-8176,8178-8190,8192-8205
- Property svn:mergeinfo changed
-
branches/GP-MoveOperators/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs
r8085 r8206 59 59 get { return (ValueParameter<BoolValue>)Parameters["SetSeedRandomly"]; } 60 60 } 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"]; } 72 72 } 73 73 private ValueParameter<IntValue> MaximumIterationsParameter { -
branches/GP-MoveOperators/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingImprovementOperator.cs
r8085 r8206 67 67 get { return (ILookupParameter<IRandom>)Parameters["Random"]; } 68 68 } 69 p rivateConstrainedValueParameter<IMoveGenerator> MoveGeneratorParameter {70 get { return ( ConstrainedValueParameter<IMoveGenerator>)Parameters["MoveGenerator"]; }71 } 72 p rivateConstrainedValueParameter<IMoveMaker> MoveMakerParameter {73 get { return ( ConstrainedValueParameter<IMoveMaker>)Parameters["MoveMaker"]; }74 } 75 p rivateConstrainedValueParameter<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"]; } 77 77 } 78 78 private IValueLookupParameter<IntValue> InnerIterationsParameter { … … 88 88 get { return (ValueParameter<DoubleValue>)Parameters["EndTemperature"]; } 89 89 } 90 p rivateConstrainedValueParameter<IDiscreteDoubleValueModifier> AnnealingOperatorParameter {91 get { return ( ConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["AnnealingOperator"]; }90 public IConstrainedValueParameter<IDiscreteDoubleValueModifier> AnnealingOperatorParameter { 91 get { return (IConstrainedValueParameter<IDiscreteDoubleValueModifier>)Parameters["AnnealingOperator"]; } 92 92 } 93 93 public ScopeTreeLookupParameter<DoubleValue> QualityParameter { … … 115 115 get { return MoveMakerParameter.Value; } 116 116 set { MoveMakerParameter.Value = value; } 117 } 118 public IDiscreteDoubleValueModifier AnnealingOperator { 119 get { return AnnealingOperatorParameter.Value; } 120 set { AnnealingOperatorParameter.Value = value; } 117 121 } 118 122 public ISingleObjectiveMoveEvaluator MoveEvaluator { … … 279 283 foreach (IScopeTreeLookupParameter param in clone.Parameters.OfType<IScopeTreeLookupParameter>()) 280 284 param.Depth = 0; 281 Analyzer.Operators.Add(clone, clone.EnabledByDefault);285 Analyzer.Operators.Add(clone, false); 282 286 } 283 287 } 284 288 } 285 Analyzer.Operators.Add(qualityAnalyzer, qualityAnalyzer.EnabledByDefault);289 Analyzer.Operators.Add(qualityAnalyzer, false); 286 290 } 287 291
Note: See TracChangeset
for help on using the changeset viewer.