- Timestamp:
- 07/14/17 14:01:11 (8 years ago)
- Location:
- stable
- Files:
-
- 1 deleted
- 4 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
stable
- Property svn:mergeinfo changed
/trunk/sources merged: 15178-15180,15203,15205-15206,15221,15226,15236
- Property svn:mergeinfo changed
-
stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Analyzers/ScatterPlotAnalyzer.cs
r14111 r15244 37 37 } 38 38 39 public IResultParameter< ScatterPlotContent> ScatterPlotResultParameter {40 get { return (IResultParameter< ScatterPlotContent>)Parameters["Scatterplot"]; }39 public IResultParameter<ParetoFrontScatterPlot> ScatterPlotResultParameter { 40 get { return (IResultParameter<ParetoFrontScatterPlot>)Parameters["Scatterplot"]; } 41 41 } 42 42 … … 51 51 public ScatterPlotAnalyzer() { 52 52 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)")); 54 54 55 55 } … … 57 57 public override IOperation Apply() { 58 58 var qualities = QualitiesParameter.ActualValue; 59 var individuals = IndividualsParameter.ActualValue; 59 60 var testFunction = TestFunctionParameter.ActualValue; 60 61 int objectives = qualities[0].Length; 61 var individuals = IndividualsParameter.ActualValue;62 int problemSize = individuals[0].Length; 62 63 63 64 double[][] optimalFront = new double[0][]; … … 68 69 var solutionClones = individuals.Select(s => s.ToArray()).ToArray(); 69 70 70 ScatterPlotResultParameter.ActualValue = new ScatterPlotContent(qualityClones, solutionClones, optimalFront, objectives);71 ScatterPlotResultParameter.ActualValue = new ParetoFrontScatterPlot(qualityClones, solutionClones, optimalFront, objectives, problemSize); 71 72 72 73 return base.Apply(); -
stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/HeuristicLab.Problems.TestFunctions.MultiObjective-3.3.csproj
r14170 r15244 111 111 <Compile Include="Calculators\InvertedGenerationalDistance.cs" /> 112 112 <Compile Include="Calculators\GenerationalDistance.cs" /> 113 <Compile Include=" ScatterPlotContent.cs" />113 <Compile Include="ParetoFrontScatterPlot.cs" /> 114 114 <Compile Include="Utilities.cs" /> 115 115 <Compile Include="Instances\MISCInstanceProvider.cs" /> … … 179 179 <Private>False</Private> 180 180 </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> 181 186 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 182 187 <Project>{a9ad58b9-3ef9-4cc1-97e5-8d909039ff5c}</Project> -
stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/ParetoFrontScatterPlot.cs
r15203 r15244 20 20 #endregion 21 21 22 using System.Drawing; 22 23 using System.Linq; 23 24 using HeuristicLab.Common; … … 29 30 [Item("Pareto Front Scatter Plot", "The optimal front, current front and its associated Points in the searchspace")] 30 31 public class ParetoFrontScatterPlot : Item { 32 public static new Image StaticItemImage { 33 get { return HeuristicLab.Common.Resources.VSImageLibrary.Performance; } 34 } 31 35 32 36 [Storable] -
stable/HeuristicLab.Problems.TestFunctions.MultiObjective/3.3/Plugin.cs.frame
r14190 r15244 25 25 [Plugin("HeuristicLab.Problems.TestFunctions.MultiObjective", "3.3.14.$WCREV$")] 26 26 [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")] 28 29 [PluginDependency("HeuristicLab.Common", "3.3")] 29 30 [PluginDependency("HeuristicLab.Core", "3.3")]
Note: See TracChangeset
for help on using the changeset viewer.