Changeset 14120


Ignore:
Timestamp:
07/19/16 17:52:59 (3 years ago)
Author:
mkommend
Message:

#1087: Integrated multi-objective test functions in the trunk.

Location:
trunk/sources
Files:
1 deleted
5 edited
4 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r13786 r14120  
    458458EndProject
    459459Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.RandomSearch-3.3", "HeuristicLab.Algorithms.RandomSearch\3.3\HeuristicLab.Algorithms.RandomSearch-3.3.csproj", "{4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}"
     460EndProject
     461Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.TestFunctions.MultiObjective-3.3", "HeuristicLab.Problems.TestFunctions.MultiObjective\3.3\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj", "{D53E8E48-CFAA-4F57-AC35-63BEF4476159}"
    460462EndProject
    461463Global
    … …  
    22332235    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|x86.ActiveCfg = Release|x86
    22342236    {4A15DC1A-51EE-4CB7-AC05-F5AFDDECE1B1}.Release|x86.Build.0 = Release|x86
     2237    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     2238    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Debug|Any CPU.Build.0 = Debug|Any CPU
     2239    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Debug|x64.ActiveCfg = Debug|Any CPU
     2240    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Debug|x86.ActiveCfg = Debug|Any CPU
     2241    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|Any CPU.ActiveCfg = Release|Any CPU
     2242    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|Any CPU.Build.0 = Release|Any CPU
     2243    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x64.ActiveCfg = Release|Any CPU
     2244    {D53E8E48-CFAA-4F57-AC35-63BEF4476159}.Release|x86.ActiveCfg = Release|Any CPU
    22352245  EndGlobalSection
    22362246  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj

    r14111 r14120  
    4747    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    4848      <SpecificVersion>False</SpecificVersion>
    49       <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
    50     </Reference>
    51     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    52       <SpecificVersion>False</SpecificVersion>
    53       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
    54     </Reference>
    55     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    56       <SpecificVersion>False</SpecificVersion>
    57       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
    58     </Reference>
    59     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    60       <SpecificVersion>False</SpecificVersion>
    61       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
    62     </Reference>
    63     <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    64       <SpecificVersion>False</SpecificVersion>
    65       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
    66     </Reference>
    67     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    68       <SpecificVersion>False</SpecificVersion>
    69       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
    70       <Private>False</Private>
    71     </Reference>
    72     <Reference Include="HeuristicLab.Core.Views-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    73       <SpecificVersion>False</SpecificVersion>
    74       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core.Views-3.3.dll</HintPath>
    75     </Reference>
    76     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    77       <SpecificVersion>False</SpecificVersion>
    78       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
    79       <Private>False</Private>
    80     </Reference>
    81     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    82       <SpecificVersion>False</SpecificVersion>
    83       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    84       <Private>False</Private>
    85     </Reference>
    86     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    87       <SpecificVersion>False</SpecificVersion>
    88       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm-3.3.dll</HintPath>
    89     </Reference>
    90     <Reference Include="HeuristicLab.MainForm.WindowsForms-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    91       <SpecificVersion>False</SpecificVersion>
    92       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.MainForm.WindowsForms-3.3.dll</HintPath>
    93     </Reference>
    94     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    95       <SpecificVersion>False</SpecificVersion>
    96       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
    97       <Private>False</Private>
    98     </Reference>
    99     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    100       <SpecificVersion>False</SpecificVersion>
    101       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
    102       <Private>False</Private>
    103     </Reference>
    104     <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    105       <SpecificVersion>False</SpecificVersion>
    106       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    107     </Reference>
    108     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    109       <SpecificVersion>False</SpecificVersion>
    110       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
    111       <Private>False</Private>
    112     </Reference>
    113     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    114       <SpecificVersion>False</SpecificVersion>
    115       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
    116       <Private>False</Private>
    117     </Reference>
    118     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    119       <SpecificVersion>False</SpecificVersion>
    120       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    121       <Private>False</Private>
    122     </Reference>
    123     <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    124       <SpecificVersion>False</SpecificVersion>
    125       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Problems.Instances-3.3.dll</HintPath>
    126     </Reference>
    127     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    128       <SpecificVersion>False</SpecificVersion>
    129       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
    130     </Reference>
    131     <Reference Include="HeuristicLab.Visualization.ChartControlsExtensions-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    132       <SpecificVersion>False</SpecificVersion>
    133       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Visualization.ChartControlsExtensions-3.3.dll</HintPath>
     49      <HintPath>..\..\bin\ALGLIB-3.7.0.dll</HintPath>
     50      <Private>False</Private>
    13451    </Reference>
    13552    <Reference Include="System" />
    … …  
    16178    <Compile Include="Calculators\InvertedGenerationalDistance.cs" />
    16279    <Compile Include="Calculators\GenerationalDistance.cs" />
     80    <Compile Include="ScatterPlotContent.cs" />
    16381    <Compile Include="Utilities.cs" />
    16482    <Compile Include="Instances\MISCInstanceProvider.cs" />
    … …  
    17593    <Compile Include="TestFunctions\IHR\IHR2.cs" />
    17694    <Compile Include="TestFunctions\Misc\ELLI1.cs" />
    177     <Compile Include="Views\ScatterPlotContent.cs" />
    178     <Compile Include="Views\MOFrontScatterPlotView.cs">
    179       <SubType>UserControl</SubType>
    180     </Compile>
    181     <Compile Include="Views\MOFrontScatterPlotView.Designer.cs">
    182       <DependentUpon>MOFrontScatterPlotView.cs</DependentUpon>
    183     </Compile>
    18495    <Compile Include="NonDominatedSelect.cs" />
    18596    <Compile Include="Interfaces\IMultiObjectiveTestFunction.cs" />
    … …  
    230141  </ItemGroup>
    231142  <ItemGroup>
    232     <EmbeddedResource Include="Views\MOFrontScatterPlotView.resx">
    233       <DependentUpon>MOFrontScatterPlotView.cs</DependentUpon>
    234     </EmbeddedResource>
    235   </ItemGroup>
    236   <ItemGroup />
     143    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     144      <Project>{958b43bc-cc5c-4fa2-8628-2b3b01d890b6}</Project>
     145      <Name>HeuristicLab.Collections-3.3</Name>
     146      <Private>False</Private>
     147    </ProjectReference>
     148    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     149      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
     150      <Name>HeuristicLab.Common-3.3</Name>
     151      <Private>False</Private>
     152    </ProjectReference>
     153    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     154      <Project>{c36bd924-a541-4a00-afa8-41701378ddc5}</Project>
     155      <Name>HeuristicLab.Core-3.3</Name>
     156      <Private>False</Private>
     157    </ProjectReference>
     158    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     159      <Project>{bbab9df5-5ef3-4ba8-ade9-b36e82114937}</Project>
     160      <Name>HeuristicLab.Data-3.3</Name>
     161      <Private>False</Private>
     162    </ProjectReference>
     163    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
     164      <Project>{bb6d334a-4bb6-4674-9883-31a6ebb32cab}</Project>
     165      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     166      <Private>False</Private>
     167    </ProjectReference>
     168    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     169      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
     170      <Name>HeuristicLab.Operators-3.3</Name>
     171      <Private>False</Private>
     172    </ProjectReference>
     173    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     174      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
     175      <Name>HeuristicLab.Optimization-3.3</Name>
     176      <Private>False</Private>
     177    </ProjectReference>
     178    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     179      <Project>{56f9106a-079f-4c61-92f6-86a84c2d84b7}</Project>
     180      <Name>HeuristicLab.Parameters-3.3</Name>
     181      <Private>False</Private>
     182    </ProjectReference>
     183    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     184      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     185      <Name>HeuristicLab.Persistence-3.3</Name>
     186      <Private>False</Private>
     187    </ProjectReference>
     188    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     189      <Project>{94186a6a-5176-4402-ae83-886557b53cca}</Project>
     190      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     191      <Private>False</Private>
     192    </ProjectReference>
     193    <ProjectReference Include="..\..\HeuristicLab.Problems.Instances\3.3\HeuristicLab.Problems.Instances-3.3.csproj">
     194      <Project>{3540e29e-4793-49e7-8ee2-fea7f61c3994}</Project>
     195      <Name>HeuristicLab.Problems.Instances-3.3</Name>
     196      <Private>False</Private>
     197    </ProjectReference>
     198  </ItemGroup>
    237199  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    238200  <PropertyGroup>

  • trunk/sources/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Plugin.cs.frame

    r14111 r14120  
    3434  [PluginDependency("HeuristicLab.Parameters", "3.3")]
    3535  [PluginDependency("HeuristicLab.Persistence", "3.3")]
    36   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    37 
    38   [PluginDependency("HeuristicLab.Core.Views", "3.3")]
    39   [PluginDependency("HeuristicLab.MainForm", "3.3")]
    40   [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")]
    41   [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
     36  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
    4237  public class Plugin : PluginBase {
    4338  }

  • trunk/sources/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/ScatterPlotContent.cs

    r14111 r14120  
    1919 */
    2020#endregion
    21 using System;
    22 using System.Drawing;
    2321using System.Linq;
    2422using HeuristicLab.Common;
    … …  
    8280    protected ScatterPlotContent(bool deserializing) : base() { }
    8381
    84     protected ScatterPlotContent(ScatterPlotContent original, Cloner cloner) : this() {
     82    protected ScatterPlotContent(ScatterPlotContent original, Cloner cloner)
     83      : this() {
    8584      this.qualities = original.qualities.Select(s => s.ToArray()).ToArray();
    8685      this.solutions = original.solutions.Select(s => s.ToArray()).ToArray();

  • trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj

    r11623 r14120  
    105105    <Reference Include="System.Drawing" />
    106106    <Reference Include="System.Windows.Forms" />
     107    <Reference Include="System.Windows.Forms.DataVisualization" />
    107108    <Reference Include="System.Xml.Linq">
    108109      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    … …  
    115116  </ItemGroup>
    116117  <ItemGroup>
     118    <Compile Include="MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs">
     119      <SubType>UserControl</SubType>
     120    </Compile>
     121    <Compile Include="MultiObjectiveTestFunctionParetoFrontScatterPlotView.Designer.cs">
     122      <DependentUpon>MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs</DependentUpon>
     123    </Compile>
    117124    <Compile Include="Plugin.cs" />
    118125    <Compile Include="Properties\AssemblyInfo.cs" />
    … …  
    196203      <Private>False</Private>
    197204    </ProjectReference>
     205    <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions.MultiObjective\3.3\HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj">
     206      <Project>{d53e8e48-cfaa-4f57-ac35-63bef4476159}</Project>
     207      <Name>HeuristicLab.Problems.TestFunctions.MultiObjective-3.3</Name>
     208      <Private>False</Private>
     209    </ProjectReference>
    198210    <ProjectReference Include="..\..\HeuristicLab.Problems.TestFunctions\3.3\HeuristicLab.Problems.TestFunctions-3.3.csproj">
    199211      <Project>{88B9B0E3-344E-4196-82A3-0F9732506FE8}</Project>
    200212      <Name>HeuristicLab.Problems.TestFunctions-3.3</Name>
     213      <Private>False</Private>
     214    </ProjectReference>
     215    <ProjectReference Include="..\..\HeuristicLab.Visualization.ChartControlsExtensions\3.3\HeuristicLab.Visualization.ChartControlsExtensions-3.3.csproj">
     216      <Project>{315bda09-3f4f-49b3-9790-b37cfc1c5750}</Project>
     217      <Name>HeuristicLab.Visualization.ChartControlsExtensions-3.3</Name>
    201218      <Private>False</Private>
    202219    </ProjectReference>

  • trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/MultiObjectiveTestFunctionParetoFrontScatterPlotView.Designer.cs

    r14111 r14120  
    2020#endregion
    2121namespace HeuristicLab.Problems.TestFunctions.MultiObjective {
    22   partial class MOQualitiesScatterPlotView {
     22  partial class MultiObjectiveTestFunctionParetoFrontScatterPlotView {
    2323    /// <summary>
    2424    /// Required designer variable.

  • trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs

    r14111 r14120  
    3131  [View("Scatter Plot")]
    3232  [Content(typeof(ScatterPlotContent))]
    33   public partial class MOQualitiesScatterPlotView : ItemView {
     33  public partial class MultiObjectiveTestFunctionParetoFrontScatterPlotView : ItemView {
    3434    private const string QUALITIES = "Qualities";
    3535    private const string PARETO_FRONT = "Best Known Pareto Front";
    … …  
    4545    }
    4646
    47     public MOQualitiesScatterPlotView()
     47    public MultiObjectiveTestFunctionParetoFrontScatterPlotView()
    4848      : base() {
    4949      InitializeComponent();

  • trunk/sources/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame

    r13321 r14120  
    3939  [PluginDependency("HeuristicLab.Optimization.Views", "3.3")]
    4040  [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")]
     41  [PluginDependency("HeuristicLab.Problems.TestFunctions.MultiObjective", "3.3")]
     42  [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
    4143  public class HeuristicLabProblemsTestFunctionsViewsPlugin : PluginBase {
    4244  }
Note: See TracChangeset for help on using the changeset viewer.