Changeset 4502

Timestamp:

09/26/10 18:31:37 (14 years ago)

Author:

swinkler

Message:

Worked on population diversity analyzer for TSP: Implemented storing of population diversity result details in a specialized data structure and the algorithm's results collection. (#1188)

Location:

branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman/3.3

Files:

• Analyzers/TSPPopulationDiversityAnalysisDetails.cs (added)
• Analyzers/TSPPopulationDiversityAnalyzer.cs (modified) (7 diffs)
• HeuristicLab.Problems.TravelingSalesman-3.3.csproj (modified) (1 diff)

branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPPopulationDiversityAnalyzer.cs

@@ -44 +44 @@
     // - iterations sampling
     // - view
-    // - implement data structure for population diversity details
+    // - extract population diversity basic behavior into separate project
 
     public const string PermutationKey = "Permutation";
@@ -58 +58 @@
     public ValueParameter<BoolValue> StoreCompleteHistoryParameter {
       get { return (ValueParameter<BoolValue>)Parameters[StoreCompleteHistoryKey]; }
-    }
-
-    public const string SimilaritiesKey = "Similarities";
-    public ValueParameter<ItemList<DoubleMatrix>> SimilaritiesParameter {
-      get { return (ValueParameter<ItemList<DoubleMatrix>>)Parameters[SimilaritiesKey]; }
-    }
-    public const string MaximumSimilaritiesKey = "MaximumSimilarities";
-    public ValueParameter<ItemList<DoubleArray>> MaximumSimilaritiesParameter {
-      get { return (ValueParameter<ItemList<DoubleArray>>)Parameters[MaximumSimilaritiesKey]; }
     }
 
@@ -73 +64 @@
     public const string CurrentAverageMaximumSimilarityKey = "Current Average Maximum Population Similarity";
     public const string AverageMaximumSimilarityProgressKey = "Average Maximum Population Similarity Progress";
+    public const string PopulationDiversityAnalysisResultsDetailsKey = "Population Diversity Analysis Results Details";
 
     public const string ResultsKey = "Results";
@@ -85 +77 @@
       Parameters.Add(new ValueParameter<BoolValue>(StoreCompleteHistoryKey, "Flag that denotes whether the complete history of similarity values shall be stored.", new BoolValue(true)));
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The results collection in which the population diversity analysis results should be stored."));
-
-      Parameters.Add(new ValueParameter<ItemList<DoubleMatrix>>(SimilaritiesKey, "The similarities of the TSP solutions which should be analyzed."));
-      Parameters.Add(new ValueParameter<ItemList<DoubleArray>>(MaximumSimilaritiesKey, "The maximum similarities of the TSP solutions which should be analyzed."));
     }
 
@@ -121 +110 @@
         edges[i] = CalculateEdgesVector(permutationsArray[i]);
 
-      DoubleMatrix similarities = new DoubleMatrix(cities, cities);
-      DoubleArray maxSimilarities = new DoubleArray(cities);
+      double[,] similarities = new double[cities, cities];
+      double[] maxSimilarities = new double[cities];
       double avgSimilarity = 0;
       int n = 0;
@@ -142 +131 @@
       DoubleValue averageSimilarity = new DoubleValue(avgSimilarity / n);
 
-      if (SimilaritiesParameter.Value == null) {
-        SimilaritiesParameter.Value = new ItemList<DoubleMatrix>();
-        MaximumSimilaritiesParameter.Value = new ItemList<DoubleArray>();
-      }
-      if (!StoreCompleteHistoryParameter.Value.Value && SimilaritiesParameter.Value.Count > 0) {
-        SimilaritiesParameter.Value[SimilaritiesParameter.Value.Count - 1] = null;
-        MaximumSimilaritiesParameter.Value[MaximumSimilaritiesParameter.Value.Count - 1] = null;
-      }
-      SimilaritiesParameter.Value.Add(similarities);
-      MaximumSimilaritiesParameter.Value.Add(maxSimilarities);
-
       #region Store average similarity values
       if (results.ContainsKey(CurrentAverageSimilarityKey))
@@ -178 +156 @@
         averageMaximumSimilarityProgressDataTable.Rows.Add(new Analysis.DataRow(AverageMaximumSimilarityProgressKey));
       averageMaximumSimilarityProgressDataTable.Rows[AverageMaximumSimilarityProgressKey].Values.Add(averageMaximumSimilarity.Value);
+      #endregion
+      #region Store details
+      TSPPopulationDiversityAnalysisDetails details;
+      if (!results.ContainsKey(PopulationDiversityAnalysisResultsDetailsKey)) {
+        details = new TSPPopulationDiversityAnalysisDetails();
+        results.Add(new Result(PopulationDiversityAnalysisResultsDetailsKey, details));
+      } else {
+        details = (TSPPopulationDiversityAnalysisDetails)(results[PopulationDiversityAnalysisResultsDetailsKey].Value);
+      }
+      details.AverageSimilarities.Add(averageSimilarity.Value);
+      details.AverageMaximumSimilarities.Add(averageMaximumSimilarity.Value);
+      details.Similarities.Add(similarities);
+      details.MaximumSimilarities.Add(maxSimilarities);
+      if (!StoreCompleteHistoryParameter.Value.Value && details.Similarities.Count > 1) {
+        details.Similarities[details.Similarities.Count - 1] = null;
+        details.MaximumSimilarities[details.MaximumSimilarities.Count - 1] = null;
+      }
       #endregion
 

branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

@@ -154 +154 @@
   <ItemGroup>
     <Compile Include="Analyzers\BestTSPSolutionAnalyzer.cs" />
+    <Compile Include="Analyzers\TSPPopulationDiversityAnalysisDetails.cs" />
     <Compile Include="Analyzers\TSPPopulationDiversityAnalyzer.cs" />
     <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />