NextCloud/dlib
1
0
Fork 0
mirror of https://github.com/davisking/dlib.git synced 2024-11-01 10:14:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in the join_rows() and join_cols() functions.

Browse Source 
--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%403604
This commit is contained in:
Davis King 2010-05-13 23:30:37 +00:00
parent 1e83c12f01
commit c6b6a25489
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlib/matrix/matrix_utilities.h
View File

@ -2920,11 +2920,24 @@ namespace dlib
template <typename EXP1, typename EXP2>
struct op : public has_destructive_aliasing
{
template <typename T, typename U, bool selection>
struct type_selector;
template <typename T, typename U>
struct type_selector<T,U,true> { typedef T type; };
template <typename T, typename U>
struct type_selector<T,U,false> { typedef U type; };
// If both const_ret_types are references then we should use them as the const_ret_type type
// but otherwise we should use the normal type.
typedef typename EXP1::const_ret_type T1;
typedef typename EXP1::type T2;
typedef typename EXP2::const_ret_type T3;
typedef typename type_selector<T1, T2, is_reference_type<T1>::value && is_reference_type<T3>::value>::type const_ret_type;
const static long cost = EXP1::cost + EXP2::cost + 1;
const static long NR = tmax<EXP1::NR, EXP2::NR>::value;
const static long NC = (EXP1::NC*EXP2::NC != 0)? (EXP1::NC+EXP2::NC) : (0);
typedef typename EXP1::type type;
typedef typename EXP1::const_ret_type const_ret_type;
typedef typename EXP1::mem_manager_type mem_manager_type;
template <typename M1, typename M2>
@ -2975,11 +2988,26 @@ namespace dlib
template <typename EXP1, typename EXP2>
struct op : public has_destructive_aliasing
{
template <typename T, typename U, bool selection>
struct type_selector;
template <typename T, typename U>
struct type_selector<T,U,true> { typedef T type; };
template <typename T, typename U>
struct type_selector<T,U,false> { typedef U type; };
// If both const_ret_types are references then we should use them as the const_ret_type type
// but otherwise we should use the normal type.
typedef typename EXP1::const_ret_type T1;
typedef typename EXP1::type T2;
typedef typename EXP2::const_ret_type T3;
typedef typename type_selector<T1, T2, is_reference_type<T1>::value && is_reference_type<T3>::value>::type const_ret_type;
const static long cost = EXP1::cost + EXP2::cost + 1;
const static long NC = tmax<EXP1::NC, EXP2::NC>::value;
const static long NR = (EXP1::NR*EXP2::NR != 0)? (EXP1::NR+EXP2::NR) : (0);
typedef typename EXP1::type type;
typedef typename EXP1::const_ret_type const_ret_type;
typedef typename EXP1::mem_manager_type mem_manager_type;
template <typename M1, typename M2>

4
dlib/test/matrix3.cpp
View File

@ -828,8 +828,10 @@ namespace
4, 5, 6;
DLIB_TEST(join_rows(a,a) == b);
DLIB_TEST(join_rows(a,abs(a)) == b);
DLIB_TEST(join_cols(trans(a), trans(a)) == trans(b));
DLIB_TEST(join_cols(a,a) == c)
DLIB_TEST(join_cols(a,abs(a)) == c)
DLIB_TEST(join_rows(trans(a),trans(a)) == trans(c))
}
@ -850,8 +852,10 @@ namespace
4, 5, 6;
DLIB_TEST(join_rows(a,a) == b);
DLIB_TEST(join_rows(a,abs(a)) == b);
DLIB_TEST(join_cols(trans(a), trans(a)) == trans(b));
DLIB_TEST(join_cols(a,a) == c)
DLIB_TEST(join_cols(a,abs(a)) == c)
DLIB_TEST(join_rows(trans(a),trans(a)) == trans(c))
}