Changeset 15244
- Timestamp:
- 07/14/17 14:01:11 (8 years ago)
- Location:
- stable
- Files:
-
- 3 deleted
- 9 edited
- 4 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
-
TabularUnified stable/HeuristicLab 3.3.sln ¶
r15220 r15244 2 2 Microsoft Visual Studio Solution File, Format Version 12.00 3 3 # Visual Studio 15 4 VisualStudioVersion = 15.0.26430. 64 VisualStudioVersion = 15.0.26430.15 5 5 MinimumVisualStudioVersion = 10.0.40219.1 6 6 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{96396439-A764-4022-A8D2-BE021449B8D1}" … … 455 455 EndProject 456 456 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GraphColoring-3.3", "HeuristicLab.Problems.GraphColoring\3.3\HeuristicLab.Problems.GraphColoring-3.3.csproj", "{4B76E2CB-A990-4959-B080-1D81D418D325}" 457 EndProject 458 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3", "HeuristicLab.Algorithms.MOCMAEvolutionStrategy\3.3\HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj", "{0E2E224F-E9B2-41F3-B510-09183EEBA2AF}" 457 459 EndProject 458 460 Global … … 2218 2220 {4B76E2CB-A990-4959-B080-1D81D418D325}.Release|x86.ActiveCfg = Release|x86 2219 2221 {4B76E2CB-A990-4959-B080-1D81D418D325}.Release|x86.Build.0 = Release|x86 2222 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 2223 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|Any CPU.Build.0 = Debug|Any CPU 2224 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|x64.ActiveCfg = Debug|x64 2225 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|x64.Build.0 = Debug|x64 2226 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|x86.ActiveCfg = Debug|x86 2227 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Debug|x86.Build.0 = Debug|x86 2228 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|Any CPU.ActiveCfg = Release|Any CPU 2229 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|Any CPU.Build.0 = Release|Any CPU 2230 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x64.ActiveCfg = Release|x64 2231 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x64.Build.0 = Release|x64 2232 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x86.ActiveCfg = Release|x86 2233 {0E2E224F-E9B2-41F3-B510-09183EEBA2AF}.Release|x86.Build.0 = Release|x86 2220 2234 EndGlobalSection 2221 2235 GlobalSection(SolutionProperties) = preSolution -
stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy ¶
- Property svn:mergeinfo changed
-
TabularUnified stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj ¶
r15180 r15244 10 10 <RootNamespace>HeuristicLab.Algorithms.MOCMAEvolutionStrategy</RootNamespace> 11 11 <AssemblyName>HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3</AssemblyName> 12 <TargetFrameworkVersion>v4.5 .2</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 </PropertyGroup> … … 170 170 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 171 171 <PropertyGroup> 172 <PreBuildEvent >set Path=%25Path%25;$(ProjectDir);$(SolutionDir)172 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 173 173 set ProjectDir=$(ProjectDir) 174 174 set SolutionDir=$(SolutionDir) … … 176 176 177 177 call PreBuildEvent.cmd 178 </PreBuildEvent> 179 <PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> 180 export ProjectDir=$(ProjectDir) 181 export SolutionDir=$(SolutionDir) 178 182 179 180 </PreBuildEvent>183 $SolutionDir/PreBuildEvent.sh 184 </PreBuildEvent> 181 185 </PropertyGroup> 182 186 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
TabularUnified stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/MOCMAEvolutionStrategy.cs ¶
r15177 r15244 37 37 38 38 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy { 39 [Item("M OCMA Evolution Strategy (MOCMAES)", "A multi objective evolution strategy based on covariance matrix adaptation. Code is based on 'Covariance Matrix Adaptation for Multi - objective Optimization' by Igel, Hansen and Roth")]39 [Item("Multi-Objective CMA Evolution Strategy (MOCMAES)", "A multi objective evolution strategy based on covariance matrix adaptation. Code is based on 'Covariance Matrix Adaptation for Multi - objective Optimization' by Igel, Hansen and Roth")] 40 40 [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 210)] 41 41 [StorableClass] … … 245 245 set { Results[CurrentFrontResultName].Value = value; } 246 246 } 247 private ScatterPlotContent ResultsScatterPlot {248 get { return ( ScatterPlotContent)Results[ScatterPlotResultName].Value; }247 private ParetoFrontScatterPlot ResultsScatterPlot { 248 get { return (ParetoFrontScatterPlot)Results[ScatterPlotResultName].Value; } 249 249 set { Results[ScatterPlotResultName].Value = value; } 250 250 } … … 295 295 296 296 ResultsIterations = 1; 297 cancellationToken.ThrowIfCancellationRequested();298 297 } 299 298 private Individual InitializeIndividual(RealVector x) { … … 319 318 PenalizeEvaluate(solutions[i]); 320 319 } 320 ResultsEvaluations += solutions.Length; 321 321 } 322 322 private void InitStrategy() { … … 353 353 Results.Add(new Result(TimetableResultName, "Different quality meassures in a timeseries", table)); 354 354 Results.Add(new Result(CurrentFrontResultName, "The current front", new DoubleMatrix())); 355 Results.Add(new Result(ScatterPlotResultName, "A scatterplot displaying the evaluated solutions and (if available) the analytically optimal front", new ScatterPlotContent(null, null, null, 2)));355 Results.Add(new Result(ScatterPlotResultName, "A scatterplot displaying the evaluated solutions and (if available) the analytically optimal front", new ParetoFrontScatterPlot())); 356 356 357 357 var problem = Problem as MultiObjectiveTestFunctionProblem; … … 361 361 ResultsDifferenceBestKnownHypervolume = ResultsBestKnownHypervolume; 362 362 } 363 ResultsScatterPlot = new ScatterPlotContent(new double[0][], new double[0][], problem.BestKnownFront.ToJaggedArray(), problem.Objectives);363 ResultsScatterPlot = new ParetoFrontScatterPlot(new double[0][], new double[0][], problem.BestKnownFront.ToJaggedArray(), problem.Objectives, problem.ProblemSize); 364 364 } 365 365 #endregion … … 384 384 return o; 385 385 }); 386 ResultsEvaluations += solutions.Length; 386 387 var parents = solutions.Concat(offspring).ToArray(); 387 388 SelectParents(parents, solutions.Length); … … 409 410 private double[] Evaluate(RealVector x) { 410 411 var res = Problem.Evaluate(new SingleEncodingIndividual(Problem.Encoding, new Scope { Variables = { new Variable(Problem.Encoding.Name, x) } }), random); 411 ResultsEvaluations++;412 412 return res; 413 413 } … … 470 470 471 471 private void Analyze() { 472 ResultsScatterPlot = new ScatterPlotContent(solutions.Select(x => x.Fitness).ToArray(), solutions.Select(x => x.Mean.ToArray()).ToArray(), ResultsScatterPlot.ParetoFront, ResultsScatterPlot.Objectives);472 ResultsScatterPlot = new ParetoFrontScatterPlot(solutions.Select(x => x.Fitness).ToArray(), solutions.Select(x => x.Mean.ToArray()).ToArray(), ResultsScatterPlot.ParetoFront, ResultsScatterPlot.Objectives, ResultsScatterPlot.ProblemSize); 473 473 ResultsSolutions = solutions.Select(x => x.Mean.ToArray()).ToMatrix(); 474 474 -
TabularUnified 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(); -
TabularUnified 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> -
TabularUnified 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] -
TabularUnified 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")] -
TabularUnified stable/HeuristicLab.Problems.TestFunctions.Views/3.3/HeuristicLab.Problems.TestFunctions.Views-3.3.csproj ¶
r14165 r15244 105 105 <Reference Include="System.Drawing" /> 106 106 <Reference Include="System.Windows.Forms" /> 107 <Reference Include="System.Windows.Forms.DataVisualization" /> 108 <Reference Include="System.Xml.Linq"> 109 <RequiredTargetFramework>3.5</RequiredTargetFramework> 110 </Reference> 111 <Reference Include="System.Data.DataSetExtensions"> 112 <RequiredTargetFramework>3.5</RequiredTargetFramework> 113 </Reference> 114 <Reference Include="System.Data" /> 115 <Reference Include="System.Xml" /> 116 </ItemGroup> 117 <ItemGroup> 118 <Compile Include="MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs"> 107 </ItemGroup> 108 <ItemGroup> 109 <Compile Include="ParetoFrontScatterPlotView.cs"> 119 110 <SubType>UserControl</SubType> 120 111 </Compile> 121 <Compile Include=" MultiObjectiveTestFunctionParetoFrontScatterPlotView.Designer.cs">122 <DependentUpon> MultiObjectiveTestFunctionParetoFrontScatterPlotView.cs</DependentUpon>112 <Compile Include="ParetoFrontScatterPlotView.Designer.cs"> 113 <DependentUpon>ParetoFrontScatterPlotView.cs</DependentUpon> 123 114 </Compile> 124 115 <Compile Include="Plugin.cs" /> … … 143 134 </ItemGroup> 144 135 <ItemGroup> 136 <ProjectReference Include="..\..\HeuristicLab.Analysis.Views\3.3\HeuristicLab.Analysis.Views-3.3.csproj"> 137 <Project>{76945d76-ca61-4147-9dc2-0acdcddf87f9}</Project> 138 <Name>HeuristicLab.Analysis.Views-3.3</Name> 139 <Private>False</Private> 140 </ProjectReference> 141 <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj"> 142 <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project> 143 <Name>HeuristicLab.Analysis-3.3</Name> 144 <Private>False</Private> 145 </ProjectReference> 145 146 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 146 147 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> … … 211 212 <Project>{88B9B0E3-344E-4196-82A3-0F9732506FE8}</Project> 212 213 <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>218 214 <Private>False</Private> 219 215 </ProjectReference> -
TabularUnified stable/HeuristicLab.Problems.TestFunctions.Views/3.3/Plugin.cs.frame ¶
r14190 r15244 28 28 [Plugin("HeuristicLab.Problems.TestFunctions.Views", "3.3.14.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Problems.TestFunctions.Views-3.3.dll", PluginFileType.Assembly)] 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] 31 [PluginDependency("HeuristicLab.Analysis.Views", "3.3")] 30 32 [PluginDependency("HeuristicLab.Collections", "3.3")] 31 33 [PluginDependency("HeuristicLab.Common", "3.3")] … … 40 42 [PluginDependency("HeuristicLab.Problems.TestFunctions", "3.3")] 41 43 [PluginDependency("HeuristicLab.Problems.TestFunctions.MultiObjective", "3.3")] 42 [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]43 44 public class HeuristicLabProblemsTestFunctionsViewsPlugin : PluginBase { 44 45 }
Note: See TracChangeset
for help on using the changeset viewer.