Changeset 14742 for branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/TSNE.cs

Timestamp:

03/10/17 08:37:27 (7 years ago)

Author:

bwerth

Message:

#2700 fixed displaying of randomly generated seed and some minor code simplifications

File:

• branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/TSNE.cs (modified) (5 diffs)

branches/TSNE/HeuristicLab.Algorithms.DataAnalysis/3.4/TSNE/TSNE.cs

@@ -132 +132 @@
       this.results = results;
       this.dataRowLookup = dataRowLookup;
-      if (dataRows != null)
-        this.dataRows = dataRows;
+      if (dataRows != null) this.dataRows = dataRows;
       else { this.dataRows = new Dictionary<string, ScatterPlotDataRow>(); }
     }
@@ -200 +199 @@
 
     private void SetUpResults(IReadOnlyCollection<T> data) {
-      if (dataRowLookup == null) {
-        dataRowLookup = new Dictionary<string, List<int>>();
-        dataRowLookup.Add("Data", Enumerable.Range(0, data.Count).ToList());
-      }
+      if (dataRowLookup == null) dataRowLookup = new Dictionary<string, List<int>> { { "Data", Enumerable.Range(0, data.Count).ToList() } };
       if (results == null) return;
+
       if (!results.ContainsKey(IterationResultName)) results.Add(new Result(IterationResultName, new IntValue(0)));
       else ((IntValue)results[IterationResultName].Value).Value = 0;
@@ -216 +213 @@
       var plot = results[ErrorPlotResultName].Value as DataTable;
       if (plot == null) throw new ArgumentException("could not create/access Error-DataTable in Results-Collection");
-      if (!plot.Rows.ContainsKey("errors")) {
-        plot.Rows.Add(new DataRow("errors"));
-      }
+
+      if (!plot.Rows.ContainsKey("errors")) plot.Rows.Add(new DataRow("errors"));
       plot.Rows["errors"].Values.Clear();
+
       results.Add(new Result(ScatterPlotResultName, "Plot of the projected data", new ScatterPlot(DataResultName, "")));
       results.Add(new Result(DataResultName, "Projected Data", new DoubleMatrix()));
@@ -245 +242 @@
     private void FillScatterPlot(double[,] lowDimData, ScatterPlot plot) {
       foreach (var rowName in dataRowLookup.Keys) {
-        if (!plot.Rows.ContainsKey(rowName)) {
+        if (!plot.Rows.ContainsKey(rowName))
           plot.Rows.Add(dataRows.ContainsKey(rowName) ? dataRows[rowName] : new ScatterPlotDataRow(rowName, "", new List<Point2D<double>>()));
-        }
-        //else plot.Rows[rowName].Points.Clear();
         plot.Rows[rowName].Points.Replace(dataRowLookup[rowName].Select(i => new Point2D<double>(lowDimData[i, 0], lowDimData[i, 1])));
-        //plot.Rows[rowName].Points.AddRange();
       }
     }
@@ -503 +497 @@
       tree.ComputeEdgeForces(rowP, colP, valP, n, posF);
       var row = new double[d];
-      for (int n1 = 0; n1 < n; n1++) {
+      for (var n1 = 0; n1 < n; n1++) {
         Buffer.BlockCopy(negF, (sizeof(double) * n1 * d), row, 0, d);
         tree.ComputeNonEdgeForces(n1, theta, row, sumQ);