Changeset 4748

Timestamp:

11/09/10 00:47:06 (13 years ago)

Author:

swagner

Message:

Worked on population diversity analysis (#1188)

Location:

trunk/sources

Files:

• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (3 diffs)
• HeuristicLab.Analysis.Views/3.3/HeatMapView.cs (modified) (1 diff)
• HeuristicLab.Analysis/3.3/PopulationDiversityAnalyzer.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -129 +129 @@
       FillSeriesWithRowValues(series, row);
       chart.Series.Add(series);
+      chart.ChartAreas[0].RecalculateAxesScale();
       UpdateYCursorInterval();
     }
@@ -155 +156 @@
       if (invisibleSeries.Contains(series))
         invisibleSeries.Remove(series);
+      chart.ChartAreas[0].RecalculateAxesScale();
     }
 
@@ -258 +260 @@
         chart.Series[row.Name].YAxisType = row.VisualProperties.SecondYAxis ? AxisType.Secondary : AxisType.Primary;
         if (row.VisualProperties.Color != Color.Empty) chart.Series[row.Name].Color = row.VisualProperties.Color;
+        chart.ChartAreas[0].RecalculateAxesScale();
       }
     }

trunk/sources/HeuristicLab.Analysis.Views/3.3/HeatMapView.cs

@@ -119 +119 @@
       p.Color = GetDataPointColor(value, Content.Minimum, Content.Maximum, grayscaleCheckBox.Checked);
       p.MarkerStyle = MarkerStyle.Square;
-      //p.MarkerSize = 10;
-      //string nl = Environment.NewLine;
-      //p.ToolTip = string.Format("Row: {0}{3}Column: {1}{3}Value: {2}", index2, index1, value, nl);
       return p;
     }

trunk/sources/HeuristicLab.Analysis/3.3/PopulationDiversityAnalyzer.cs

@@ -187 +187 @@
           DataTable minAvgMaxSimilaritiesDataTable = new DataTable("Minimum/Average/Maximum Solution Similarities");
           minAvgMaxSimilaritiesDataTable.Rows.Add(new DataRow("Minimum Solution Similarity"));
-          minAvgMaxSimilaritiesDataTable.Rows["Minimum Solution Similarity"].VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Columns;
+          minAvgMaxSimilaritiesDataTable.Rows["Minimum Solution Similarity"].VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Points;
           minAvgMaxSimilaritiesDataTable.Rows["Minimum Solution Similarity"].Values.AddRange(minSimilarities);
           minAvgMaxSimilaritiesDataTable.Rows.Add(new DataRow("Average Solution Similarity"));
-          minAvgMaxSimilaritiesDataTable.Rows["Average Solution Similarity"].VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Columns;
+          minAvgMaxSimilaritiesDataTable.Rows["Average Solution Similarity"].VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Points;
           minAvgMaxSimilaritiesDataTable.Rows["Average Solution Similarity"].Values.AddRange(avgSimilarities);
           minAvgMaxSimilaritiesDataTable.Rows.Add(new DataRow("Maximum Solution Similarity"));
-          minAvgMaxSimilaritiesDataTable.Rows["Maximum Solution Similarity"].VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Columns;
+          minAvgMaxSimilaritiesDataTable.Rows["Maximum Solution Similarity"].VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Points;
           minAvgMaxSimilaritiesDataTable.Rows["Maximum Solution Similarity"].Values.AddRange(maxSimilarities);
           if (!results.ContainsKey("Minimum/Average/Maximum Solution Similarities")) {