Changeset 12105 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TestFunctions
- Timestamp:
- 03/03/15 11:18:07 (9 years ago)
- Location:
- branches/HeuristicLab.DatasetRefactor/sources
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.DatasetRefactor/sources
- Property svn:mergeinfo changed
/trunk/sources merged: 12037,12041,12057,12059-12060,12067,12069-12070,12072,12074,12076-12078,12085,12087-12091,12093,12095-12096,12100-12104
- Property svn:mergeinfo changed
-
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TestFunctions
- Property svn:mergeinfo changed
/trunk/sources/HeuristicLab.Problems.TestFunctions merged: 12069-12070,12087,12102
- Property svn:mergeinfo changed
-
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs
r12031 r12105 38 38 [StorableClass] 39 39 public sealed class SingleObjectiveTestFunctionSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator { 40 #region Properties 40 protected override bool IsCommutative { get { return true; } } 41 41 42 [Storable] 42 43 public DoubleMatrix Bounds { get; set; } 43 #endregion44 44 45 45 [StorableConstructor] -
branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs
r12031 r12105 29 29 using HeuristicLab.Encodings.RealVectorEncoding; 30 30 using HeuristicLab.Optimization; 31 using HeuristicLab.Optimization.Operators; 31 32 using HeuristicLab.Parameters; 32 33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; … … 71 72 private BestSingleObjectiveTestFunctionSolutionAnalyzer BestSingleObjectiveTestFunctionSolutionAnalyzer { 72 73 get { return Operators.OfType<BestSingleObjectiveTestFunctionSolutionAnalyzer>().FirstOrDefault(); } 73 }74 private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer {75 get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().FirstOrDefault(); }76 74 } 77 75 #endregion … … 258 256 BestSingleObjectiveTestFunctionSolutionAnalyzer.BoundsParameter.ActualName = BoundsParameter.Name; 259 257 } 260 261 if (SingleObjectivePopulationDiversityAnalyzer != null) {262 SingleObjectivePopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;263 SingleObjectivePopulationDiversityAnalyzer.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;264 SingleObjectivePopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results";265 SingleObjectivePopulationDiversityAnalyzer.SimilarityCalculator = Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>().SingleOrDefault();266 }267 258 } 268 259 private void InitializeOperators() { … … 270 261 Operators.Add(new SingleObjectiveTestFunctionPathRelinker()); 271 262 Operators.Add(new SingleObjectiveTestFunctionSimilarityCalculator()); 263 Operators.Add(new QualitySimilarityCalculator { QualityVariableName = SolutionCreator.RealVectorParameter.ActualName }); 264 Operators.Add(new NoSimilarityCalculator()); 272 265 273 266 Operators.Add(new BestSingleObjectiveTestFunctionSolutionAnalyzer()); 274 Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());267 Operators.Add(new PopulationSimilarityAnalyzer(Operators.OfType<ISolutionSimilarityCalculator>())); 275 268 ParameterizeAnalyzers(); 276 269 Operators.AddRange(ApplicationManager.Manager.GetInstances<IRealVectorOperator>().Cast<IOperator>()); … … 325 318 try { 326 319 BestKnownSolutionParameter.Value = Evaluator.GetBestKnownSolution(ProblemSize.Value); 327 } catch (ArgumentException e) { 320 } 321 catch (ArgumentException e) { 328 322 ErrorHandling.ShowErrorDialog(e); 329 323 ProblemSize.Value = Evaluator.MinimumProblemSize;
Note: See TracChangeset
for help on using the changeset viewer.