Changeset 12069 for trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3
- Timestamp:
- 02/25/15 10:07:54 (10 years ago)
- Location:
- trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/DuplicatesSelector.cs
r12012 r12069 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Optimization; 27 using HeuristicLab.Parameters; 27 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 29 using HeuristicLab.Selection; … … 37 38 [Item("DuplicatesSelector", "A selection operator which considers a single solution representation and selects duplicates. The remaining scope then contains unique solutions and the selected scope their duplicates.")] 38 39 [StorableClass] 39 public sealed class DuplicatesSelector : SingleObjectiveSelector, ISimilarityBasedOperator { 40 #region ISimilarityBasedOperator Members 41 [Storable] 42 public ISolutionSimilarityCalculator SimilarityCalculator { get; set; } 43 #endregion 40 public sealed class DuplicatesSelector : SingleObjectiveSelector { 41 public IValueLookupParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter { 42 get { return (IValueLookupParameter<ISolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; } 43 } 44 44 45 45 [StorableConstructor] 46 46 private DuplicatesSelector(bool deserializing) : base(deserializing) { } 47 private DuplicatesSelector(DuplicatesSelector original, Cloner cloner) 48 : base(original, cloner) { 49 this.SimilarityCalculator = cloner.Clone(original.SimilarityCalculator); 47 private DuplicatesSelector(DuplicatesSelector original, Cloner cloner) : base(original, cloner) { } 48 public DuplicatesSelector() 49 : base() { 50 Parameters.Add(new ValueLookupParameter<ISolutionSimilarityCalculator>("SimilarityCalculator", "The similarity calculator that should be used to calculate solution similarity.")); 50 51 } 51 public DuplicatesSelector() : base() { }52 52 53 53 public override IDeepCloneable Clone(Cloner cloner) { 54 54 return new DuplicatesSelector(this, cloner); 55 } 56 57 [StorableHook(HookType.AfterDeserialization)] 58 private void AfterDeserialization() { 59 // BackwardsCompatibility3.3 60 #region Backwards compatible code, remove with 3.4 61 if (!Parameters.ContainsKey("SimilarityCalculator")) 62 Parameters.Add(new ValueLookupParameter<ISolutionSimilarityCalculator>("SimilarityCalculator", "The similarity calculator that should be used to calculate solution similarity.")); 63 #endregion 55 64 } 56 65 … … 61 70 for (int i = 0; i < scopes.Count; i++) 62 71 for (int j = i + 1; j < scopes.Count; j++) 63 marks[j] = SimilarityCalculator .Equals(scopes[i], scopes[j]);72 marks[j] = SimilarityCalculatorParameter.ActualValue.Equals(scopes[i], scopes[j]); 64 73 65 74 -
trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/ProgressiveOffspringPreserver.cs
r12012 r12069 38 38 [Item("ProgressiveOffspringPreserver", "An operator that progressively selects offspring by adding it to a scope list. The operator also performs duplication control.")] 39 39 [StorableClass] 40 public sealed class ProgressiveOffspringPreserver : SingleSuccessorOperator, ISimilarityBasedOperator { 41 #region ISimilarityBasedOperator Members 42 [Storable] 43 public ISolutionSimilarityCalculator SimilarityCalculator { get; set; } 44 #endregion 45 40 public sealed class ProgressiveOffspringPreserver : SingleSuccessorOperator { 46 41 #region Parameter Properties 47 42 public ScopeParameter CurrentScopeParameter { … … 56 51 public ILookupParameter<IntValue> MaximumPopulationSizeParameter { 57 52 get { return (ILookupParameter<IntValue>)Parameters["MaximumPopulationSize"]; } 53 } 54 public IValueLookupParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter { 55 get { return (IValueLookupParameter<ISolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; } 58 56 } 59 57 #endregion … … 76 74 [StorableConstructor] 77 75 private ProgressiveOffspringPreserver(bool deserializing) : base(deserializing) { } 78 private ProgressiveOffspringPreserver(ProgressiveOffspringPreserver original, Cloner cloner) 79 : base(original, cloner) { 80 this.SimilarityCalculator = cloner.Clone(original.SimilarityCalculator); 81 } 76 private ProgressiveOffspringPreserver(ProgressiveOffspringPreserver original, Cloner cloner) : base(original, cloner) { } 82 77 public ProgressiveOffspringPreserver() 83 78 : base() { 79 #region Create parameters 84 80 Parameters.Add(new ScopeParameter("CurrentScope", "The current scope that contains the offspring.")); 85 81 Parameters.Add(new LookupParameter<ScopeList>("OffspringList", "The list that contains the offspring.")); 86 82 Parameters.Add(new LookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.")); 87 83 Parameters.Add(new LookupParameter<IntValue>("MaximumPopulationSize", "The maximum size of the population of solutions.")); 84 Parameters.Add(new ValueLookupParameter<ISolutionSimilarityCalculator>("SimilarityCalculator", "The similarity calculator that should be used to calculate solution similarity.")); 85 #endregion 88 86 } 89 87 90 88 public override IDeepCloneable Clone(Cloner cloner) { 91 89 return new ProgressiveOffspringPreserver(this, cloner); 90 } 91 92 [StorableHook(HookType.AfterDeserialization)] 93 private void AfterDeserialization() { 94 // BackwardsCompatibility3.3 95 #region Backwards compatible code, remove with 3.4 96 if (!Parameters.ContainsKey("SimilarityCalculator")) 97 Parameters.Add(new ValueLookupParameter<ISolutionSimilarityCalculator>("SimilarityCalculator", "The similarity calculator that should be used to calculate solution similarity.")); 98 #endregion 92 99 } 93 100 … … 98 105 var storedOffspringScope = new Scope(); 99 106 storedOffspringScope.SubScopes.AddRange(OffspringList); 100 var similarityMatrix = SimilarityCalculator .CalculateSolutionCrowdSimilarity(CurrentScope, storedOffspringScope);107 var similarityMatrix = SimilarityCalculatorParameter.ActualValue.CalculateSolutionCrowdSimilarity(CurrentScope, storedOffspringScope); 101 108 102 109 var createdOffspring = CurrentScope.SubScopes.ToArray(); -
trunk/sources/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs
r12012 r12069 394 394 RAPGAMainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name; 395 395 RAPGAMainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName; 396 foreach (ISimilarityBasedOperator op in RAPGAMainLoop.OperatorGraph.Operators.OfType<ISimilarityBasedOperator>())397 op.SimilarityCalculator = SimilarityCalculator;398 396 } 399 397 private void ParameterizeStochasticOperator(IOperator op) {
Note: See TracChangeset
for help on using the changeset viewer.