Context Navigation

HeuristicLab.Optimization

Timestamp:

12/18/19 16:11:21 (5 years ago)

Author:

mkommend

Message:

#2521: Refactored single-objective problems to use EvaluationResult instead of double as return type from Evaluate.

Location:

Files:

r17357	r17382
26	26	[StorableType("406EB24F-A59C-440C-8B83-49FC05F48855")]
27	27	public interface IEvaluationResult : IItem {
	28
	29	//TODO: make methods generic for get/set additional data
28	30	void SetAdditionalData(string identifier, object o);
29	31	object GetAdditionalData(string identifier);

-                      r17363
+                      r17382
     where TEncodedSolution : class, IEncodedSolution {
+    double Evaluate(TEncodedSolution solution, IRandom random);
+    double Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
+    ISingleObjectiveEvaluationResult Evaluate(TEncodedSolution solution, IRandom random);
+    ISingleObjectiveEvaluationResult Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
     void Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random);
     void Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random, CancellationToken cancellationToken);

r17363	r17382
33	33	IEvaluationResult EvaluationResult { get; }
34	34
	35
	36	//TODO: make methods generic for get/set additional data
35	37	void SetAdditionalData(string identifier, object o);
36	38	object GetAdditionalData(string identifier);

r17366	r17382
113	113	}
114	114
115		public ~~double~~ Evaluate(TEncodedSolution solution, IRandom random) {
	115	public ISingleObjectiveEvaluationResult Evaluate(TEncodedSolution solution, IRandom random) {
116	116	return Evaluate(solution, random, CancellationToken.None);
117	117	}
118		public abstract ~~double~~ Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
	118	public abstract ISingleObjectiveEvaluationResult Evaluate(TEncodedSolution solution, IRandom random, CancellationToken cancellationToken);
119	119
120	120	public void Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random) {
…	…
122	122	}
123	123	public virtual void Evaluate(ISingleObjectiveSolutionContext<TEncodedSolution> solutionContext, IRandom random, CancellationToken cancellationToken) {
124		~~double quality~~ = Evaluate(solutionContext.EncodedSolution, random, cancellationToken);
125		solutionContext.EvaluationResult = ~~new SingleObjectiveEvaluationResult(quality)~~;
	124	var evaluationResult = Evaluate(solutionContext.EncodedSolution, random, cancellationToken);
	125	solutionContext.EvaluationResult = evaluationResult;
126	126	}
127	127
…	…
139	139	return GetNeighbors(solutionContext.EncodedSolution, random).Select(n => new SingleObjectiveSolutionContext<TEncodedSolution>(n));
140	140	}
141
142
143	141
144	142	public static bool IsBetter(bool maximization, double quality, double bestQuality) {

Note: See TracChangeset for help on using the changeset viewer.