Changeset 9982


Ignore:
Timestamp:
09/17/13 11:47:57 (6 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:
1 added
1 deleted
5 edited
2 copied
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r9980 r9982  
    132132    {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937} = {BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}
    133133    {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5} = {6AE0E1F5-D3FF-43A3-90E1-2435E7493FB5}
    134     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A} = {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}
    135134    {E4EE5AFB-D552-447B-8A16-6CBE7938AF32} = {E4EE5AFB-D552-447B-8A16-6CBE7938AF32}
    136135  EndProjectSection
     
    382381EndProject
    383382Project("{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}"
    384 EndProject
    385 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}"
    386383EndProject
    387384Global
     
    18591856    {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.ActiveCfg = Release|x86
    18601857    {CB3D0A1E-1BE8-476B-A53C-2B189E30064F}.Release|x86.Build.0 = Release|x86
    1861     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
    1862     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
    1863     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x64.ActiveCfg = Debug|x64
    1864     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x64.Build.0 = Debug|x64
    1865     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x86.ActiveCfg = Debug|x86
    1866     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x86.Build.0 = Debug|x86
    1867     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
    1868     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.Build.0 = Release|Any CPU
    1869     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x64.ActiveCfg = Release|x64
    1870     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x64.Build.0 = Release|x64
    1871     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x86.ActiveCfg = Release|x86
    1872     {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x86.Build.0 = Release|x86
    18731858  EndGlobalSection
    18741859  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

    r9980 r9982  
    119119    <Compile Include="IDataDescriptor.cs" />
    120120    <Compile Include="Types\DistanceHelper.cs" />
    121     <Compile Include="Types\SOTFData.cs" />
    122121    <Compile Include="Types\VRP\MDCVRPTWData.cs" />
    123122    <Compile Include="Types\VRP\MDCVRPData.cs" />
     
    144143      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    145144      <Name>HeuristicLab.Common-3.3</Name>
    146       <Private>False</Private>
    147     </ProjectReference>
    148     <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    149       <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    150       <Name>HeuristicLab.Core-3.3</Name>
    151145      <Private>False</Private>
    152146    </ProjectReference>
  • trunk/sources/HeuristicLab.Problems.Instances/3.3/Plugin.cs.frame

    r9980 r9982  
    2626  [PluginFile("HeuristicLab.Problems.Instances-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
    28   [PluginDependency("HeuristicLab.Core", "3.3")]
    2928  public class HeuristicLabProblemsInstancesPlugin : PluginBase {
    3029  }
  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

    r9981 r9982  
    110110    <Compile Include="Evaluators\RandomEvaluator.cs" />
    111111    <Compile Include="Improvers\SingleObjectiveTestFunctionImprovementOperator.cs" />
     112    <Compile Include="Instances\SOTFData.cs" />
     113    <Compile Include="Instances\SOTFDataDescriptor.cs" />
     114    <Compile Include="Instances\SOTFInstanceProvider.cs" />
    112115    <Compile Include="MoveEvaluators\RandomAdditiveMoveEvaluator.cs" />
    113116    <Compile Include="PathRelinkers\SingleObjectiveTestFunctionPathRelinker.cs" />
  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Instances/SOTFData.cs

    r9980 r9982  
    2020#endregion
    2121
    22 using HeuristicLab.Core;
    2322
    24 namespace HeuristicLab.Problems.Instances {
     23namespace HeuristicLab.Problems.TestFunctions {
    2524  /// <summary>
    2625  /// Describes instances of Single Objective Test Functions (SOTF).
     
    4039    /// The operator used for evaluations
    4140    /// </summary>
    42     public IOperator Evaluator { get; set; }
     41    public ISingleObjectiveTestFunctionProblemEvaluator Evaluator { get; set; }
    4342  }
    4443}
  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Instances/SOTFDataDescriptor.cs

    r9980 r9982  
    2020#endregion
    2121
    22 using HeuristicLab.Problems.TestFunctions;
     22using HeuristicLab.Problems.Instances;
    2323
    24 namespace HeuristicLab.Problems.Instances.TestFunctions {
     24namespace HeuristicLab.Problems.TestFunctions {
    2525  internal class SOTFDataDescriptor : IDataDescriptor {
    2626    public string Name { get { return Evaluator.FunctionName + " Function"; } }
  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Instances/SOTFInstanceProvider.cs

    r9980 r9982  
    2424using System.Linq;
    2525using HeuristicLab.PluginInfrastructure;
    26 using HeuristicLab.Problems.TestFunctions;
     26using HeuristicLab.Problems.Instances;
    2727
    28 namespace HeuristicLab.Problems.Instances.TestFunctions {
     28namespace HeuristicLab.Problems.TestFunctions {
    2929  public class SOTFInstanceProvider : ProblemInstanceProvider<SOTFData> {
    3030    public override string Name {
  • trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

    r9980 r9982  
    410410      Name = data.Name;
    411411      Description = data.Description;
    412       Evaluator = (ISingleObjectiveTestFunctionProblemEvaluator)data.Evaluator;
     412      Evaluator = data.Evaluator;
    413413    }
    414414  }
Note: See TracChangeset for help on using the changeset viewer.