Changeset 4547

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)

Location:

branches/HeuristicLab.DiversityAnalysis

Files:

• HeuristicLab.Problems.TravelingSalesman.Views/3.3/HeuristicLab.Problems.TravelingSalesman.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPPopulationDiversityAnalysisDetailsView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPPopulationDiversityAnalysisDetailsView.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPPopulationDiversityAnalysisDetailsView.resx (added)
• HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPPopulationDiversityAnalysisDetails.cs (modified) (2 diffs)

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

@@ -221 +221 @@
       <DependentUpon>TravelingSalesmanProblemView.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="TSPPopulationDiversityAnalysisDetailsView.resx">
+      <DependentUpon>TSPPopulationDiversityAnalysisDetailsView.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPPopulationDiversityAnalysisDetailsView.Designer.cs

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-      components = new System.ComponentModel.Container();
+      this.parameterCollectionView = new HeuristicLab.Core.Views.ParameterCollectionView();
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
+      this.SuspendLayout();
+      // 
+      // nameTextBox
+      // 
+      this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
+      this.errorProvider.SetIconPadding(this.nameTextBox, 2);
+      this.nameTextBox.Size = new System.Drawing.Size(610, 20);
+      // 
+      // descriptionTextBox
+      // 
+      this.descriptionTextBox.Size = new System.Drawing.Size(610, 20);
+      // 
+      // parameterCollectionView
+      // 
+      this.parameterCollectionView.Caption = "ParameterCollection View";
+      this.parameterCollectionView.Content = null;
+      this.parameterCollectionView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.parameterCollectionView.Location = new System.Drawing.Point(0, 0);
+      this.parameterCollectionView.Name = "parameterCollectionView";
+      this.parameterCollectionView.ReadOnly = true;
+      this.parameterCollectionView.Size = new System.Drawing.Size(682, 350);
+      this.parameterCollectionView.TabIndex = 5;
+      // 
+      // TSPPopulationDiversityAnalysisDetailsView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.parameterCollectionView);
+      this.Name = "TSPPopulationDiversityAnalysisDetailsView";
+      this.Size = new System.Drawing.Size(682, 350);
+      this.Controls.SetChildIndex(this.nameLabel, 0);
+      this.Controls.SetChildIndex(this.descriptionLabel, 0);
+      this.Controls.SetChildIndex(this.nameTextBox, 0);
+      this.Controls.SetChildIndex(this.descriptionTextBox, 0);
+      this.Controls.SetChildIndex(this.parameterCollectionView, 0);
+      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).EndInit();
+      this.ResumeLayout(false);
+      this.PerformLayout();
+
     }
 
     #endregion
+
+    private Core.Views.ParameterCollectionView parameterCollectionView;
   }
 }

branches/HeuristicLab.DiversityAnalysis/HeuristicLab.Problems.TravelingSalesman.Views/3.3/TSPPopulationDiversityAnalysisDetailsView.cs

@@ -42 +42 @@
     }
 
+    protected override void DeregisterContentEvents() {
+      base.DeregisterContentEvents();
+    }
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+    }
+
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+      if (Content == null) {
+        parameterCollectionView.Content = null;
+      } else {
+        parameterCollectionView.Content = ((IParameterizedNamedItem)Content).Parameters;
+      }
+    }
+
   }
 

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>()));
     }