apaam/mlpack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1082 from rcurtin/rs_impl

Browse Source 
Merge rs_model.cpp into rs_model_impl.hpp
This commit is contained in:
Ryan Curtin
2017-08-25 18:47:09 -04:00
committed by GitHub
parent 87e3d339df 7395636090
commit 1cf367106f
5 changed files with 261 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mlpack/core/optimizers/aug_lagrangian/aug_lagrangian_function_impl.hpp
+2 -2
View File
@@ -38,9 +38,9 @@ AugLagrangianFunction<LagrangianFunction>::AugLagrangianFunction(
LagrangianFunction& function,
const arma::vec& lambda,
const double sigma) :
function(function),
lambda(lambda),
sigma(sigma),
function(function)
sigma(sigma)
{
// Nothing else to do.
}
src/mlpack/methods/naive_bayes/naive_bayes_classifier_impl.hpp
-2
View File
@@ -38,8 +38,6 @@ NaiveBayesClassifier<ModelMatType>::NaiveBayesClassifier(
"NaiveBayesClassifier: element type of given data must match the element "
"type of the model!");
const size_t dimensionality = data.n_rows;
// Perform training, after initializing the model to 0 (that is, if Train()
// won't do that for us, which it won't if we're using the incremental
// algorithm).
src/mlpack/methods/range_search/CMakeLists.txt
-1
View File
@@ -8,7 +8,6 @@ set(SOURCES
range_search_stat.hpp
rs_model.hpp
rs_model_impl.hpp
rs_model.cpp
)
# Add directory name to sources.
src/mlpack/methods/range_search/rs_model.cpp
-274
View File
@@ -1,274 +0,0 @@
/**
* @file rs_model.cpp
* @author Ryan Curtin
*
* Implementation of the range search model class.
*
* mlpack is free software; you may redistribute it and/or modify it under the
* terms of the 3-clause BSD license. You should have received a copy of the
* 3-clause BSD license along with mlpack. If not, see
* http://www.opensource.org/licenses/BSD-3-Clause for more information.
*/
#include "rs_model.hpp"
#include <mlpack/core/math/random_basis.hpp>
using namespace std;
using namespace mlpack;
using namespace mlpack::range;
/**
* Initialize the RSModel with the given tree type and whether or not a random
* basis should be used.
*/
RSModel::RSModel(TreeTypes treeType, bool randomBasis) :
treeType(treeType),
leafSize(0),
randomBasis(randomBasis)
{
// Nothing to do.
}
// Copy constructor.
RSModel::RSModel(const RSModel& other) :
treeType(other.treeType),
leafSize(other.leafSize),
randomBasis(other.randomBasis),
rSearch(other.rSearch)
{
// Nothing to do.
}
// Move constructor.
RSModel::RSModel(RSModel&& other) :
treeType(other.treeType),
leafSize(other.leafSize),
randomBasis(other.randomBasis),
rSearch(other.rSearch)
{
// Reset other model.
other.treeType = TreeTypes::KD_TREE;
other.leafSize = 0;
other.randomBasis = false;
other.rSearch = decltype(other.rSearch)();
}
// Copy operator.
RSModel& RSModel::operator=(const RSModel& other)
{
boost::apply_visitor(DeleteVisitor(), rSearch);
treeType = other.treeType;
leafSize = other.leafSize;
randomBasis = other.randomBasis;
rSearch = other.rSearch;
return *this;
}
// Move operator.
RSModel& RSModel::operator=(RSModel&& other)
{
boost::apply_visitor(DeleteVisitor(), rSearch);
treeType = other.treeType;
leafSize = other.leafSize;
randomBasis = other.randomBasis;
rSearch = other.rSearch;
// Reset other model.
other.treeType = TreeTypes::KD_TREE;
other.leafSize = 0;
other.randomBasis = false;
other.rSearch = decltype(other.rSearch)();
return *this;
}
// Clean memory, if necessary.
RSModel::~RSModel()
{
boost::apply_visitor(DeleteVisitor(), rSearch);
}
void RSModel::BuildModel(arma::mat&& referenceSet,
const size_t leafSize,
const bool naive,
const bool singleMode)
{
// Initialize random basis if necessary.
if (randomBasis)
{
Log::Info << "Creating random basis..." << endl;
math::RandomBasis(q, referenceSet.n_rows);
}
this->leafSize = leafSize;
// Clean memory, if necessary.
boost::apply_visitor(DeleteVisitor(), rSearch);
// Do we need to modify the reference set?
if (randomBasis)
referenceSet = q * referenceSet;
if (!naive)
{
Timer::Start("tree_building");
Log::Info << "Building reference tree..." << endl;
}
switch (treeType)
{
case KD_TREE:
rSearch = new RSType<tree::KDTree> (naive, singleMode);
break;
case COVER_TREE:
rSearch = new RSType<tree::StandardCoverTree>(naive, singleMode);
break;
case R_TREE:
rSearch = new RSType<tree::RTree>(naive, singleMode);
break;
case R_STAR_TREE:
rSearch = new RSType<tree::RStarTree>(naive, singleMode);
break;
case BALL_TREE:
rSearch = new RSType<tree::BallTree>(naive, singleMode);
break;
case X_TREE:
rSearch = new RSType<tree::XTree>(naive, singleMode);
break;
case HILBERT_R_TREE:
rSearch = new RSType<tree::HilbertRTree>(naive, singleMode);
break;
case R_PLUS_TREE:
rSearch = new RSType<tree::RPlusTree>(naive, singleMode);
break;
case R_PLUS_PLUS_TREE:
rSearch = new RSType<tree::RPlusPlusTree>(naive, singleMode);
break;
case VP_TREE:
rSearch = new RSType<tree::VPTree>(naive, singleMode);
break;
case RP_TREE:
rSearch = new RSType<tree::RPTree>(naive, singleMode);
break;
case MAX_RP_TREE:
rSearch = new RSType<tree::MaxRPTree>(naive, singleMode);
break;
case UB_TREE:
rSearch = new RSType<tree::UBTree>(naive, singleMode);
break;
case OCTREE:
rSearch = new RSType<tree::Octree>(naive, singleMode);
break;
}
TrainVisitor tn(std::move(referenceSet), leafSize);
boost::apply_visitor(tn, rSearch);
if (!naive)
{
Timer::Stop("tree_building");
Log::Info << "Tree built." << endl;
}
}
// Perform range search.
void RSModel::Search(arma::mat&& querySet,
const math::Range& range,
vector<vector<size_t>>& neighbors,
vector<vector<double>>& distances)
{
// We may need to map the query set randomly.
if (randomBasis)
querySet = q * querySet;
Log::Info << "Search for points in the range [" << range.Lo() << ", "
<< range.Hi() << "] with ";
if (!Naive() && !SingleMode())
Log::Info << "dual-tree " << TreeName() << " search..." << endl;
else if (!Naive())
Log::Info << "single-tree " << TreeName() << " search..." << endl;
else
Log::Info << "brute-force (naive) search..." << endl;
BiSearchVisitor search(querySet, range, neighbors, distances,
leafSize);
boost::apply_visitor(search, rSearch);
}
// Perform range search (monochromatic case).
void RSModel::Search(const math::Range& range,
vector<vector<size_t>>& neighbors,
vector<vector<double>>& distances)
{
Log::Info << "Search for points in the range [" << range.Lo() << ", "
<< range.Hi() << "] with ";
if (!Naive() && !SingleMode())
Log::Info << "dual-tree " << TreeName() << " search..." << endl;
else if (!Naive())
Log::Info << "single-tree " << TreeName() << " search..." << endl;
else
Log::Info << "brute-force (naive) search..." << endl;
MonoSearchVisitor search(range, neighbors, distances);
boost::apply_visitor(search, rSearch);
}
// Get the name of the tree type.
std::string RSModel::TreeName() const
{
switch (treeType)
{
case KD_TREE:
return "kd-tree";
case COVER_TREE:
return "cover tree";
case R_TREE:
return "R tree";
case R_STAR_TREE:
return "R* tree";
case BALL_TREE:
return "ball tree";
case X_TREE:
return "X tree";
case HILBERT_R_TREE:
return "Hilbert R tree";
case R_PLUS_TREE:
return "R+ tree";
case R_PLUS_PLUS_TREE:
return "R++ tree";
case VP_TREE:
return "vantage point tree";
case RP_TREE:
return "random projection tree (mean split)";
case MAX_RP_TREE:
return "random projection tree (max split)";
case UB_TREE:
return "UB tree";
case OCTREE:
return "octree";
default:
return "unknown tree";
}
}
// Clean memory.
void RSModel::CleanMemory()
{
boost::apply_visitor(DeleteVisitor(), rSearch);
}
src/mlpack/methods/range_search/rs_model_impl.hpp
+259
View File
@@ -15,9 +15,268 @@
// In case it hasn't been included yet.
#include "rs_model.hpp"
#include <mlpack/core/math/random_basis.hpp>
namespace mlpack {
namespace range {
/**
* Initialize the RSModel with the given tree type and whether or not a random
* basis should be used.
*/
inline RSModel::RSModel(TreeTypes treeType, bool randomBasis) :
treeType(treeType),
leafSize(0),
randomBasis(randomBasis)
{
// Nothing to do.
}
// Copy constructor.
inline RSModel::RSModel(const RSModel& other) :
treeType(other.treeType),
leafSize(other.leafSize),
randomBasis(other.randomBasis),
rSearch(other.rSearch)
{
// Nothing to do.
}
// Move constructor.
inline RSModel::RSModel(RSModel&& other) :
treeType(other.treeType),
leafSize(other.leafSize),
randomBasis(other.randomBasis),
rSearch(other.rSearch)
{
// Reset other model.
other.treeType = TreeTypes::KD_TREE;
other.leafSize = 0;
other.randomBasis = false;
other.rSearch = decltype(other.rSearch)();
}
// Copy operator.
inline RSModel& RSModel::operator=(const RSModel& other)
{
boost::apply_visitor(DeleteVisitor(), rSearch);
treeType = other.treeType;
leafSize = other.leafSize;
randomBasis = other.randomBasis;
rSearch = other.rSearch;
return *this;
}
// Move operator.
inline RSModel& RSModel::operator=(RSModel&& other)
{
boost::apply_visitor(DeleteVisitor(), rSearch);
treeType = other.treeType;
leafSize = other.leafSize;
randomBasis = other.randomBasis;
rSearch = other.rSearch;
// Reset other model.
other.treeType = TreeTypes::KD_TREE;
other.leafSize = 0;
other.randomBasis = false;
other.rSearch = decltype(other.rSearch)();
return *this;
}
// Clean memory, if necessary.
inline RSModel::~RSModel()
{
boost::apply_visitor(DeleteVisitor(), rSearch);
}
inline void RSModel::BuildModel(arma::mat&& referenceSet,
const size_t leafSize,
const bool naive,
const bool singleMode)
{
// Initialize random basis if necessary.
if (randomBasis)
{
Log::Info << "Creating random basis..." << std::endl;
math::RandomBasis(q, referenceSet.n_rows);
}
this->leafSize = leafSize;
// Clean memory, if necessary.
boost::apply_visitor(DeleteVisitor(), rSearch);
// Do we need to modify the reference set?
if (randomBasis)
referenceSet = q * referenceSet;
if (!naive)
{
Timer::Start("tree_building");
Log::Info << "Building reference tree..." << std::endl;
}
switch (treeType)
{
case KD_TREE:
rSearch = new RSType<tree::KDTree> (naive, singleMode);
break;
case COVER_TREE:
rSearch = new RSType<tree::StandardCoverTree>(naive, singleMode);
break;
case R_TREE:
rSearch = new RSType<tree::RTree>(naive, singleMode);
break;
case R_STAR_TREE:
rSearch = new RSType<tree::RStarTree>(naive, singleMode);
break;
case BALL_TREE:
rSearch = new RSType<tree::BallTree>(naive, singleMode);
break;
case X_TREE:
rSearch = new RSType<tree::XTree>(naive, singleMode);
break;
case HILBERT_R_TREE:
rSearch = new RSType<tree::HilbertRTree>(naive, singleMode);
break;
case R_PLUS_TREE:
rSearch = new RSType<tree::RPlusTree>(naive, singleMode);
break;
case R_PLUS_PLUS_TREE:
rSearch = new RSType<tree::RPlusPlusTree>(naive, singleMode);
break;
case VP_TREE:
rSearch = new RSType<tree::VPTree>(naive, singleMode);
break;
case RP_TREE:
rSearch = new RSType<tree::RPTree>(naive, singleMode);
break;
case MAX_RP_TREE:
rSearch = new RSType<tree::MaxRPTree>(naive, singleMode);
break;
case UB_TREE:
rSearch = new RSType<tree::UBTree>(naive, singleMode);
break;
case OCTREE:
rSearch = new RSType<tree::Octree>(naive, singleMode);
break;
}
TrainVisitor tn(std::move(referenceSet), leafSize);
boost::apply_visitor(tn, rSearch);
if (!naive)
{
Timer::Stop("tree_building");
Log::Info << "Tree built." << std::endl;
}
}
// Perform range search.
inline void RSModel::Search(arma::mat&& querySet,
const math::Range& range,
std::vector<std::vector<size_t>>& neighbors,
std::vector<std::vector<double>>& distances)
{
// We may need to map the query set randomly.
if (randomBasis)
querySet = q * querySet;
Log::Info << "Search for points in the range [" << range.Lo() << ", "
<< range.Hi() << "] with ";
if (!Naive() && !SingleMode())
Log::Info << "dual-tree " << TreeName() << " search..." << std::endl;
else if (!Naive())
Log::Info << "single-tree " << TreeName() << " search..." << std::endl;
else
Log::Info << "brute-force (naive) search..." << std::endl;
BiSearchVisitor search(querySet, range, neighbors, distances,
leafSize);
boost::apply_visitor(search, rSearch);
}
// Perform range search (monochromatic case).
inline void RSModel::Search(const math::Range& range,
std::vector<std::vector<size_t>>& neighbors,
std::vector<std::vector<double>>& distances)
{
Log::Info << "Search for points in the range [" << range.Lo() << ", "
<< range.Hi() << "] with ";
if (!Naive() && !SingleMode())
Log::Info << "dual-tree " << TreeName() << " search..." << std::endl;
else if (!Naive())
Log::Info << "single-tree " << TreeName() << " search..." << std::endl;
else
Log::Info << "brute-force (naive) search..." << std::endl;
MonoSearchVisitor search(range, neighbors, distances);
boost::apply_visitor(search, rSearch);
}
// Get the name of the tree type.
inline std::string RSModel::TreeName() const
{
switch (treeType)
{
case KD_TREE:
return "kd-tree";
case COVER_TREE:
return "cover tree";
case R_TREE:
return "R tree";
case R_STAR_TREE:
return "R* tree";
case BALL_TREE:
return "ball tree";
case X_TREE:
return "X tree";
case HILBERT_R_TREE:
return "Hilbert R tree";
case R_PLUS_TREE:
return "R+ tree";
case R_PLUS_PLUS_TREE:
return "R++ tree";
case VP_TREE:
return "vantage point tree";
case RP_TREE:
return "random projection tree (mean split)";
case MAX_RP_TREE:
return "random projection tree (max split)";
case UB_TREE:
return "UB tree";
case OCTREE:
return "octree";
default:
return "unknown tree";
}
}
// Clean memory.
inline void RSModel::CleanMemory()
{
boost::apply_visitor(DeleteVisitor(), rSearch);
}
//! Monochromatic range search on the given RSType instance.
template<typename RSType>
void MonoSearchVisitor::operator()(RSType* rs) const