Context Navigation

/branches/Algorithms.GradientDescent (added)	merged: 5516,5518,5520
/branches/ScatterSearch (trunk integration) (added)	merged: 7787,7789,7793,7806,7815,7821-7822,7954,8086,8171,8299,8303-8307,8319-8320,8322,8327-8328,8331-8332
/trunk/sources	merged: 8208-8212,8220-8226,8231,8233,8238,8240-8241,8245-8246,8252-8256,8280,8282-8283,8288-8289,8295-8296,8298,8309-8311,8317,8323-8325,8333-8335,8338-8346,8348,8351,8353,8355,8357-8358,8361,8363-8364,8366-8368,8371-8372,8375,8380-8381,8386,8396-8399,8401,8403-8405,8413,8416-8419,8421,8433,8435,8439,8448,8452-8453,8455,8463-8465,8467,8469,8471,8473-8476,8478,8482,8484-8485,8489,8491,8493-8495,8497,8523,8528,8530-8531,8533,8536,8542-8543,8547-8554,8559-8568,8571,8573,8575,8577-8578,8580-8584,8587-8588,8592-8602,8604-8621,8623-8625,8628,8630,8632-8635

branches/GP-MoveOperators/HeuristicLab.Algorithms.DataAnalysis/3.4

Property svn:ignore

-                      r7259
+                      r8660
       return matrix;
+    }
+    public static double[,] PrepareAndScaleInputMatrix(Dataset dataset, IEnumerable<string> variables, IEnumerable<int> rows, Scaling scaling) {
+      List<string> variablesList = variables.ToList();
+      List<int> rowsList = rows.ToList();
+      double[,] matrix = new double[rowsList.Count, variablesList.Count];
+      int col = 0;
+      foreach (string column in variables) {
+        var values = scaling.GetScaledValues(dataset, column, rows);
+        int row = 0;
+        foreach (var value in values) {
+          matrix[row, col] = value;
+          row++;
+        }
+        col++;
+      }
+      return matrix;
+    }
+  }
+}

r8206	r8660
111	111	IClassificationProblemData problemData,
112	112	IEnumerable<int> rows) {
113		return new SymbolicDiscriminantFunctionClassificationModel(tree, interpreter);
	113	var model = new SymbolicDiscriminantFunctionClassificationModel(tree, interpreter, new AccuracyMaximizationThresholdCalculator());
	114	model.RecalculateModelParameters(problemData, rows);
	115	return model;
114	116	}
115	117	}

r7259	r8660
109	109
110	110	public MultinomialLogitClassificationSolution CreateClassificationSolution(IClassificationProblemData problemData) {
111		return new MultinomialLogitClassificationSolution(~~problemData~~, this);
	111	return new MultinomialLogitClassificationSolution(new ClassificationProblemData(problemData), this);
112	112	}
113	113	IClassificationSolution IClassificationModel.CreateClassificationSolution(IClassificationProblemData problemData) {

Note: See TracChangeset for help on using the changeset viewer.