Changeset 13496 for branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/DiversificationStatisticsOperator.cs

Timestamp:

01/11/16 21:29:25 (8 years ago)

Author:

bburlacu

Message:

#1772: Update diversification operators (add extra evaluations to the evaluation counter, add the option for strict schema matching, add additional replacement ratio update rules.

File:

• branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/DiversificationStatisticsOperator.cs (modified) (5 diffs)

branches/HeuristicLab.EvolutionTracking/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tracking/SchemaDiversification/DiversificationStatisticsOperator.cs

@@ -38 +38 @@
     private const string ResultCollectionParameterName = "Results";
     private const string EvaluatedSolutionsParameterName = "EvaluatedSolutions";
+
+    private readonly object locker = new object();
 
     public ILookupParameter<IntValue> NumberOfChangedTreesParameter {
@@ -83 +85 @@
         table = new DataTable();
         results.Add(new Result("NumberOfChangedTrees", table));
-        var row = new DataRow("Changed trees");
+        var row = new DataRow("Changed trees") { VisualProperties = { StartIndexZero = true } };
         table.Rows.Add(row);
       }
@@ -89 +91 @@
         table = new DataTable();
         results.Add(new Result("AverageSchemaLength", table));
-        var row = new DataRow("Average schema length");
+        var row = new DataRow("Average schema length") { VisualProperties = { StartIndexZero = true } };
         table.Rows.Add(row);
       }
@@ -95 +97 @@
         table = new DataTable();
         results.Add(new Result("NumberOfSchemas", table));
-        var row = new DataRow("Number of schemas");
+        var row = new DataRow("Number of schemas") { VisualProperties = { StartIndexZero = true } };
         table.Rows.Add(row);
       }
@@ -101 +103 @@
         table = new DataTable();
         results.Add(new Result("EvaluatedSolutionsPerGeneration", table));
-        var row = new DataRow("Evaluated solutions");
+        var row = new DataRow("Evaluated solutions") { VisualProperties = { StartIndexZero = true } };
         table.Rows.Add(row);
         row.Values.Add(0);
       }
 
-      var evaluatedSolutions = EvaluatedSolutionsParameter.ActualValue.Value - evaluatedSolutionsTracker;
+      lock (locker) {
+        // count the extra evaluations performed after diversification
+        EvaluatedSolutionsParameter.ActualValue.Value += NumberOfChangedTreesParameter.ActualValue.Value;
+      }
+
+      var evaluatedSolutions = EvaluatedSolutionsParameter.ActualValue.Value;
+      if (evaluatedSolutions > 0)
+        evaluatedSolutions -= evaluatedSolutionsTracker;
       ((DataTable)results["NumberOfChangedTrees"].Value).Rows["Changed trees"].Values.Add(NumberOfChangedTreesParameter.ActualValue.Value);
       ((DataTable)results["AverageSchemaLength"].Value).Rows["Average schema length"].Values.Add(AverageSchemaLengthParameter.ActualValue.Value);