12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed conflicts with build-in windows names

release/4.3a0
Richard Roberts 2012-05-24 20:11:48 +00:00
parent 8f43298d21
commit c3052fe536
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/base/Matrix.cpp
View File

@ -236,8 +236,8 @@ void save(const Matrix& A, const string &s, const string& filename) {
} }
/* ************************************************************************* */ /* ************************************************************************* */
void insertSub(Matrix& big, const Matrix& small, size_t i, size_t j) { void insertSub(Matrix& fullMatrix, const Matrix& subMatrix, size_t i, size_t j) {
big.block(i, j, small.rows(), small.cols()) = small; fullMatrix.block(i, j, subMatrix.rows(), subMatrix.cols()) = subMatrix;
} }
/* ************************************************************************* */ /* ************************************************************************* */

6
gtsam/base/Matrix.h
View File

@ -201,12 +201,12 @@ Eigen::Block<const MATRIX> sub(const MATRIX& A, size_t i1, size_t i2, size_t j1,
/** /**
* insert a submatrix IN PLACE at a specified location in a larger matrix * insert a submatrix IN PLACE at a specified location in a larger matrix
* NOTE: there is no size checking * NOTE: there is no size checking
* @param large matrix to be updated * @param fullMatrix matrix to be updated
* @param small matrix to be inserted * @param subMatrix matrix to be inserted
* @param i is the row of the upper left corner insert location * @param i is the row of the upper left corner insert location
* @param j is the column of the upper left corner insert location * @param j is the column of the upper left corner insert location
*/ */
void insertSub(Matrix& big, const Matrix& small, size_t i, size_t j); void insertSub(Matrix& fullMatrix, const Matrix& subMatrix, size_t i, size_t j);
/** /**
* Extracts a column view from a matrix that avoids a copy * Extracts a column view from a matrix that avoids a copy

4
gtsam/base/Vector.cpp
View File

@ -251,8 +251,8 @@ ConstSubVector sub(const Vector &v, size_t i1, size_t i2) {
} }
/* ************************************************************************* */ /* ************************************************************************* */
void subInsert(Vector& big, const Vector& small, size_t i) { void subInsert(Vector& fullVector, const Vector& subVector, size_t i) {
big.segment(i, small.size()) = small; fullVector.segment(i, subVector.size()) = subVector;
} }
/* ************************************************************************* */ /* ************************************************************************* */

6
gtsam/base/Vector.h
View File

@ -209,11 +209,11 @@ ConstSubVector sub(const Vector &v, size_t i1, size_t i2);
/** /**
* Inserts a subvector into a vector IN PLACE * Inserts a subvector into a vector IN PLACE
* @param big is the vector to be changed * @param fullVector is the vector to be changed
* @param small is the vector to insert * @param subVector is the vector to insert
* @param i is the index where the subvector should be inserted * @param i is the index where the subvector should be inserted
*/ */
void subInsert(Vector& big, const Vector& small, size_t i); void subInsert(Vector& fullVector, const Vector& subVector, size_t i);
/** /**
* elementwise multiplication * elementwise multiplication