[mlpack-git] master: WIP: commit missing data file (347fe8a)

[gitdub at big.cc.gt.atl.ga.us]

Repository : https://github.com/mlpack/mlpack

On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/904762495c039e345beba14c1142fd719b3bd50e...f94823c800ad6f7266995c700b1b630d5ffdcf40

>---------------------------------------------------------------

commit 347fe8afbdf0da49c18131f6fdf75c27435ff296
Author: Stephen Tu <tu.stephenl at gmail.com>
Date:   Thu Jan 15 18:21:19 2015 -0800

    WIP: commit missing data file


>---------------------------------------------------------------

347fe8afbdf0da49c18131f6fdf75c27435ff296
 src/mlpack/tests/data/r10.txt             | 10 ++++++++++
 src/mlpack/tests/sdp_primal_dual_test.cpp |  8 ++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/mlpack/tests/data/r10.txt b/src/mlpack/tests/data/r10.txt
new file mode 100644
index 0000000..a43f255
--- /dev/null
+++ b/src/mlpack/tests/data/r10.txt
@@ -0,0 +1,10 @@
+2.388061771742711503e+00 -7.998843946705324059e-01 0.000000000000000000e+00 -6.055455953973358785e-01 -8.978447303086828368e-01 -8.478705136616015992e-02 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00
+-7.998843946705324059e-01 3.426145759425113901e+00 -1.638176200441511243e-01 0.000000000000000000e+00 -4.796520189361042075e-01 -7.078326540851567206e-01 -9.383403917548253093e-01 -3.366186799343440228e-01 0.000000000000000000e+00 0.000000000000000000e+00
+0.000000000000000000e+00 -1.638176200441511243e-01 1.048508772479271434e+00 -8.846911524351203093e-01 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00
+-6.055455953973358785e-01 0.000000000000000000e+00 -8.846911524351203093e-01 2.023397783192608657e+00 -5.331610353601525798e-01 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00
+-8.978447303086828368e-01 -4.796520189361042075e-01 0.000000000000000000e+00 -5.331610353601525798e-01 2.697683931814737868e+00 -5.616838162810112722e-01 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 -2.253423309287867493e-01
+-8.478705136616015992e-02 -7.078326540851567206e-01 0.000000000000000000e+00 0.000000000000000000e+00 -5.616838162810112722e-01 2.784761835214184078e+00 -5.704882222059795005e-01 0.000000000000000000e+00 0.000000000000000000e+00 -8.599700912758765359e-01
+0.000000000000000000e+00 -9.383403917548253093e-01 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 -5.704882222059795005e-01 1.890408204565853900e+00 -3.815795906050489794e-01 0.000000000000000000e+00 0.000000000000000000e+00
+0.000000000000000000e+00 -3.366186799343440228e-01 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 -3.815795906050489794e-01 7.410893491077712447e-01 -2.289107856837824251e-02 0.000000000000000000e+00
+0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 -2.289107856837824251e-02 2.289107856837824251e-02 0.000000000000000000e+00
+0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 -2.253423309287867493e-01 -8.599700912758765359e-01 0.000000000000000000e+00 0.000000000000000000e+00 0.000000000000000000e+00 1.085312422204663285e+00
diff --git a/src/mlpack/tests/sdp_primal_dual_test.cpp b/src/mlpack/tests/sdp_primal_dual_test.cpp
index bd4ff16..14e2213 100644
--- a/src/mlpack/tests/sdp_primal_dual_test.cpp
+++ b/src/mlpack/tests/sdp_primal_dual_test.cpp
@@ -44,7 +44,7 @@ class UndirectedGraph
   static void LoadFromEdges(UndirectedGraph& g,
                             const std::string& edgesFilename)
   {
-    data::Load(edgesFilename, g.edges, true);
+    data::Load(edgesFilename, g.edges, true, false);
     if (g.edges.n_rows != 2)
       Log::Fatal << "Invalid datafile" << std::endl;
     g.weights.ones(g.edges.n_cols);
@@ -55,10 +55,10 @@ class UndirectedGraph
                                       const std::string& edgesFilename,
                                       const std::string& weightsFilename)
   {
-    data::Load(edgesFilename, g.edges, true);
+    data::Load(edgesFilename, g.edges, true, false);
     if (g.edges.n_rows != 2)
       Log::Fatal << "Invalid datafile" << std::endl;
-    data::Load(weightsFilename, g.weights);
+    data::Load(weightsFilename, g.weights, true, false);
     if (g.weights.n_elem != g.edges.n_cols)
       Log::Fatal << "Size mismatch" << std::endl;
     g.ComputeVertices();
@@ -142,7 +142,7 @@ static inline SDP
 ConstructMaxCutSDPFromLaplacian(const std::string& laplacianFilename)
 {
   arma::mat laplacian;
-  data::Load(laplacianFilename, laplacian, false);
+  data::Load(laplacianFilename, laplacian, true, false);
   if (laplacian.n_rows != laplacian.n_cols)
     Log::Fatal << "laplacian not square" << std::endl;
   SDP sdp(laplacian.n_rows, laplacian.n_rows, 0);