Changeset 9878


Ignore:
Timestamp:
08/12/13 15:48:14 (9 years ago)
Author:
jkarder
Message:

#1909

  • added project HL.Problems.Instances.TestFunctions (includes data descriptor and instance provider)
  • added instance type SOTFData
  • added SingleObjectiveTestFunctionProblemView
Location:
branches/TestFunctionInstances
Files:
12 added
9 edited

Legend:

Unmodified
Added
Removed
  • branches/TestFunctionInstances/HeuristicLab 3.3.sln

    r9877 r9878  
    1313EndProject
    1414Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances-3.3", "HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj", "{3540E29E-4793-49E7-8EE2-FEA7F61C3994}"
     15EndProject
     16Project("{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}"
    1517EndProject
    1618Global
     
    6062    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|x86.ActiveCfg = Release|x86
    6163    {3540E29E-4793-49E7-8EE2-FEA7F61C3994}.Release|x86.Build.0 = Release|x86
     64    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     65    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
     66    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x64.ActiveCfg = Debug|Any CPU
     67    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Debug|x86.ActiveCfg = Debug|Any CPU
     68    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
     69    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|Any CPU.Build.0 = Release|Any CPU
     70    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x64.ActiveCfg = Release|Any CPU
     71    {98EF72F8-D207-4A5B-8291-95DC73DDFD9A}.Release|x86.ActiveCfg = Release|Any CPU
    6272  EndGlobalSection
    6373  GlobalSection(SolutionProperties) = preSolution
  • branches/TestFunctionInstances/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

    r9877 r9878  
    110110      <Private>False</Private>
    111111    </Reference>
     112    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     113      <SpecificVersion>False</SpecificVersion>
     114      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
     115      <Private>False</Private>
     116    </Reference>
    112117    <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    113118      <SpecificVersion>False</SpecificVersion>
     
    129134    <Compile Include="IDataDescriptor.cs" />
    130135    <Compile Include="Types\DistanceHelper.cs" />
     136    <Compile Include="Types\SOTFData.cs" />
    131137    <Compile Include="Types\VRP\MDCVRPTWData.cs" />
    132138    <Compile Include="Types\VRP\MDCVRPData.cs" />
  • branches/TestFunctionInstances/HeuristicLab.Problems.Instances/3.3/Plugin.cs.frame

    r9462 r9878  
    2626  [PluginFile("HeuristicLab.Problems.Instances-3.3.dll", PluginFileType.Assembly)]
    2727  [PluginDependency("HeuristicLab.Common", "3.3")]
     28  [PluginDependency("HeuristicLab.Core", "3.3")]
    2829  public class HeuristicLabProblemsInstancesPlugin : PluginBase {
    2930  }
  • branches/TestFunctionInstances/HeuristicLab.Problems.Instances/3.3/Properties/AssemblyInfo.cs.frame

    r9462 r9878  
    2121
    2222using System.Reflection;
    23 using System.Runtime.CompilerServices;
    2423using System.Runtime.InteropServices;
    2524
     
    5352// You can specify all the values or you can default the Build and Revision Numbers
    5453// by using the '*' as shown below:
    55 // [assembly: AssemblyVersion("1.0.*")]
    5654[assembly: AssemblyVersion("3.3.0.0")]
    5755[assembly: AssemblyFileVersion("3.3.8.$WCREV$")]
  • branches/TestFunctionInstances/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj

    r9877 r9878  
    168168  </ItemGroup>
    169169  <ItemGroup>
     170    <Compile Include="SingleObjectiveTestFunctionProblemView.cs">
     171      <SubType>UserControl</SubType>
     172    </Compile>
     173    <Compile Include="SingleObjectiveTestFunctionProblemView.Designer.cs">
     174      <DependentUpon>SingleObjectiveTestFunctionProblemView.cs</DependentUpon>
     175    </Compile>
    170176    <Compile Include="SingleObjectiveTestFunctionSolutionView.cs">
    171177      <SubType>UserControl</SubType>
     
    179185  </ItemGroup>
    180186  <ItemGroup>
     187    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     188      <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
     189      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     190      <Private>False</Private>
     191    </ProjectReference>
    181192    <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj">
    182193      <Project>{88B9B0E3-344E-4196-82A3-0F9732506FE8}</Project>
     
    211222  -->
    212223  <PropertyGroup>
    213    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
     224    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    214225set ProjectDir=$(ProjectDir)
    215226set SolutionDir=$(SolutionDir)
     
    218229call PreBuildEvent.cmd
    219230</PreBuildEvent>
    220 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
     231    <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
    221232export ProjectDir=$(ProjectDir)
    222233export SolutionDir=$(SolutionDir)
  • branches/TestFunctionInstances/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame

    r9462 r9878  
    3636  [PluginDependency("HeuristicLab.MainForm", "3.3")]
    3737  [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
     38  [PluginDependency("HeuristicLab.Optimization", "3.3")]
     39  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    3840  [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
    3941  public class HeuristicLabProblemsTestFunctionsViewsPlugin : PluginBase {
  • branches/TestFunctionInstances/HeuristicLab.Problems.TestFunctions/3.3/HeuristicLab.Problems.TestFunctions-3.3.csproj

    r9877 r9878  
    245245    </BootstrapperPackage>
    246246  </ItemGroup>
    247   <ItemGroup />
     247  <ItemGroup>
     248    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     249      <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
     250      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     251      <Private>False</Private>
     252    </ProjectReference>
     253  </ItemGroup>
    248254  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    249255  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/TestFunctionInstances/HeuristicLab.Problems.TestFunctions/3.3/Plugin.cs.frame

    r9462 r9878  
    3838  [PluginDependency("HeuristicLab.Optimization", "3.3")]
    3939  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
     40  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4041  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    4142  [PluginDependency("HeuristicLab.Persistence", "3.3")]
  • branches/TestFunctionInstances/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

    r9456 r9878  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
     24using System.Linq;
    2225using HeuristicLab.Analysis;
    2326using HeuristicLab.Common;
     
    2932using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3033using HeuristicLab.PluginInfrastructure;
    31 using System;
    32 using System.Collections.Generic;
    33 using System.Linq;
     34using HeuristicLab.Problems.Instances;
    3435
    3536namespace HeuristicLab.Problems.TestFunctions {
     
    3738  [StorableClass]
    3839  [Creatable("Problems")]
    39   public sealed class SingleObjectiveTestFunctionProblem : SingleObjectiveHeuristicOptimizationProblem<ISingleObjectiveTestFunctionProblemEvaluator, IRealVectorCreator>, IStorableContent {
     40  public sealed class SingleObjectiveTestFunctionProblem : SingleObjectiveHeuristicOptimizationProblem<ISingleObjectiveTestFunctionProblemEvaluator, IRealVectorCreator>, IStorableContent, IProblemInstanceConsumer<SOTFData> {
    4041    public string Filename { get; set; }
    4142
     
    324325      try {
    325326        BestKnownSolutionParameter.Value = Evaluator.GetBestKnownSolution(ProblemSize.Value);
    326       }
    327       catch (ArgumentException e) {
     327      } catch (ArgumentException e) {
    328328        ErrorHandling.ShowErrorDialog(e);
    329329        ProblemSize.Value = Evaluator.MinimumProblemSize;
     
    406406    }
    407407    #endregion
     408
     409    public void Load(SOTFData data) {
     410      Name = data.Name;
     411      Description = data.Description;
     412      Evaluator = (ISingleObjectiveTestFunctionProblemEvaluator)data.Evaluator;
     413    }
    408414  }
    409415}
Note: See TracChangeset for help on using the changeset viewer.