Changeset 8406

Timestamp:

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

Author:

jkarder

Message:

#1247:

• added similarity calculators
• adjusted event handling
• reformatted code

Location:

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3

Files:

• ExpressionEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.RAPGA-3.3.csproj (modified) (1 diff)
• OffspringRestorer.cs (modified) (2 diffs)
• ProgressiveOffspringPreserver.cs (modified) (2 diffs)
• RAPGA.cs (modified) (3 diffs)
• SimilarityCalculator (added)
• SimilarityCalculator/BlindSimilarityCalculator.cs (added)
• SimilarityCalculator/QualitySimilarityCalculator.cs (added)

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

@@ -1 +1 @@
 #region License Information
-
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -19 +18 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-
 #endregion
 

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/HeuristicLab.Algorithms.RAPGA-3.3.csproj

@@ -104 +104 @@
     <Compile Include="OffspringRestorer.cs" />
     <Compile Include="ProgressiveOffspringPreserver.cs" />
+    <Compile Include="SimilarityCalculator\BlindSimilarityCalculator.cs" />
+    <Compile Include="SimilarityCalculator\QualitySimilarityCalculator.cs" />
     <Compile Include="RAPGA.cs" />
     <Compile Include="RAPGAMainLoop.cs" />

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

@@ -1 +1 @@
 #region License Information
-
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -19 +18 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-
 #endregion
 

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

@@ -1 +1 @@
 #region License Information
-
 /* HeuristicLab
  * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
@@ -19 +18 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-
 #endregion
 

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);