[mlpack-git] master: resolve conflict (251c110)

[gitdub at mlpack.org]

Repository : https://github.com/mlpack/mlpack
On branch  : master
Link       : https://github.com/mlpack/mlpack/compare/a0b31abe5ff69117645c664dbeac1476dd5e48f7...2da9c5bac14a00145c757b8139c245913b86e034

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

commit 251c110cae7d43d6f8bad1c1dd13252f0d1b9119
Merge: 0977c1d 55567aa
Author: Keon Kim <kwk236 at gmail.com>
Date:   Sat Jun 18 16:37:29 2016 +0900

    resolve conflict


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

251c110cae7d43d6f8bad1c1dd13252f0d1b9119
 src/mlpack/core/data/binarize.hpp  | 12 ++++++------
 src/mlpack/tests/binarize_test.cpp | 38 +++++++++++++++++++-------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --cc src/mlpack/tests/binarize_test.cpp
index 8a98af4,654f1c7..d0488a2
--- a/src/mlpack/tests/binarize_test.cpp
+++ b/src/mlpack/tests/binarize_test.cpp
@@@ -49,18 -49,17 +49,18 @@@ BOOST_AUTO_TEST_CASE(BinerizeAll
  
    mat output;
    const double threshold = 5.0;
-   const size_t dimension = 1;
++
    Binarize<double>(input, output, threshold);
  
-   BOOST_REQUIRE_SMALL(input(0, 0), 1e-5); // 1
-   BOOST_REQUIRE_SMALL(input(0, 1), 1e-5); // 2
-   BOOST_REQUIRE_SMALL(input(0, 2), 1e-5); // 3
-   BOOST_REQUIRE_SMALL(input(1, 0), 1e-5); // 4
-   BOOST_REQUIRE_SMALL(input(1, 1), 1e-5); // 5
-   BOOST_REQUIRE_CLOSE(input(1, 2), 1.0, 1e-5); // 6
-   BOOST_REQUIRE_CLOSE(input(2, 0), 1.0, 1e-5); // 7
-   BOOST_REQUIRE_CLOSE(input(2, 1), 1.0, 1e-5); // 8
-   BOOST_REQUIRE_CLOSE(input(2, 2), 1.0, 1e-5); // 9
+   BOOST_REQUIRE_SMALL(output(0, 0), 1e-5); // 1
+   BOOST_REQUIRE_SMALL(output(0, 1), 1e-5); // 2
+   BOOST_REQUIRE_SMALL(output(0, 2), 1e-5); // 3
+   BOOST_REQUIRE_SMALL(output(1, 0), 1e-5); // 4
+   BOOST_REQUIRE_SMALL(output(1, 1), 1e-5); // 5
+   BOOST_REQUIRE_CLOSE(output(1, 2), 1.0, 1e-5); // 6
+   BOOST_REQUIRE_CLOSE(output(2, 0), 1.0, 1e-5); // 7
+   BOOST_REQUIRE_CLOSE(output(2, 1), 1.0, 1e-5); // 8
+   BOOST_REQUIRE_CLOSE(output(2, 2), 1.0, 1e-5); // 9
  }
  
  BOOST_AUTO_TEST_SUITE_END();