Changeset 14069


Ignore:
Timestamp:
07/14/16 15:08:18 (13 months ago)
Author:
mkommend
Message:

#1087: Moved Pareto fronts to subfolders in the according test functions folder and changed PFStore.

Location:
branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3
Files:
3 added
1 deleted
7 edited
15 copied
1 moved

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/HeuristicLab.Problems.MultiObjectiveTestFunctions-3.3.csproj

    r14068 r14069  
    169169    <Compile Include="Instances\DTLZInstanceProvider.cs" />
    170170    <Compile Include="Interfaces\IMOFrontModel.cs" />
    171     <Compile Include="Testfunctions\Misc\CIGTAB.cs" />
    172     <Compile Include="Testfunctions\IHR\IHR.cs" />
    173     <Compile Include="Testfunctions\IHR\IHR1.cs" />
    174     <Compile Include="Testfunctions\IHR\IHR6.cs" />
    175     <Compile Include="Testfunctions\IHR\IHR4.cs" />
    176     <Compile Include="Testfunctions\IHR\IHR3.cs" />
    177     <Compile Include="Testfunctions\IHR\IHR2.cs" />
    178     <Compile Include="Testfunctions\Misc\ELLI1.cs" />
     171    <Compile Include="TestFunctions\Misc\CIGTAB.cs" />
     172    <Compile Include="TestFunctions\IHR\IHR.cs" />
     173    <Compile Include="TestFunctions\IHR\IHR1.cs" />
     174    <Compile Include="TestFunctions\IHR\IHR6.cs" />
     175    <Compile Include="TestFunctions\IHR\IHR4.cs" />
     176    <Compile Include="TestFunctions\IHR\IHR3.cs" />
     177    <Compile Include="TestFunctions\IHR\IHR2.cs" />
     178    <Compile Include="TestFunctions\Misc\ELLI1.cs" />
    179179    <Compile Include="Views\MOSolution.cs" />
    180180    <Compile Include="Views\MOFrontScatterPlotView.cs">
     
    187187    <Compile Include="Interfaces\IMultiObjectiveTestFunction.cs" />
    188188    <Compile Include="MultiObjectiveTestFunctionProblem.cs" />
    189     <Compile Include="PFStore.cs" />
     189    <Compile Include="TestFunctions\ParetoFrontStore.cs" />
    190190    <Compile Include="Plugin.cs" />
    191191    <Compile Include="Properties\AssemblyInfo.cs" />
    192     <Compile Include="Testfunctions\DTLZ\DTLZ.cs" />
    193     <Compile Include="Testfunctions\DTLZ\DTLZ5.cs" />
    194     <Compile Include="Testfunctions\DTLZ\DTLZ8.cs" />
    195     <Compile Include="Testfunctions\DTLZ\DTLZ7.cs" />
    196     <Compile Include="Testfunctions\DTLZ\DTLZ6.cs" />
    197     <Compile Include="Testfunctions\DTLZ\DTLZ4.cs" />
    198     <Compile Include="Testfunctions\DTLZ\DTLZ3.cs" />
    199     <Compile Include="Testfunctions\DTLZ\DTLZ2.cs" />
    200     <Compile Include="Testfunctions\Misc\Kursawe.cs" />
    201     <Compile Include="Testfunctions\DTLZ\DTLZ1.cs" />
    202     <Compile Include="Testfunctions\ZDT\ZDT.cs" />
    203     <Compile Include="Testfunctions\ZDT\ZDT6.cs" />
    204     <Compile Include="Testfunctions\ZDT\ZDT4.cs" />
    205     <Compile Include="Testfunctions\ZDT\ZDT3.cs" />
    206     <Compile Include="Testfunctions\ZDT\ZDT2.cs" />
    207     <Compile Include="Testfunctions\ZDT\ZDT1.cs" />
    208     <Compile Include="Testfunctions\Misc\SchafferN2.cs" />
    209     <Compile Include="Testfunctions\Misc\SchafferN1.cs" />
    210     <Compile Include="Testfunctions\Misc\Fonseca.cs" />
    211     <Compile Include="Testfunctions\MultiObjectiveTestFunction.cs" />
    212   </ItemGroup>
    213   <ItemGroup>
    214     <EmbeddedResource Include="EmbeddedRessources\ZDT1.pf" />
    215     <EmbeddedResource Include="EmbeddedRessources\DTLZ1.2D.pf" />
    216     <EmbeddedResource Include="EmbeddedRessources\DTLZ2.2D.pf" />
    217     <EmbeddedResource Include="EmbeddedRessources\DTLZ3.2D.pf" />
    218     <EmbeddedResource Include="EmbeddedRessources\DTLZ4.2D.pf" />
    219     <EmbeddedResource Include="EmbeddedRessources\DTLZ5.2D.pf" />
    220     <EmbeddedResource Include="EmbeddedRessources\DTLZ6.2D.pf" />
    221     <EmbeddedResource Include="EmbeddedRessources\DTLZ7.2D.pf" />
    222     <EmbeddedResource Include="EmbeddedRessources\Fonseca.pf" />
    223     <EmbeddedResource Include="EmbeddedRessources\Kursawe.pf" />
    224     <EmbeddedResource Include="EmbeddedRessources\Schaffer.pf" />
    225     <EmbeddedResource Include="EmbeddedRessources\ZDT2.pf" />
    226     <EmbeddedResource Include="EmbeddedRessources\ZDT3.pf" />
    227     <EmbeddedResource Include="EmbeddedRessources\ZDT4.pf" />
    228     <EmbeddedResource Include="EmbeddedRessources\ZDT6.pf" />
     192    <Compile Include="TestFunctions\DTLZ\DTLZ.cs" />
     193    <Compile Include="TestFunctions\DTLZ\DTLZ5.cs" />
     194    <Compile Include="TestFunctions\DTLZ\DTLZ8.cs" />
     195    <Compile Include="TestFunctions\DTLZ\DTLZ7.cs" />
     196    <Compile Include="TestFunctions\DTLZ\DTLZ6.cs" />
     197    <Compile Include="TestFunctions\DTLZ\DTLZ4.cs" />
     198    <Compile Include="TestFunctions\DTLZ\DTLZ3.cs" />
     199    <Compile Include="TestFunctions\DTLZ\DTLZ2.cs" />
     200    <Compile Include="TestFunctions\Misc\Kursawe.cs" />
     201    <Compile Include="TestFunctions\DTLZ\DTLZ1.cs" />
     202    <Compile Include="TestFunctions\ZDT\ZDT.cs" />
     203    <Compile Include="TestFunctions\ZDT\ZDT6.cs" />
     204    <Compile Include="TestFunctions\ZDT\ZDT4.cs" />
     205    <Compile Include="TestFunctions\ZDT\ZDT3.cs" />
     206    <Compile Include="TestFunctions\ZDT\ZDT2.cs" />
     207    <Compile Include="TestFunctions\ZDT\ZDT1.cs" />
     208    <Compile Include="TestFunctions\Misc\SchafferN2.cs" />
     209    <Compile Include="TestFunctions\Misc\SchafferN1.cs" />
     210    <Compile Include="TestFunctions\Misc\Fonseca.cs" />
     211    <Compile Include="TestFunctions\MultiObjectiveTestFunction.cs" />
     212  </ItemGroup>
     213  <ItemGroup>
     214    <EmbeddedResource Include="TestFunctions\ZDT\ParetoFronts\ZDT1.pf" />
     215    <EmbeddedResource Include="TestFunctions\DTLZ\ParetoFronts\DTLZ1.2D.pf" />
     216    <EmbeddedResource Include="TestFunctions\DTLZ\ParetoFronts\DTLZ2.2D.pf" />
     217    <EmbeddedResource Include="TestFunctions\DTLZ\ParetoFronts\DTLZ3.2D.pf" />
     218    <EmbeddedResource Include="TestFunctions\DTLZ\ParetoFronts\DTLZ4.2D.pf" />
     219    <EmbeddedResource Include="TestFunctions\DTLZ\ParetoFronts\DTLZ5.2D.pf" />
     220    <EmbeddedResource Include="TestFunctions\DTLZ\ParetoFronts\DTLZ6.2D.pf" />
     221    <EmbeddedResource Include="TestFunctions\DTLZ\ParetoFronts\DTLZ7.2D.pf" />
     222    <EmbeddedResource Include="TestFunctions\Misc\ParetoFronts\Fonseca.pf" />
     223    <EmbeddedResource Include="TestFunctions\Misc\ParetoFronts\Kursawe.pf" />
     224    <EmbeddedResource Include="TestFunctions\Misc\ParetoFronts\SchafferN1.pf" />
     225    <EmbeddedResource Include="TestFunctions\ZDT\ParetoFronts\ZDT2.pf" />
     226    <EmbeddedResource Include="TestFunctions\ZDT\ParetoFronts\ZDT3.pf" />
     227    <EmbeddedResource Include="TestFunctions\ZDT\ParetoFronts\ZDT4.pf" />
     228    <EmbeddedResource Include="TestFunctions\ZDT\ParetoFronts\ZDT6.pf" />
    229229    <None Include="HeuristicLab.snk" />
    230230    <None Include="Plugin.cs.frame" />
  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/DTLZ/DTLZ.cs

    r14068 r14069  
    2929  public abstract class DTLZ : MultiObjectiveTestFunction {
    3030    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    31       if (objectives == 2) return PFStore.get(this.ItemName + ".2D");
     31      if (objectives == 2) return ParetoFrontStore.GetParetoFront("DTLZ.ParetoFronts." + this.ItemName + ".2D");
    3232      return null;
    3333    }
  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/IHR/IHR.cs

    r14068 r14069  
    2020#endregion
    2121using System;
    22 using System.Collections.Generic;
    2322using HeuristicLab.Common;
    2423using HeuristicLab.Encodings.RealVectorEncoding;
     
    2827  [StorableClass]
    2928  public abstract class IHR : MultiObjectiveTestFunction {
    30     protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    31       if (objectives == 2) return PFStore.get(this.ItemName + ".2D");
    32       return null;
    33     }
    34 
    3529    protected override double[,] GetBounds(int objectives) {
    3630      return new double[,] { { -1, 1 } };
  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/Misc/Fonseca.cs

    r14068 r14069  
    4040
    4141    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    42       return PFStore.get(this.ItemName);
     42      return ParetoFrontStore.GetParetoFront("Misc.ParetoFronts." + this.ItemName);
    4343    }
    4444
  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/Misc/Kursawe.cs

    r14068 r14069  
    3939
    4040    protected override IEnumerable<double[]> GetOptimalParetoFront(int objecitves) {
    41       return PFStore.get(this.ItemName);
     41      return ParetoFrontStore.GetParetoFront("Misc.ParetoFronts." + this.ItemName);
    4242    }
    4343
  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/Misc/SchafferN1.cs

    r14068 r14069  
    4444
    4545    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    46       return PFStore.get("Schaffer");
     46      return ParetoFrontStore.GetParetoFront("Misc.ParetoFronts." + "SchafferN1");
    4747    }
    4848
  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/ParetoFrontStore.cs

    r14068 r14069  
    2727
    2828namespace HeuristicLab.Problems.MultiObjectiveTestFunctions {
    29   class PFStore {
    30     public static IEnumerable<double[]> get(String filename) {
     29  internal class ParetoFrontStore {
     30    internal static IEnumerable<double[]> GetParetoFront(String filename) {
    3131      List<double[]> data = new List<double[]>();
    3232      var assembly = Assembly.GetExecutingAssembly();
    33       String ressourcename = typeof(PFStore).Namespace + ".EmbeddedRessources." + filename + ".pf";
     33      String ressourcename = typeof(ParetoFrontStore).Namespace + ".TestFunctions." + filename + ".pf";
    3434
    3535      //check if file is listed
  • branches/HeuristicLab.Problems.MultiObjectiveTestFunctions/HeuristicLab.Problems.MultiObjectiveTestFunctions/3.3/Testfunctions/ZDT/ZDT.cs

    r14068 r14069  
    2929  public abstract class ZDT : MultiObjectiveTestFunction {
    3030    protected override IEnumerable<double[]> GetOptimalParetoFront(int objectives) {
    31       return PFStore.get(this.ItemName);
     31      return ParetoFrontStore.GetParetoFront("ZDT.ParetoFronts." + this.ItemName);
    3232    }
    3333
Note: See TracChangeset for help on using the changeset viewer.