Changeset 5872 for trunk/sources
- Timestamp:
- 03/29/11 17:07:04 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/QAP/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs merged eligible /branches/CloningRefactoring/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs 4656-4721 /branches/DataAnalysis Refactoring/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs 5471-5808 /branches/DataAnalysis/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs 4458-4459,4462,4464 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs 5060 /branches/NET40/sources/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs 5138-5162 /branches/ParallelEngine/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs 5175-5192 /branches/SuccessProgressAnalysis/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs 5370-5682 /branches/VNS/HeuristicLab.Optimization/3.3/SingleObjectiveHeuristicOptimizationProblem.cs 5594-5752
r5809 r5872 41 41 : base() { 42 42 Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized.", new BoolValue())); 43 Parameters.Add(new ValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue()));43 Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue())); 44 44 } 45 45 … … 47 47 : base(evaluator, solutionCreator) { 48 48 Parameters.Add(new ValueParameter<BoolValue>(MaximizationParameterName, "Set to false if the problem should be minimized.", new BoolValue())); 49 Parameters.Add(new ValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue()));49 Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.", new DoubleValue())); 50 50 } 51 51 52 [StorableHook(HookType.AfterDeserialization)] 53 protected virtual void AfterDeserialization() { 54 // BackwardsCompatibility3.3 55 #region Backwards compatible code (remove with 3.4) 56 if (BestKnownQualityParameter is ValueParameter<DoubleValue>) { 57 Parameters.Remove(BestKnownQualityParameterName); 58 Parameters.Add(new OptionalValueParameter<DoubleValue>(BestKnownQualityParameterName, "The quality of the best known solution of this problem.")); 59 } 60 #endregion 61 } 52 62 public ValueParameter<BoolValue> MaximizationParameter { 53 63 get { return (ValueParameter<BoolValue>)Parameters[MaximizationParameterName]; } … … 61 71 } 62 72 63 public ValueParameter<DoubleValue> BestKnownQualityParameter {64 get { return ( ValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }73 public IValueParameter<DoubleValue> BestKnownQualityParameter { 74 get { return (IValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; } 65 75 } 66 76 IParameter ISingleObjectiveHeuristicOptimizationProblem.BestKnownQualityParameter { -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.