Changeset 15484 for branches

Timestamp:

11/22/17 08:15:27 (7 years ago)

Author:

bwerth

Message:

#2850 changed data extraction

File:

• branches/Weighted TSNE/3.4/TSNE/TSNEAlgorithm.cs (modified) (2 diffs)

branches/Weighted TSNE/3.4/TSNE/TSNEAlgorithm.cs

@@ -285 +285 @@
         var allowedInputVariables = problemData.AllowedInputVariables.ToArray();
         var allindices = Problem.ProblemData.AllIndices.ToArray();
-        var data = allindices.Select(row => allowedInputVariables.Select(col => dataset.GetDoubleValue(col, row)).ToArray()).ToArray();
+        var data = Enumerable.Range(0, dataset.Rows).Select(x => new double[allowedInputVariables.Length]).ToArray();
+        var col = 0;
+        foreach (var s in allowedInputVariables) {
+          var row = 0;
+          foreach (var d in dataset.GetDoubleValues(s)) {
+            data[row][col] = d;
+            row++;
+          }
+          col++;
+        }
+
+        //data = allindices.Select(row => allowedInputVariables.Select(col => dataset.GetDoubleValue(col, row)).ToArray()).ToArray();
         if (Normalization) data = NormalizeInputData(data);
         state = TSNEStatic<double[]>.CreateState(data, DistanceFunction, random, NewDimensions, Perplexity, Theta, StopLyingIteration, MomentumSwitchIteration, InitialMomentum, FinalMomentum, Eta, RandomInitialization);
@@ -333 +344 @@
       foreach (var input in Problem.ProblemData.InputVariables) ClassesNameParameter.ValidValues.Add(input);
     }
+
     private void OnColumnsChanged(object sender, EventArgs e) {
       if (Problem == null || Problem.ProblemData == null || Problem.ProblemData.Dataset == null || !Parameters.ContainsKey(DistanceFunctionParameterName)) return;