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

Warnings fixed.

Browse Source
This commit is contained in:
Dongryeol Lee
2010-12-12 22:04:49 +00:00
parent d59af0f248
commit 74099d4d4e
3 changed files with 40 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fastlib/trunk/contrib/dongryel/thesis_research/core/math/CMakeLists.txt
-1
View File
@@ -5,7 +5,6 @@ set(SOURCES
geometry.h
math_lib.h
math_lib_impl.h
linear_algebra.cc
linear_algebra.h
range.h
)
fastlib/trunk/contrib/dongryel/thesis_research/core/math/linear_algebra.cc
-49
View File
@@ -1,49 +0,0 @@
/** @file linear_algebra.cc
*
* @author Dongryeol Lee (dongryel@cc.gatech.edu)
*/
#include "linear_algebra.h"
namespace core {
namespace math {
static void CopyValues(
const arma::vec &vec_in, arma::vec *vec_out) {
for(int i = 0; i < vec_in.n_elem; i++) {
(*vec_out)[i] = vec_in[i];
}
}
static void SubFrom(
const arma::vec &vec_in, arma::vec *vec_out) {
for(int i = 0; i < vec_in.n_elem; i++) {
(*vec_out)[i] -= vec_in[i];
}
}
static void AddTo(
const arma::vec &vec_in, arma::vec *vec_out) {
for(int i = 0; i < vec_in.n_elem; i++) {
(*vec_out)[i] += vec_in[i];
}
}
static void ScaleOverwrite(
double scale, const arma::vec &vec_in, arma::vec *vec_out) {
for(int i = 0; i < vec_in.n_elem; i++) {
(*vec_out)[i] = vec_in[i] * scale;
}
}
static void ScaleInit(
double scale, const arma::vec &vec_in, arma::vec *vec_out) {
vec_out->set_size(vec_in.n_elem);
ScaleOverwrite(scale, vec_in, vec_out);
}
};
};
fastlib/trunk/contrib/dongryel/thesis_research/core/math/linear_algebra.h
+40 -7
View File
@@ -6,8 +6,6 @@
#ifndef CORE_MATH_LINEAR_ALGEBRA_H
#define CORE_MATH_LINEAR_ALGEBRA_H
#include <armadillo>
namespace core {
namespace math {
@@ -20,19 +18,54 @@ static double Dot(const VectorType &a, const VectorType &b) {
return dot_product;
}
static void CopyValues(const arma::vec &vec_in, arma::vec *vec_out);
template<typename VectorType>
static double LengthEuclidean(const VectorType &a) {
return sqrt(core::math::Dot(a, a));
}
template<typename VectorType>
static void CopyValues(
const VectorType &vec_in, VectorType *vec_out) {
for(unsigned int i = 0; i < vec_in.n_elem; i++) {
(*vec_out)[i] = vec_in[i];
}
}
template<typename VectorType>
static void SubFrom(
const arma::vec &vec_in, arma::vec *vec_out);
const VectorType &vec_in, VectorType *vec_out) {
for(unsigned int i = 0; i < vec_in.n_elem; i++) {
(*vec_out)[i] -= vec_in[i];
}
}
template<typename VectorType>
static void AddTo(
const arma::vec &vec_in, arma::vec *vec_out);
const VectorType &vec_in, VectorType *vec_out) {
for(unsigned int i = 0; i < vec_in.n_elem; i++) {
(*vec_out)[i] += vec_in[i];
}
}
template<typename VectorType>
static void ScaleOverwrite(
double scale, const arma::vec &vec_in, arma::vec *vec_out);
double scale, const VectorType &vec_in, VectorType *vec_out) {
for(unsigned int i = 0; i < vec_in.n_elem; i++) {
(*vec_out)[i] = vec_in[i] * scale;
}
}
template<typename VectorType>
static void ScaleInit(
double scale, const arma::vec &vec_in, arma::vec *vec_out);
double scale, const VectorType &vec_in, VectorType *vec_out) {
vec_out->set_size(vec_in.n_elem);
ScaleOverwrite(scale, vec_in, vec_out);
}
};
};