Changeset 4849

Timestamp:

11/19/10 13:43:32 (14 years ago)

Author:

gkronber

Message:

Reviewed classes AlleleFrequencyAnalyzer, TSPAlleleFrequencyAnalyzer, Allele, AlleleFrequencyCollection, AlleleFrequencyCollectionHistory, AlleleFrequencyView, AlleleFrequencyCollectionView, AlleleFrequencyCollectionHistoryView and MovieView and made some minor changes. #1234

Location:

trunk/sources

Files:

• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (2 diffs)
• HeuristicLab.Analysis/3.3/AlleleFrequencyAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPAlleleFrequencyAnalyzer.cs (modified) (1 diff)

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

@@ -282 +282 @@
             rowSeries.Points.Clear();
             FillSeriesWithRowValues(rowSeries, row);
-            //foreach (IndexedItem<double> item in e.Items) {
-            //  var value = item.Value;
-            //  DataPoint point = new DataPoint();
-            //  point.XValue = row.VisualProperties.StartIndexZero ? item.Index : item.Index + 1;
-            //  if (IsInvalidValue(item.Value))
-            //    point.IsEmpty = true;
-            //  else
-            //    point.YValues = new double[] { value };
-            //  rowSeries.Points.Add(point);
-            //}
             UpdateYCursorInterval();
           }
@@ -308 +298 @@
             rowSeries.Points.Clear();
             FillSeriesWithRowValues(rowSeries, row);
-            //List<DataPoint> points = new List<DataPoint>();
-            //foreach (IndexedItem<double> item in e.Items)
-            //  points.Add(rowSeries.Points[item.Index]);
-            //foreach (DataPoint point in points)
-            //  rowSeries.Points.Remove(point);
             UpdateYCursorInterval();
           }

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

@@ -107 +107 @@
         // calculate index of current best solution
         int bestIndex = -1;
-        if (!max) bestIndex = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
-        else bestIndex = qualities.Select((x, index) => new { index, x.Value }).OrderByDescending(x => x.Value).First().index;
+        if (!max) {
+          bestIndex = qualities
+            .Select((x, index) => new { index, x.Value })
+            .OrderBy(x => x.Value)
+            .First().index;
+        } else {
+          bestIndex = qualities
+            .Select((x, index) => new { index, x.Value })
+            .OrderByDescending(x => x.Value)
+            .First().index;
+        }
 
         // calculate allels of current best and (if available) best known solution

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Analyzers/TSPAlleleFrequencyAnalyzer.cs

@@ -45 +45 @@
     public TSPAlleleFrequencyAnalyzer()
       : base() {
-      Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities."));
+      Parameters.Add(new LookupParameter<DoubleMatrix>("Coordinates", "The x- and y-coordinates of the cities."));
     }