Changeset 9982 for trunk/sources/HeuristicLab.Problems.TestFunctions

Timestamp:

09/17/13 11:47:57 (12 years ago)

Author:

abeham

Message:

#1909:

• Removed project HeuristicLab.Problems.Instances.TestFunctions and integrated it into HeuristicLab.Problems.TestFunctions
• Removed SOTFData from HeuristicLab.Problems.Instances and integrated it into HeuristicLab.Problems.TestFunctions
• Changed SOTFData's Evaluator property to be of type ISingleObjectiveTestFunctionProblemEvaluator
• Removed cast in the problem's load method

Location:

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Files:

• HeuristicLab.Problems.TestFunctions-3.3.csproj (modified) (1 diff)
• Instances (added)
• Instances/SOTFData.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.Instances/3.3/Types/SOTFData.cs) (2 diffs)
• Instances/SOTFDataDescriptor.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/SOTFDataDescriptor.cs) (1 diff)
• Instances/SOTFInstanceProvider.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.TestFunctions/3.3/SOTFInstanceProvider.cs) (1 diff)
• SingleObjectiveTestFunctionProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj ¶

@@ -110 +110 @@
     <Compile Include="Evaluators\RandomEvaluator.cs" />
     <Compile Include="Improvers\SingleObjectiveTestFunctionImprovementOperator.cs" />
+    <Compile Include="Instances\SOTFData.cs" />
+    <Compile Include="Instances\SOTFDataDescriptor.cs" />
+    <Compile Include="Instances\SOTFInstanceProvider.cs" />
     <Compile Include="MoveEvaluators\RandomAdditiveMoveEvaluator.cs" />
     <Compile Include="PathRelinkers\SingleObjectiveTestFunctionPathRelinker.cs" />

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Instances/SOTFData.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Core;
 
-namespace HeuristicLab.Problems.Instances {
+namespace HeuristicLab.Problems.TestFunctions {
   /// <summary>
   /// Describes instances of Single Objective Test Functions (SOTF).
@@ -40 +39 @@
     /// The operator used for evaluations
     /// </summary>
-    public IOperator Evaluator { get; set; }
+    public ISingleObjectiveTestFunctionProblemEvaluator Evaluator { get; set; }
   }
 }

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Instances/SOTFDataDescriptor.cs ¶

@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Problems.TestFunctions;
+using HeuristicLab.Problems.Instances;
 
-namespace HeuristicLab.Problems.Instances.TestFunctions {
+namespace HeuristicLab.Problems.TestFunctions {
   internal class SOTFDataDescriptor : IDataDescriptor {
     public string Name { get { return Evaluator.FunctionName + " Function"; } }

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Instances/SOTFInstanceProvider.cs ¶

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Problems.TestFunctions;
+using HeuristicLab.Problems.Instances;
 
-namespace HeuristicLab.Problems.Instances.TestFunctions {
+namespace HeuristicLab.Problems.TestFunctions {
   public class SOTFInstanceProvider : ProblemInstanceProvider<SOTFData> {
     public override string Name {

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs ¶

@@ -410 +410 @@
       Name = data.Name;
       Description = data.Description;
-      Evaluator = (ISingleObjectiveTestFunctionProblemEvaluator)data.Evaluator;
+      Evaluator = data.Evaluator;
     }
   }