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

Fixed the compilation error

Browse Source
This commit is contained in:
Dongryeol Lee
2008-02-12 00:54:53 +00:00
parent 63aaf1d852
commit 1eee6feaac
3 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fastlib2/contrib/dongryel/regression/dense_lpr_impl.h
+10 -10
View File
@@ -26,14 +26,14 @@ void DenseLpr<TKernel, lpr_order>::Reset_(int q) {
numerator_e_.MakeColumnVector(q, &q_numerator_e);
q_numerator_l.SetZero();
q_numerator_e.SetZero();
numerator_used_error_ = 0;
numerator_n_pruned_ = 0;
numerator_used_error_[q] = 0;
numerator_n_pruned_[q] = 0;
// Then the denominator quantities,
denominator_l_[q].SetZero();
denominator_e_[q].SetZero();
denominator_used_error_ = 0;
denominator_n_pruned_ = 0;
denominator_used_error_[q] = 0;
denominator_n_pruned_[q] = 0;
}
template<typename TKernel, int lpr_order>
@@ -180,10 +180,10 @@ void DenseLpr<TKernel, lpr_order>::DualtreeLprBase_
double *q_numerator_e = numerator_e_.GetColumnPtr(q);
// Incorporate the postponed information for the numerator vector.
la::AddTo(row_length_, qnode->stat().postponed_numerator_l_,
la::AddTo(row_length_, qnode->stat().postponed_numerator_l_.ptr(),
q_numerator_l);
numerator_used_error_[q] += qnode->stat().postponed_numerator_used_error_;
numerator_n_pruned_[q] += qnode->stat().postponed_n_pruned_;
numerator_n_pruned_[q] += qnode->stat().postponed_numerator_n_pruned_;
// Incorporate the postponed information for the denominator matrix.
la::AddTo(qnode->stat().postponed_denominator_l_, &(denominator_l_[q]));
@@ -312,7 +312,7 @@ void DenseLpr<TKernel, lpr_order>::DualtreeLprCanonical_
la::AddTo(denominator_dl,
&(qnode->stat().postponed_denominator_l_));
la::AddTo(numerator_de,
la::AddTo(denominator_de,
&(qnode->stat().postponed_denominator_e_));
qnode->stat().postponed_denominator_used_error_ += denominator_used_error;
qnode->stat().postponed_denominator_n_pruned_ += denominator_n_pruned;
@@ -349,7 +349,7 @@ void DenseLpr<TKernel, lpr_order>::DualtreeLprCanonical_
// Push down postponed bound changes owned by the current query
// node to the children of the query node.
la::AddTo(q_stat.postponed_numerator_l_,
&q_left_stat.postponsted_numerator_l_);
&q_left_stat.postponed_numerator_l_);
la::AddTo(q_stat.postponed_numerator_l_,
&q_right_stat.postponed_numerator_l_);
q_left_stat.postponed_numerator_used_error_ +=
@@ -362,7 +362,7 @@ void DenseLpr<TKernel, lpr_order>::DualtreeLprCanonical_
q_stat.postponed_numerator_n_pruned_;
la::AddTo(q_stat.postponed_denominator_l_,
&q_left_stat.postponsted_denominator_l_);
&q_left_stat.postponed_denominator_l_);
la::AddTo(q_stat.postponed_denominator_l_,
&q_right_stat.postponed_denominator_l_);
q_left_stat.postponed_denominator_used_error_ +=
@@ -442,7 +442,7 @@ void DenseLpr<TKernel, lpr_order>::FinalizeQueryTree_(QueryTree *qnode) {
LprQStat &q_stat = qnode->stat();
if(qnode->ls_leaf()) {
if(qnode->is_leaf()) {
Matrix pseudoinverse_denominator;
pseudoinverse_denominator.Init(row_length_, row_length_);
fastlib2/contrib/dongryel/regression/dense_lpr_main.cc
+1
View File
@@ -51,6 +51,7 @@ int main(int argc, char *argv[]) {
DenseLpr<GaussianKernel> local_linear;
local_linear.Init(queries, references, reference_targets,
local_linear_module);
local_linear.Compute();
// Finalize FastExec and print output results.
fx_done();
fastlib2/contrib/dongryel/regression/relative_prune_lpr.h
+2 -2
View File
@@ -48,7 +48,7 @@ class RelativePruneLpr {
// Refine the lower bound norm using the new lower bound info
// for the numerator B^T W(q) Y.
la::AddOverwrite(qnode->stat().postponed_numerator_l_, numerator_dl,
tmp_numerator_dl);
&tmp_numerator_dl);
double new_numerator_norm_l = qnode->stat().numerator_norm_l_ +
MatrixUtil::EntrywiseLpNorm(tmp_numerator_dl, 2);
double numerator_allowed_err =
@@ -59,7 +59,7 @@ class RelativePruneLpr {
// Refine the lower bound norm using the new lower bound info
// for the denominator B^T W(q) B.
la::AddOverwrite(qnode->stat().postponed_denominator_l_, denominator_dl,
tmp_denominator_dl);
&tmp_denominator_dl);
double new_denominator_norm_l = qnode->stat().denominator_norm_l_ +
MatrixUtil::EntrywiseLpNorm(tmp_denominator_dl, 2);
double denominator_allowed_err =