Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

using rvalue references to set a given reference tree in FastMKS and DualTreeBoruvka #799

Closed
wants to merge 17 commits into from
Closed

using rvalue references to set a given reference tree in FastMKS and DualTreeBoruvka #799

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c488c34
Merge pull request #1 from mlpack/master
akanuraj200 Sep 28, 2016
e553685
Merge pull request #2 from mlpack/master
akanuraj200 Oct 4, 2016
7892ee1
Add support for rvalue references when setting a given reference tree…
Oct 5, 2016
d841f13
Add support for rvalue references when setting a given reference tree…
Oct 5, 2016
5c6a096
Merge branch 'master' of https://github.com/akanuraj200/mlpack
Oct 5, 2016
8bad384
Merge pull request #3 from mlpack/master
akanuraj200 Oct 6, 2016
1723e61
update fastmks_impl.hpp
akanuraj200 Oct 9, 2016
3b78840
fix memory leak in fastmks and other minor changes.
Oct 14, 2016
29e94a3
updated Train(Tree*) in FastMKS
Oct 25, 2016
1678ad9
Merge branch 'master' of https://github.com/akanuraj200/mlpack
Oct 25, 2016
427ca26
update FastMKS<>::Train(Tree&) and FastMKS<>::Train(Tree&&)
Dec 13, 2016
39b5395
Merge pull request #4 from mlpack/master
akanuraj200 Dec 14, 2016
ca1038f
avoided copying the entire tree in fastmks_model for speed improvement.
Dec 22, 2016
d444eef
Merge branch 'master' of git://github.com/mlpack/mlpack
Dec 22, 2016
de961f2
Merge branch 'master' of https://github.com/akanuraj200/mlpack
Dec 22, 2016
9d78642
Added mlpack_deprecated flags. Changed arguments like Tree& to const …
Dec 23, 2016
f8237ba
avoid deprecated methods inside FastMKS class
Dec 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mlpack/methods/fastmks/fastmks_model_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ void BuildFastMKSModel(FastMKS<KernelType>& f,
// Create the tree with the specified base.
Timer::Start("tree_building");
metric::IPMetric<KernelType> metric(k);
typename FastMKS<KernelType>::Tree tree(referenceData, metric, base);
typename FastMKS<KernelType>::Tree tree(std::move(referenceData), metric, base);
Timer::Stop("tree_building");

f.Train(tree);
f.Train(std::move(tree));
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/mlpack/tests/fastmks_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ BOOST_AUTO_TEST_CASE(FastMKSModelLinearTest)
m.Search(3, mIndices, mKernels);
mNaive.Search(3, mNaiveIndices, mNaiveKernels);
mSingle.Search(3, mSingleIndices, mSingleKernels);

BOOST_REQUIRE_EQUAL(indices.n_cols, mIndices.n_cols);
BOOST_REQUIRE_EQUAL(indices.n_cols, mNaiveIndices.n_cols);
BOOST_REQUIRE_EQUAL(indices.n_cols, mSingleIndices.n_cols);
Expand Down