Changeset 4544

Timestamp:

10/01/10 18:24:56 (14 years ago)

Author:

swinkler

Message:

Corrected types of the data stored in population diversity analysis. (#1188)

Location:

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

Files:

• TSPPopulationDiversityAnalysisDetails.cs (modified) (2 diffs)
• TSPPopulationDiversityAnalyzer.cs (modified) (2 diffs)

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

@@ -35 +35 @@
 
     [Storable]
-    private IList<double> averageSimilarities;
-    public IList<double> AverageSimilarities {
+    private ItemList<DoubleValue> averageSimilarities;
+    public ItemList<DoubleValue> AverageSimilarities {
       get { return averageSimilarities; }
     }
     [Storable]
-    private IList<double> averageMaximumSimilarities;
-    public IList<double> AverageMaximumSimilarities {
+    private ItemList<DoubleValue> averageMaximumSimilarities;
+    public ItemList<DoubleValue> AverageMaximumSimilarities {
       get { return averageMaximumSimilarities; }
     }
 
     [Storable]
-    private IList<double[,]> similarities;
-    public IList<double[,]> Similarities {
+    private ItemList<DoubleMatrix> similarities;
+    public ItemList<DoubleMatrix> Similarities {
       get { return similarities; }
     }
     [Storable]
-    private IList<double[]> maximumSimilarities;
-    public IList<double[]> MaximumSimilarities {
+    private ItemList<DoubleArray> maximumSimilarities;
+    public ItemList<DoubleArray> MaximumSimilarities {
       get { return maximumSimilarities; }
     }
@@ -58 +58 @@
     public TSPPopulationDiversityAnalysisDetails()
         : base() {
-      averageSimilarities = new List<double>();
-      averageMaximumSimilarities = new List<double>();
-      similarities = new List<double[,]>();
-      maximumSimilarities = new List<double[]>();
+      averageSimilarities = new ItemList<DoubleValue>();
+      averageMaximumSimilarities = new ItemList<DoubleValue>();
+      similarities = new ItemList<DoubleMatrix>();
+      maximumSimilarities = new ItemList<DoubleArray>();
     }
 

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

@@ -110 +110 @@
         edges[i] = CalculateEdgesVector(permutationsArray[i]);
 
-      double[,] similarities = new double[cities, cities];
-      double[] maxSimilarities = new double[cities];
+      DoubleMatrix similarities = new DoubleMatrix(cities, cities);
+      DoubleArray maxSimilarities = new DoubleArray(cities);
       double avgSimilarity = 0;
       int n = 0;
@@ -165 +165 @@
         details = (TSPPopulationDiversityAnalysisDetails)(results[PopulationDiversityAnalysisResultsDetailsKey].Value);
       }
-      details.AverageSimilarities.Add(averageSimilarity.Value);
-      details.AverageMaximumSimilarities.Add(averageMaximumSimilarity.Value);
+      details.AverageSimilarities.Add(averageSimilarity);
+      details.AverageMaximumSimilarities.Add(averageMaximumSimilarity);
       details.Similarities.Add(similarities);
       details.MaximumSimilarities.Add(maxSimilarities);