Changeset 3665 for trunk/sources/HeuristicLab.Problems.TestFunctions/3.3
- Timestamp:
- 05/06/10 05:02:15 (14 years ago)
- Location:
- trunk/sources/HeuristicLab.Problems.TestFunctions/3.3
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs
r3520 r3665 84 84 } 85 85 86 public virtual double Evaluate2D(double x, double y) { 87 return EvaluateFunction(new RealVector(new double[] { x, y })); 88 } 89 86 90 /// <summary> 87 91 /// Evaluates the test function for a specific <paramref name="point"/>. -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Interfaces/ISingleObjectiveTestFunctionProblemEvaluator.cs
r3376 r3665 38 38 39 39 ILookupParameter<RealVector> PointParameter { get; } 40 41 double Evaluate2D(double x, double y); 40 42 } 41 43 } -
trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionSolution.cs
r3661 r3665 60 60 set { 61 61 if (bestRealVector != value) { 62 if (bestRealVector != null) Deregister RealVectorEvents();62 if (bestRealVector != null) DeregisterBestRealVectorEvents(); 63 63 bestRealVector = value; 64 if (bestRealVector != null) Register RealVectorEvents();65 On RealVectorChanged();64 if (bestRealVector != null) RegisterBestRealVectorEvents(); 65 OnBestRealVectorChanged(); 66 66 } 67 67 } … … 106 106 } 107 107 } 108 }109 110 private Image fitnessLandscape;111 public Image FitnessLandscape {112 get { return fitnessLandscape; }113 set { fitnessLandscape = value; }114 108 } 115 109 … … 128 122 private void Initialize() { 129 123 if (bestKnownRealVector != null) RegisterBestKnownRealVectorEvents(); 130 if (bestRealVector != null) Register RealVectorEvents();124 if (bestRealVector != null) RegisterBestRealVectorEvents(); 131 125 if (bestQuality != null) RegisterQualityEvents(); 132 126 if (population != null) RegisterPopulationEvents(); … … 141 135 clone.population = (ItemArray<RealVector>)cloner.Clone(population); 142 136 clone.evaluator = (ISingleObjectiveTestFunctionProblemEvaluator)cloner.Clone(evaluator); 143 clone.fitnessLandscape = null;144 137 clone.Initialize(); 145 138 return clone; … … 154 147 } 155 148 156 public event EventHandler RealVectorChanged;157 private void On RealVectorChanged() {158 var changed = RealVectorChanged;149 public event EventHandler BestRealVectorChanged; 150 private void OnBestRealVectorChanged() { 151 var changed = BestRealVectorChanged; 159 152 if (changed != null) 160 153 changed(this, EventArgs.Empty); … … 190 183 BestKnownRealVector.Reset -= new EventHandler(BestKnownRealVector_Reset); 191 184 } 192 private void Register RealVectorEvents() {193 BestRealVector.ItemChanged += new EventHandler<EventArgs<int>>( RealVector_ItemChanged);194 BestRealVector.Reset += new EventHandler( RealVector_Reset);195 } 196 private void Deregister RealVectorEvents() {197 BestRealVector.ItemChanged -= new EventHandler<EventArgs<int>>( RealVector_ItemChanged);198 BestRealVector.Reset -= new EventHandler( RealVector_Reset);185 private void RegisterBestRealVectorEvents() { 186 BestRealVector.ItemChanged += new EventHandler<EventArgs<int>>(BestRealVector_ItemChanged); 187 BestRealVector.Reset += new EventHandler(BestRealVector_Reset); 188 } 189 private void DeregisterBestRealVectorEvents() { 190 BestRealVector.ItemChanged -= new EventHandler<EventArgs<int>>(BestRealVector_ItemChanged); 191 BestRealVector.Reset -= new EventHandler(BestRealVector_Reset); 199 192 } 200 193 private void RegisterQualityEvents() { … … 221 214 OnBestKnownRealVectorChanged(); 222 215 } 223 private void RealVector_ItemChanged(object sender, EventArgs<int> e) {224 On RealVectorChanged();225 } 226 private void RealVector_Reset(object sender, EventArgs e) {227 On RealVectorChanged();216 private void BestRealVector_ItemChanged(object sender, EventArgs<int> e) { 217 OnBestRealVectorChanged(); 218 } 219 private void BestRealVector_Reset(object sender, EventArgs e) { 220 OnBestRealVectorChanged(); 228 221 } 229 222 private void Quality_ValueChanged(object sender, EventArgs e) {
Note: See TracChangeset
for help on using the changeset viewer.