OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed some errors in the requirements for calling the new rowm() and colm() 

functions.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402844
This commit is contained in:
Davis King 2009-01-31 20:37:05 +00:00
parent d8b7db202d
commit 6309e821f0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlib/matrix/matrix_subexp.h
View File

@ -235,7 +235,7 @@ namespace dlib
) )
{ {
DLIB_ASSERT(row >= 0 && row < m.nr() && DLIB_ASSERT(row >= 0 && row < m.nr() &&
length >= 0 && length < m.nc(), length >= 0 && length <= m.nc(),
"\tconst matrix_exp rowm(const matrix_exp& m, row, length)" "\tconst matrix_exp rowm(const matrix_exp& m, row, length)"
<< "\n\tYou have specified invalid sub matrix dimensions" << "\n\tYou have specified invalid sub matrix dimensions"
<< "\n\tm.nr(): " << m.nr() << "\n\tm.nr(): " << m.nr()
@ -375,7 +375,7 @@ namespace dlib
) )
{ {
DLIB_ASSERT(col >= 0 && col < m.nc() && DLIB_ASSERT(col >= 0 && col < m.nc() &&
length >= 0 && length < m.nr(), length >= 0 && length <= m.nr(),
"\tconst matrix_exp colm(const matrix_exp& m, col, length)" "\tconst matrix_exp colm(const matrix_exp& m, col, length)"
<< "\n\tYou have specified invalid sub matrix dimensions" << "\n\tYou have specified invalid sub matrix dimensions"
<< "\n\tm.nr(): " << m.nr() << "\n\tm.nr(): " << m.nr()

8
dlib/matrix/matrix_subexp_abstract.h
View File

@ -160,7 +160,7 @@ namespace dlib
/*! /*!
requires requires
- 0 <= row < m.nr() - 0 <= row < m.nr()
- 0 <= length < m.nc() - 0 <= length <= m.nc()
ensures ensures
- returns a matrix R such that: - returns a matrix R such that:
- R.nr() == 1 - R.nr() == 1
@ -198,7 +198,7 @@ namespace dlib
); );
/*! /*!
requires requires
- 0 <= col < m.nr() - 0 <= col < m.nc()
ensures ensures
- returns a matrix R such that: - returns a matrix R such that:
- R.nr() == m.nr() - R.nr() == m.nr()
@ -216,8 +216,8 @@ namespace dlib
); );
/*! /*!
requires requires
- 0 <= col < m.nr() - 0 <= col < m.nc()
- 0 <= length < m.nc() - 0 <= length <= m.nr()
ensures ensures
- returns a matrix R such that: - returns a matrix R such that:
- R.nr() == length - R.nr() == length