Changeset 11824 for branches

Timestamp:

01/26/15 16:15:11 (10 years ago)

Author:

ascheibe

Message:

#2267 added switch to turn off diversity as selection criteria but still generate the analysis chart

File:

• branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/WeightedParentsDiversityComparator.cs (modified) (4 diffs)

branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm/WeightedParentsDiversityComparator.cs

@@ -71 +71 @@
     public ILookupParameter<IntValue> GenerationsParameter {
       get { return (LookupParameter<IntValue>)Parameters["Generations"]; }
+    }
+    public ValueParameter<BoolValue> EnableDivCriteriaParameter {
+      get { return (ValueParameter<BoolValue>)Parameters["EnableDivCriteria"]; }
     }
 
@@ -114 +117 @@
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the population diversity analysis results should be stored."));
       Parameters.Add(new LookupParameter<IntValue>("Generations", "The current number of generations."));
+      Parameters.Add(new ValueParameter<BoolValue>("EnableDivCriteria", "Use diversity as additional offspring selection criteria.", new BoolValue(true)));
 
       foreach (IDiscreteDoubleValueModifier modifier in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name))
@@ -132 +136 @@
       if (!Parameters.ContainsKey("Results"))
         Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the population diversity analysis results should be stored."));
+      if (!Parameters.ContainsKey("EnableDivCriteria"))
+        Parameters.Add(new ValueParameter<BoolValue>("EnableDivCriteria", "Use diversity as additional offspring selection criteria.", new BoolValue(true)));
     }
 
@@ -203 +209 @@
       bool result = maximization && leftQuality > threshold || !maximization && leftQuality < threshold;
 
+      //collect statistics
       if (result) {
         qualityCount++;
       }
-
-      result = result && resultDiversity;
-
       if (resultDiversity) {
         divCount++;
       }
-      if (result) {
+      if (result && resultDiversity) {
         successCount++;
       }
       overallCount++;
+
+      //use diveristiy criteria or not
+      if (EnableDivCriteriaParameter.Value.Value) {
+        result = result && resultDiversity;
+      }
 
       BoolValue resultValue = ResultParameter.ActualValue;