Changeset 9927 for branches/TestFunctionInstances/HeuristicLab.Problems.Instances.TestFunctions

Timestamp:

09/03/13 09:19:02 (11 years ago)

Author:

abeham

Message:

#1909:

• Removed naming heuristic and added a property to the evaluator instead

Location:

branches/TestFunctionInstances/HeuristicLab.Problems.Instances.TestFunctions/3.3

Files:

• . (modified) (1 prop)
• Properties (modified) (1 prop)
• SOTFDataDescriptor.cs (modified) (2 diffs)

branches/TestFunctionInstances/HeuristicLab.Problems.Instances.TestFunctions/3.3

@@ -9 +9 @@
 GeneratedArtifacts
 _Pvt_Extensions
+Plugin.cs

@@ -9 +9 @@
 GeneratedArtifacts
 _Pvt_Extensions
+Plugin.cs

branches/TestFunctionInstances/HeuristicLab.Problems.Instances.TestFunctions/3.3/SOTFDataDescriptor.cs

@@ -24 +24 @@
 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 {
@@ -34 +34 @@
     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));
     }
   }

@@ -9 +9 @@
 GeneratedArtifacts
 _Pvt_Extensions
+Plugin.cs