Changeset 9982

Timestamp:

09/17/13 11:47:57 (11 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

Files:

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

trunk/sources/HeuristicLab 3.3.sln

@@ -132 +132 @@
     {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
     {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5} = {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5}
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A} = {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}
     {E4EE5AFB-D552-447B-8A16-6CBE7938AF32} = {E4EE5AFB-D552-447B-8A16-6CBE7938AF32}
   EndProjectSection
@@ -382 +381 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4", "HeuristicLab.Problems.DataAnalysis.Trading.Views\3.4\HeuristicLab.Problems.DataAnalysis.Trading.Views-3.4.csproj", "{CB3D0A1E-1BE8-476B-A53C-2B189E30064F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.TestFunctions-3.3", "HeuristicLab.Problems.Instances.TestFunctions\3.3\HeuristicLab.Problems.Instances.TestFunctions-3.3.csproj", "{98EF72F8-D207-4A5B-8291-95DC73DDFD9A}"
 EndProject
 Global
@@ -1859 +1856 @@
     {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.ActiveCfg = Release|x86
     {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.Build.0 = Release|x86
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x64.ActiveCfg = Debug|x64
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x64.Build.0 = Debug|x64
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x86.ActiveCfg = Debug|x86
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x86.Build.0 = Debug|x86
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.Build.0 = Release|Any CPU
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x64.ActiveCfg = Release|x64
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x64.Build.0 = Release|x64
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x86.ActiveCfg = Release|x86
-    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

@@ -119 +119 @@
     <Compile Include="IDataDescriptor.cs" />
     <Compile Include="Types\DistanceHelper.cs" />
-    <Compile Include="Types\SOTFData.cs" />
     <Compile Include="Types\VRP\MDCVRPTWData.cs" />
     <Compile Include="Types\VRP\MDCVRPData.cs" />
@@ -144 +143 @@
       <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
       <Name>HeuristicLab.Common-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
-      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
-      <Name>HeuristicLab.Core-3.3</Name>
       <Private>False</Private>
     </ProjectReference>

trunk/sources/HeuristicLab.Problems.Instances/3.3/Plugin.cs.frame

@@ -26 +26 @@
   [PluginFile("HeuristicLab.Problems.Instances-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Common", "3.3")]
-  [PluginDependency("HeuristicLab.Core", "3.3")]
   public class HeuristicLabProblemsInstancesPlugin : PluginBase {
   }

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;
     }
   }