Changeset 4547 for branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers

Timestamp:

10/01/10 22:09:11 (14 years ago)

Author:

swinkler

Message:

Corrected storing of detail data for population diversity analysis, updated details view. (#1188)

File:

• branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPPopulationDiversityAnalysisDetails.cs (modified) (2 diffs)

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

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Problems.TravelingSalesman {
@@ -32 +33 @@
   [Item("TSPPopulationDiversityAnalysisDetails", "A class for storing details of population diversity analysis results.")]
   [StorableClass]
-  public class TSPPopulationDiversityAnalysisDetails : NamedItem {
+  public class TSPPopulationDiversityAnalysisDetails : ParameterizedNamedItem {
 
-    [Storable]
-    private ItemList<DoubleValue> averageSimilarities;
+    public static string AverageSimilaritiesKey = "AverageSimilarities";
+    public ValueParameter<ItemList<DoubleValue>> AverageSimilaritiesParameter {
+      get { return (ValueParameter<ItemList<DoubleValue>>)Parameters[AverageSimilaritiesKey]; }
+    }
     public ItemList<DoubleValue> AverageSimilarities {
-      get { return averageSimilarities; }
-    }
-    [Storable]
-    private ItemList<DoubleValue> averageMaximumSimilarities;
-    public ItemList<DoubleValue> AverageMaximumSimilarities {
-      get { return averageMaximumSimilarities; }
+      get { return AverageSimilaritiesParameter.Value; }
     }
 
-    [Storable]
-    private ItemList<DoubleMatrix> similarities;
+    public static string AverageMaximumSimilaritiesKey = "AverageMaximumSimilarities";
+    public ValueParameter<ItemList<DoubleValue>> AverageMaximumSimilaritiesParameter {
+      get { return (ValueParameter<ItemList<DoubleValue>>)Parameters[AverageMaximumSimilaritiesKey]; }
+    }
+    public ItemList<DoubleValue> AverageMaximumSimilarities {
+      get { return AverageMaximumSimilaritiesParameter.Value; }
+    }
+
+    public static string SimilaritiesKey = "Similarities";
+    public ValueParameter<ItemList<DoubleMatrix>> SimilaritiesParameter {
+      get { return (ValueParameter<ItemList<DoubleMatrix>>)Parameters[SimilaritiesKey]; }
+    }
     public ItemList<DoubleMatrix> Similarities {
-      get { return similarities; }
+      get { return SimilaritiesParameter.Value; }
     }
-    [Storable]
-    private ItemList<DoubleArray> maximumSimilarities;
+
+    public static string MaximumSimilaritiesKey = "MaximumSimilarities";
+    public ValueParameter<ItemList<DoubleArray>> MaximumSimilaritiesParameter {
+      get { return (ValueParameter<ItemList<DoubleArray>>)Parameters[MaximumSimilaritiesKey]; }
+    }
     public ItemList<DoubleArray> MaximumSimilarities {
-      get { return maximumSimilarities; }
+      get { return MaximumSimilaritiesParameter.Value; }
     }
 
     public TSPPopulationDiversityAnalysisDetails()
         : base() {
-      averageSimilarities = new ItemList<DoubleValue>();
-      averageMaximumSimilarities = new ItemList<DoubleValue>();
-      similarities = new ItemList<DoubleMatrix>();
-      maximumSimilarities = new ItemList<DoubleArray>();
+      Parameters.Add(new ValueParameter<ItemList<DoubleValue>>(AverageSimilaritiesKey, "Average similarities of the solutions of the population.", new ItemList<DoubleValue>()));
+      Parameters.Add(new ValueParameter<ItemList<DoubleValue>>(AverageMaximumSimilaritiesKey, "Average maximum similarities of the solutions of the population.", new ItemList<DoubleValue>()));
+      Parameters.Add(new ValueParameter<ItemList<DoubleMatrix>>(SimilaritiesKey, "Similarities of the solutions of the population.", new ItemList<DoubleMatrix>()));
+      Parameters.Add(new ValueParameter<ItemList<DoubleArray>>(MaximumSimilaritiesKey, "Maximum similarities of the solutions of the population.", new ItemList<DoubleArray>()));
     }