Ignore:
Timestamp:
07/14/17 14:01:11 (5 years ago)
Author:
pfleck
Message:

#2592 merged to stable

Location:
stable
Files:
1 deleted
4 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/ScatterPlotAnalyzer.cs

    r14111 r15244  
    3737    }
    3838
    39     public IResultParameter<ScatterPlotContent> ScatterPlotResultParameter {
    40       get { return (IResultParameter<ScatterPlotContent>)Parameters["Scatterplot"]; }
     39    public IResultParameter<ParetoFrontScatterPlot> ScatterPlotResultParameter {
     40      get { return (IResultParameter<ParetoFrontScatterPlot>)Parameters["Scatterplot"]; }
    4141    }
    4242
     
    5151    public ScatterPlotAnalyzer() {
    5252      Parameters.Add(new ScopeTreeLookupParameter<RealVector>("Individuals", "The individual solutions to the problem"));
    53       Parameters.Add(new ResultParameter<ScatterPlotContent>("Scatterplot", "The scatterplot for the current and optimal (if known front)"));
     53      Parameters.Add(new ResultParameter<ParetoFrontScatterPlot>("Scatterplot", "The scatterplot for the current and optimal (if known front)"));
    5454
    5555    }
     
    5757    public override IOperation Apply() {
    5858      var qualities = QualitiesParameter.ActualValue;
     59      var individuals = IndividualsParameter.ActualValue;
    5960      var testFunction = TestFunctionParameter.ActualValue;
    6061      int objectives = qualities[0].Length;
    61       var individuals = IndividualsParameter.ActualValue;
     62      int problemSize = individuals[0].Length;
    6263
    6364      double[][] optimalFront = new double[0][];
     
    6869      var solutionClones = individuals.Select(s => s.ToArray()).ToArray();
    6970
    70       ScatterPlotResultParameter.ActualValue = new ScatterPlotContent(qualityClones, solutionClones, optimalFront, objectives);
     71      ScatterPlotResultParameter.ActualValue = new ParetoFrontScatterPlot(qualityClones, solutionClones, optimalFront, objectives, problemSize);
    7172
    7273      return base.Apply();
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj

    r14170 r15244  
    111111    <Compile Include="Calculators\InvertedGenerationalDistance.cs" />
    112112    <Compile Include="Calculators\GenerationalDistance.cs" />
    113     <Compile Include="ScatterPlotContent.cs" />
     113    <Compile Include="ParetoFrontScatterPlot.cs" />
    114114    <Compile Include="Utilities.cs" />
    115115    <Compile Include="Instances\MISCInstanceProvider.cs" />
     
    179179      <Private>False</Private>
    180180    </ProjectReference>
     181    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
     182      <Project>{0e27a536-1c4a-4624-a65e-dc4f4f23e3e1}</Project>
     183      <Name>HeuristicLab.Common.Resources-3.3</Name>
     184      <Private>False</Private>
     185    </ProjectReference>
    181186    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    182187      <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project>
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/ParetoFrontScatterPlot.cs

    r15203 r15244  
    2020#endregion
    2121
     22using System.Drawing;
    2223using System.Linq;
    2324using HeuristicLab.Common;
     
    2930  [Item("Pareto Front Scatter Plot", "The optimal front, current front and its associated Points in the searchspace")]
    3031  public class ParetoFrontScatterPlot : Item {
     32    public static new Image StaticItemImage {
     33      get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; }
     34    }
    3135
    3236    [Storable]
  • stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Plugin.cs.frame

    r14190 r15244  
    2525  [Plugin("HeuristicLab.Problems.TestFunctions.MultiObjective", "3.3.14.$WCREV$")]
    2626  [PluginFile("HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.dll", PluginFileType.Assembly)]
    27   [PluginDependency("HeuristicLab.Collections", "3.3")]
     27  [PluginDependency("HeuristicLab.Collections", "3.3")]
     28  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
    2829  [PluginDependency("HeuristicLab.Common", "3.3")]
    2930  [PluginDependency("HeuristicLab.Core", "3.3")] 
Note: See TracChangeset for help on using the changeset viewer.