Changeset 11841 for branches/VOSGA/HeuristicLab.Algorithms.VOffspringSelectionGeneticAlgorithm

Timestamp:

01/30/15 15:04:20 (10 years ago)

Author:

ascheibe

Message:

#2267 improved chart

File:

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

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

@@ -79 +79 @@
     private const string divDataRowName = "DiversitySuccessCount";
     private const string qualityDataRowName = "QualitySuccessCount";
+    private const string divFailDataRowName = "DiversityFailCount";
+    private const string qualityFailDataRowName = "QualityFailCount";
     private const string overallCountDataRowName = "OverallCount";
     private const string successCountDataRowName = "SuccessCount";
@@ -88 +90 @@
     [Storable]
     private int qualityCount;
+    [Storable]
+    private int badQualityCount;
+    [Storable]
+    private int badDivCount;
     [Storable]
     private int overallCount;
@@ -103 +109 @@
       overallCount = original.overallCount;
       successCount = original.successCount;
+      badDivCount = original.badDivCount;
+      badQualityCount = original.badQualityCount;
     }
     public WeightedParentsDiversityComparator()
@@ -171 +179 @@
         spDetailsTable.Rows.Add(new DataRow(overallCountDataRowName));
         spDetailsTable.Rows.Add(new DataRow(successCountDataRowName));
+        spDetailsTable.Rows.Add(new DataRow(divFailDataRowName));
+        spDetailsTable.Rows.Add(new DataRow(qualityFailDataRowName));
         ResultsParameter.ActualValue.Add(new Result(spDetailsParameterName, spDetailsTable));
       }
@@ -183 +193 @@
         spDetailsTable.Rows[successCountDataRowName].Values.Add(successCount);
         successCount = 0;
+        spDetailsTable.Rows[qualityFailDataRowName].Values.Add(badQualityCount);
+        badQualityCount = 0;
+        spDetailsTable.Rows[divFailDataRowName].Values.Add(badDivCount);
+        badDivCount = 0;
         currentGeneration = GenerationsParameter.ActualValue.Value;
       }
@@ -212 +226 @@
       if (result) {
         qualityCount++;
+      } else {
+        badQualityCount++;
       }
       if (resultDiversity) {
         divCount++;
+      } else {
+        badDivCount++;
       }
       if (result && resultDiversity) {