- Timestamp:
- 07/14/17 14:01:11 (7 years ago)
- Location:
- stable
- Files:
-
- 3 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.Algorithms.MOCMAEvolutionStrategy
- Property svn:mergeinfo changed
-
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. -
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
Note: See TracChangeset
for help on using the changeset viewer.