Changeset 8406 for branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs

Timestamp:

08/03/12 11:09:17 (12 years ago)

Author:

jkarder

Message:

#1247:

• added similarity calculators
• adjusted event handling
• reformatted code

File:

• branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs (modified) (3 diffs)

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs

@@ -322 +322 @@
       base.Problem_OperatorsChanged(sender, e);
     }
-    void BatchSizeParameter_ValueChanged(object sender, EventArgs e) {
+    private void SimilarityCalculatorParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeRAPGAMainLoop();
+    }
+    private void BatchSizeParameter_ValueChanged(object sender, EventArgs e) {
       BatchSize.ValueChanged += new EventHandler(BatchSize_ValueChanged);
       ParameterizeSelectors();
     }
-    void BatchSize_ValueChanged(object sender, EventArgs e) {
+    private void BatchSize_ValueChanged(object sender, EventArgs e) {
       ParameterizeSelectors();
     }
@@ -359 +362 @@
       BatchSizeParameter.ValueChanged += new EventHandler(BatchSizeParameter_ValueChanged);
       BatchSize.ValueChanged += new EventHandler(BatchSize_ValueChanged);
+      SimilarityCalculatorParameter.ValueChanged += new EventHandler(SimilarityCalculatorParameter_ValueChanged);
       if (Problem != null) {
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -472 +476 @@
       ISolutionSimilarityCalculator defaultSimilarityCalculator = Problem.Operators.OfType<ISolutionSimilarityCalculator>().FirstOrDefault();
 
+      SimilarityCalculatorParameter.ValidValues.Add(new BlindSimilarityCalculator());
+      SimilarityCalculatorParameter.ValidValues.Add(new QualitySimilarityCalculator());
+
       foreach (ISolutionSimilarityCalculator similarityCalculator in Problem.Operators.OfType<ISolutionSimilarityCalculator>())
         SimilarityCalculatorParameter.ValidValues.Add(similarityCalculator);