Changeset 9418

Timestamp:

05/02/13 13:15:07 (12 years ago)

Author:

ascheibe

Message:

#1886

• changed duplicate solutions analyzer to also track avg. diversity as the standard diversity analyzer needs too much memory
• fixed project references of eslGA

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• HeuristicLab.Algorithms.ESLimitedGA/3.3/HeuristicLab.Algorithms.ESLimitedGA-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/DuplicateSolutionsAnalyzer.cs (modified) (6 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Algorithms.ESLimitedGA/3.3/HeuristicLab.Algorithms.ESLimitedGA-3.3.csproj

@@ -103 +103 @@
     <Reference Include="HeuristicLab.Analysis-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Common-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Core-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Data-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Operators-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Optimization-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Optimization.Operators-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Persistence-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Random-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Random-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="HeuristicLab.Selection-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/DuplicateSolutionsAnalyzer.cs

@@ -21 +21 @@
 
 
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -59 +60 @@
 
     [Storable]
-    private DataTableHelper chartingHelper;
+    private DataTableHelper chartingHelper, similarityChartHelper;
     #endregion
 
@@ -68 +69 @@
       : base(original, cloner) {
       chartingHelper = (DataTableHelper)original.chartingHelper.Clone(cloner);
+      similarityChartHelper = (DataTableHelper)original.similarityChartHelper.Clone(cloner);
     }
 
@@ -77 +79 @@
 
       chartingHelper = new DataTableHelper();
+      similarityChartHelper = new DataTableHelper();
     }
 
@@ -88 +91 @@
       }
       chartingHelper.InitializeChart(Results, "Duplicate Solutions", new string[] { "Duplicate Solutions per Generation" });
+      similarityChartHelper.InitializeChart(Results, "Average Similarity", new string[] { "Avg. Similarity per Generation" });
 
       var similarities = SimilarityCalculatorParameter.Value.CalculateSolutionCrowdSimilarity(ExecutionContext.Scope);
+      List<double> similaritiesArr = new List<double>();
       int counter = 0;
       for (int i = 0; i < similarities.Length; i++) {
@@ -98 +103 @@
           }
         }
+        for (int j = 0; j < similarities[i].Length; j++) {
+          if (i != j) {
+            similaritiesArr.Add(similarities[i][j]);
+          }
+        }
       }
 
+      similarityChartHelper.AddPoint(similaritiesArr.Average());
       chartingHelper.AddPoint(counter / (double)similarities.Length);
       return base.Apply();