Context Navigation

-                      r9878
+                      r9927
 namespace HeuristicLab.Problems.Instances.TestFunctions {
   internal class SOTFDataDescriptor : IDataDescriptor {
     public string Name { get; internal set; }
+    public string Name { get { return Evaluator.FunctionName + " Function"; } }
     public string Description {
 …
     public SOTFDataDescriptor(ISingleObjectiveTestFunctionProblemEvaluator evaluator) {
       Evaluator = evaluator;
-      string name = evaluator.Name;
-      int idx = name.LastIndexOf("Evaluator");
-      if (idx < 0) idx = name.LastIndexOf("Function");
-      Name = idx < 0
-        ? name
-        : string.Format("{0} Function", name.Substring(0, idx));
+    }
+  }

branches/TestFunctionInstances/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs

r9456	r9927
35	35	[StorableClass]
36	36	public class AckleyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	37	public override string FunctionName { get { return "Ackley"; } }
37	38	/// <summary>
38	39	/// Returns false as the Ackley function is a minimization problem.

r9456	r9927
35	35	[StorableClass]
36	36	public class BealeEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	37	public override string FunctionName { get { return "Beale"; } }
37	38	/// <summary>
38	39	/// Returns false as the Beale function is a minimization problem.

r9456	r9927
34	34	[StorableClass]
35	35	public class BoothEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	36	public override string FunctionName { get { return "Booth"; } }
36	37	/// <summary>
37	38	/// Returns false as the Booth function is a minimization problem.

r9456	r9927
36	36	[StorableClass]
37	37	public class GriewankEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	38	public override string FunctionName { get { return "Griewank"; } }
38	39	/// <summary>
39	40	/// Returns false as the Griewank function is a minimization problem.

r9456	r9927
34	34	[StorableClass]
35	35	public class LevyEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	36	public override string FunctionName { get { return "Levy"; } }
36	37	/// <summary>
37	38	/// Returns false as the Levy function is a minimization problem.

r9456	r9927
34	34	[StorableClass]
35	35	public class MatyasEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	36	public override string FunctionName { get { return "Matyas"; } }
36	37	/// <summary>
37	38	/// Returns false as the Matyas function is a minimization problem.

r9456	r9927
35	35	[StorableClass]
36	36	public class MultinormalEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	37	public override string FunctionName { get { return "Multinormal"; } }
37	38
38	39	private ItemList<RealVector> centers {

r9456	r9927
35	35	[StorableClass]
36	36	public class RandomEvaluator : SingleObjectiveTestFunctionProblemEvaluator, IStochasticOperator {
	37	public override string FunctionName { get { return "Random"; } }
37	38	/// <summary>
38	39	/// It does not really matter.

r9456	r9927
36	36	[StorableClass]
37	37	public class RastriginEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	38	public override string FunctionName { get { return "Rastrigin"; } }
38	39	/// <summary>
39	40	/// Returns false as the Rastrigin function is a minimization problem.

r9456	r9927
38	38	[StorableClass]
39	39	public class RosenbrockEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	40	public override string FunctionName { get { return "Rosenbrock"; } }
40	41	/// <summary>
41	42	/// Returns false as the Rosenbrock function is a minimization problem.

r9456	r9927
34	34	[StorableClass]
35	35	public class SchwefelEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	36	public override string FunctionName { get { return "Schwefel"; } }
36	37	/// <summary>
37	38	/// Returns false as the Schwefel (sine root) function is a minimization problem.

-                      r9456
+                      r9927
   [StorableClass]
   public abstract class SingleObjectiveTestFunctionProblemEvaluator : SingleSuccessorOperator, ISingleObjectiveTestFunctionProblemEvaluator {
+    /// <summary>
+    /// The name of the function
+    /// </summary>
+    public abstract string FunctionName { get; }
     /// <summary>
     /// These operators should not change their name through the GUI

r9456	r9927
36	36	[StorableClass]
37	37	public class SphereEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	38	public override string FunctionName { get { return "Sphere"; } }
38	39	/// <summary>
39	40	/// Returns false as the Sphere function is a minimization problem.

r9456	r9927
33	33	[StorableClass]
34	34	public class SumSquaresEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	35	public override string FunctionName { get { return "SumSquares"; } }
35	36	/// <summary>
36	37	/// Returns false as the Sum Squares function is a minimization problem.

r9456	r9927
33	33	[StorableClass]
34	34	public class ZakharovEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
	35	public override string FunctionName { get { return "Zakharov"; } }
35	36	/// <summary>
36	37	/// Returns false as the Zakharov function is a minimization problem.

r9456	r9927
35	35	int MinimumProblemSize { get; }
36	36	int MaximumProblemSize { get; }
	37	string FunctionName { get; }
37	38
38	39	ILookupParameter<RealVector> PointParameter { get; }

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