Skip to content

D
dlib
Commit 484d5103 authored by Davis King's avatar Davis King
Browse files
Options

- Added some tests for the new linspace, logspace, and cartesian_product functions. 

  - Updated old tests now that range() gives row vectors instead of column vectors.
  - Fixed a bug in subm() that showed up when statically dimensioned row vectors
    were used to select a sub matrix.

--HG--
extra : convert_revision : svn%3Afdd8eb12-d10e-0410-9acb-85c331704f74/trunk%402897
parent 3d559009
Show whitespace changes
Inline Side-by-side
Showing with 148 additions and 115 deletions
dlib/matrix/matrix_expressions.h
View file @ 484d5103
...@@ -1009,7 +1009,7 @@ namespace dlib ...@@ -1009,7 +1009,7 @@ namespace dlib
typedef typename M::mem_manager_type mem_manager_type; typedef typename M::mem_manager_type mem_manager_type;
typedef typename M::layout_type layout_type; typedef typename M::layout_type layout_type;
const static long NR = EXPr::NR*EXPr::NC; const static long NR = EXPr::NR*EXPr::NC;
const static long NC = EXPc::NR*EXPr::NC; const static long NC = EXPc::NR*EXPc::NC;
const static long cost = EXPr::cost+EXPc::cost+M::cost; const static long cost = EXPr::cost+EXPc::cost+M::cost;
}; };
...@@ -1647,8 +1647,8 @@ namespace dlib ...@@ -1647,8 +1647,8 @@ namespace dlib
{ {
typedef long type; typedef long type;
typedef memory_manager<char>::kernel_1a mem_manager_type; typedef memory_manager<char>::kernel_1a mem_manager_type;
const static long NR = tabs<(end - start)>::value/inc_ + 1; const static long NR = 1;
const static long NC = 1; const static long NC = tabs<(end - start)>::value/inc_ + 1;
const static long cost = 1; const static long cost = 1;
typedef row_major_layout layout_type; typedef row_major_layout layout_type;
}; };
...@@ -1680,11 +1680,11 @@ namespace dlib ...@@ -1680,11 +1680,11 @@ namespace dlib
long operator() ( long operator() (
long r, long r,
long c long c
) const { return start + r*inc; } ) const { return start + c*inc; }
long operator() ( long operator() (
long r long c
) const { return start + r*inc; } ) const { return start + c*inc; }
template <typename U, long iNR, long iNC , typename MM, typename L> template <typename U, long iNR, long iNC , typename MM, typename L>
bool aliases ( bool aliases (
......
dlib/test/matrix.cpp
View file @ 484d5103
...@@ -777,38 +777,38 @@ namespace ...@@ -777,38 +777,38 @@ namespace
} }
{ {
DLIB_CASSERT(range(0,5).nr() == 6,""); DLIB_CASSERT(range(0,5).nc() == 6,"");
DLIB_CASSERT(range(1,5).nr() == 5,""); DLIB_CASSERT(range(1,5).nc() == 5,"");
DLIB_CASSERT(range(0,5).nc() == 1,""); DLIB_CASSERT(range(0,5).nr() == 1,"");
DLIB_CASSERT(range(1,5).nc() == 1,""); DLIB_CASSERT(range(1,5).nr() == 1,"");
DLIB_CASSERT(trans(range(0,5)).nc() == 6,""); DLIB_CASSERT(trans(range(0,5)).nr() == 6,"");
DLIB_CASSERT(trans(range(1,5)).nc() == 5,""); DLIB_CASSERT(trans(range(1,5)).nr() == 5,"");
DLIB_CASSERT(trans(range(0,5)).nr() == 1,""); DLIB_CASSERT(trans(range(0,5)).nc() == 1,"");
DLIB_CASSERT(trans(range(1,5)).nr() == 1,""); DLIB_CASSERT(trans(range(1,5)).nc() == 1,"");
DLIB_CASSERT(range(0,2,5).nr() == 3,""); DLIB_CASSERT(range(0,2,5).nc() == 3,"");
DLIB_CASSERT(range(1,2,5).nr() == 3,""); DLIB_CASSERT(range(1,2,5).nc() == 3,"");
DLIB_CASSERT(range(0,2,5).nc() == 1,""); DLIB_CASSERT(range(0,2,5).nr() == 1,"");
DLIB_CASSERT(range(1,2,5).nc() == 1,""); DLIB_CASSERT(range(1,2,5).nr() == 1,"");
DLIB_CASSERT(trans(range(0,2,5)).nc() == 3,""); DLIB_CASSERT(trans(range(0,2,5)).nr() == 3,"");
DLIB_CASSERT(trans(range(1,2,5)).nc() == 3,""); DLIB_CASSERT(trans(range(1,2,5)).nr() == 3,"");
DLIB_CASSERT(trans(range(0,2,5)).nr() == 1,""); DLIB_CASSERT(trans(range(0,2,5)).nc() == 1,"");
DLIB_CASSERT(trans(range(1,2,5)).nr() == 1,""); DLIB_CASSERT(trans(range(1,2,5)).nc() == 1,"");
DLIB_CASSERT(range(0,3,6).nr() == 3,""); DLIB_CASSERT(range(0,3,6).nc() == 3,"");
DLIB_CASSERT(range(1,3,5).nr() == 2,""); DLIB_CASSERT(range(1,3,5).nc() == 2,"");
DLIB_CASSERT(range(0,3,5).nc() == 1,""); DLIB_CASSERT(range(0,3,5).nr() == 1,"");
DLIB_CASSERT(range(1,3,5).nc() == 1,""); DLIB_CASSERT(range(1,3,5).nr() == 1,"");
DLIB_CASSERT(trans(range(0,3,6)).nc() == 3,""); DLIB_CASSERT(trans(range(0,3,6)).nr() == 3,"");
DLIB_CASSERT(trans(range(1,3,5)).nc() == 2,""); DLIB_CASSERT(trans(range(1,3,5)).nr() == 2,"");
DLIB_CASSERT(trans(range(0,3,5)).nr() == 1,""); DLIB_CASSERT(trans(range(0,3,5)).nc() == 1,"");
DLIB_CASSERT(trans(range(1,3,5)).nr() == 1,""); DLIB_CASSERT(trans(range(1,3,5)).nc() == 1,"");
DLIB_CASSERT(range(1,9,5).nr() == 1,"");
DLIB_CASSERT(range(1,9,5).nc() == 1,""); DLIB_CASSERT(range(1,9,5).nc() == 1,"");
DLIB_CASSERT(range(1,9,5).nr() == 1,"");
DLIB_CASSERT(range(0,0).nr() == 1,"");
DLIB_CASSERT(range(0,0).nc() == 1,""); DLIB_CASSERT(range(0,0).nc() == 1,"");
DLIB_CASSERT(range(0,0).nr() == 1,"");
DLIB_CASSERT(range(1,1)(0) == 1,""); DLIB_CASSERT(range(1,1)(0) == 1,"");
...@@ -818,67 +818,67 @@ namespace ...@@ -818,67 +818,67 @@ namespace
DLIB_CASSERT((range<1,2,5>()(0) == 1 && range<1,2,5>()(1) == 3 && range<1,2,5>()(2) == 5),""); DLIB_CASSERT((range<1,2,5>()(0) == 1 && range<1,2,5>()(1) == 3 && range<1,2,5>()(2) == 5),"");
DLIB_CASSERT((range<0,5>().nr() == 6),""); DLIB_CASSERT((range<0,5>().nc() == 6),"");
DLIB_CASSERT((range<1,5>().nr() == 5),""); DLIB_CASSERT((range<1,5>().nc() == 5),"");
DLIB_CASSERT((range<0,5>().nc() == 1),""); DLIB_CASSERT((range<0,5>().nr() == 1),"");
DLIB_CASSERT((range<1,5>().nc() == 1),""); DLIB_CASSERT((range<1,5>().nr() == 1),"");
DLIB_CASSERT((trans(range<0,5>()).nc() == 6),""); DLIB_CASSERT((trans(range<0,5>()).nr() == 6),"");
DLIB_CASSERT((trans(range<1,5>()).nc() == 5),""); DLIB_CASSERT((trans(range<1,5>()).nr() == 5),"");
DLIB_CASSERT((trans(range<0,5>()).nr() == 1),""); DLIB_CASSERT((trans(range<0,5>()).nc() == 1),"");
DLIB_CASSERT((trans(range<1,5>()).nr() == 1),""); DLIB_CASSERT((trans(range<1,5>()).nc() == 1),"");
DLIB_CASSERT((range<0,2,5>().nr() == 3),""); DLIB_CASSERT((range<0,2,5>().nc() == 3),"");
DLIB_CASSERT((range<1,2,5>().nr() == 3),""); DLIB_CASSERT((range<1,2,5>().nc() == 3),"");
DLIB_CASSERT((range<0,2,5>().nc() == 1),""); DLIB_CASSERT((range<0,2,5>().nr() == 1),"");
DLIB_CASSERT((range<1,2,5>().nc() == 1),""); DLIB_CASSERT((range<1,2,5>().nr() == 1),"");
DLIB_CASSERT((trans(range<0,2,5>()).nc() == 3),""); DLIB_CASSERT((trans(range<0,2,5>()).nr() == 3),"");
DLIB_CASSERT((trans(range<1,2,5>()).nc() == 3),""); DLIB_CASSERT((trans(range<1,2,5>()).nr() == 3),"");
DLIB_CASSERT((trans(range<0,2,5>()).nr() == 1),""); DLIB_CASSERT((trans(range<0,2,5>()).nc() == 1),"");
DLIB_CASSERT((trans(range<1,2,5>()).nr() == 1),""); DLIB_CASSERT((trans(range<1,2,5>()).nc() == 1),"");
DLIB_CASSERT((range<0,3,6>().nr() == 3),""); DLIB_CASSERT((range<0,3,6>().nc() == 3),"");
DLIB_CASSERT((range<1,3,5>().nr() == 2),""); DLIB_CASSERT((range<1,3,5>().nc() == 2),"");
DLIB_CASSERT((range<0,3,5>().nc() == 1),""); DLIB_CASSERT((range<0,3,5>().nr() == 1),"");
DLIB_CASSERT((range<1,3,5>().nc() == 1),""); DLIB_CASSERT((range<1,3,5>().nr() == 1),"");
DLIB_CASSERT((trans(range<0,3,6>()).nc() == 3),""); DLIB_CASSERT((trans(range<0,3,6>()).nr() == 3),"");
DLIB_CASSERT((trans(range<1,3,5>()).nc() == 2),""); DLIB_CASSERT((trans(range<1,3,5>()).nr() == 2),"");
DLIB_CASSERT((trans(range<0,3,5>()).nr() == 1),""); DLIB_CASSERT((trans(range<0,3,5>()).nc() == 1),"");
DLIB_CASSERT((trans(range<1,3,5>()).nr() == 1),""); DLIB_CASSERT((trans(range<1,3,5>()).nc() == 1),"");
} }
{ {
DLIB_CASSERT(range(5,0).nr() == 6,""); DLIB_CASSERT(range(5,0).nc() == 6,"");
DLIB_CASSERT(range(5,1).nr() == 5,""); DLIB_CASSERT(range(5,1).nc() == 5,"");
DLIB_CASSERT(range(5,0).nc() == 1,""); DLIB_CASSERT(range(5,0).nr() == 1,"");
DLIB_CASSERT(range(5,1).nc() == 1,""); DLIB_CASSERT(range(5,1).nr() == 1,"");
DLIB_CASSERT(trans(range(5,0)).nc() == 6,""); DLIB_CASSERT(trans(range(5,0)).nr() == 6,"");
DLIB_CASSERT(trans(range(5,1)).nc() == 5,""); DLIB_CASSERT(trans(range(5,1)).nr() == 5,"");
DLIB_CASSERT(trans(range(5,0)).nr() == 1,""); DLIB_CASSERT(trans(range(5,0)).nc() == 1,"");
DLIB_CASSERT(trans(range(5,1)).nr() == 1,""); DLIB_CASSERT(trans(range(5,1)).nc() == 1,"");
DLIB_CASSERT(range(5,2,0).nr() == 3,""); DLIB_CASSERT(range(5,2,0).nc() == 3,"");
DLIB_CASSERT(range(5,2,1).nr() == 3,""); DLIB_CASSERT(range(5,2,1).nc() == 3,"");
DLIB_CASSERT(range(5,2,0).nc() == 1,""); DLIB_CASSERT(range(5,2,0).nr() == 1,"");
DLIB_CASSERT(range(5,2,1).nc() == 1,""); DLIB_CASSERT(range(5,2,1).nr() == 1,"");
DLIB_CASSERT(trans(range(5,2,0)).nc() == 3,""); DLIB_CASSERT(trans(range(5,2,0)).nr() == 3,"");
DLIB_CASSERT(trans(range(5,2,1)).nc() == 3,""); DLIB_CASSERT(trans(range(5,2,1)).nr() == 3,"");
DLIB_CASSERT(trans(range(5,2,0)).nr() == 1,""); DLIB_CASSERT(trans(range(5,2,0)).nc() == 1,"");
DLIB_CASSERT(trans(range(5,2,1)).nr() == 1,""); DLIB_CASSERT(trans(range(5,2,1)).nc() == 1,"");
DLIB_CASSERT(range(6,3,0).nr() == 3,""); DLIB_CASSERT(range(6,3,0).nc() == 3,"");
DLIB_CASSERT(range(5,3,1).nr() == 2,""); DLIB_CASSERT(range(5,3,1).nc() == 2,"");
DLIB_CASSERT(range(5,3,0).nc() == 1,""); DLIB_CASSERT(range(5,3,0).nr() == 1,"");
DLIB_CASSERT(range(5,3,1).nc() == 1,""); DLIB_CASSERT(range(5,3,1).nr() == 1,"");
DLIB_CASSERT(trans(range(6,3,0)).nc() == 3,""); DLIB_CASSERT(trans(range(6,3,0)).nr() == 3,"");
DLIB_CASSERT(trans(range(5,3,1)).nc() == 2,""); DLIB_CASSERT(trans(range(5,3,1)).nr() == 2,"");
DLIB_CASSERT(trans(range(5,3,0)).nr() == 1,""); DLIB_CASSERT(trans(range(5,3,0)).nc() == 1,"");
DLIB_CASSERT(trans(range(5,3,1)).nr() == 1,""); DLIB_CASSERT(trans(range(5,3,1)).nc() == 1,"");
DLIB_CASSERT(range(5,9,1).nr() == 1,"");
DLIB_CASSERT(range(5,9,1).nc() == 1,""); DLIB_CASSERT(range(5,9,1).nc() == 1,"");
DLIB_CASSERT(range(5,9,1).nr() == 1,"");
DLIB_CASSERT(range(0,0).nr() == 1,"");
DLIB_CASSERT(range(0,0).nc() == 1,""); DLIB_CASSERT(range(0,0).nc() == 1,"");
DLIB_CASSERT(range(0,0).nr() == 1,"");
DLIB_CASSERT(range(1,1)(0) == 1,""); DLIB_CASSERT(range(1,1)(0) == 1,"");
...@@ -888,32 +888,32 @@ namespace ...@@ -888,32 +888,32 @@ namespace
DLIB_CASSERT((range<5,2,1>()(0) == 5 && range<5,2,1>()(1) == 3 && range<5,2,1>()(2) == 1),""); DLIB_CASSERT((range<5,2,1>()(0) == 5 && range<5,2,1>()(1) == 3 && range<5,2,1>()(2) == 1),"");
DLIB_CASSERT((range<5,0>().nr() == 6),""); DLIB_CASSERT((range<5,0>().nc() == 6),"");
DLIB_CASSERT((range<5,1>().nr() == 5),""); DLIB_CASSERT((range<5,1>().nc() == 5),"");
DLIB_CASSERT((range<5,0>().nc() == 1),""); DLIB_CASSERT((range<5,0>().nr() == 1),"");
DLIB_CASSERT((range<5,1>().nc() == 1),""); DLIB_CASSERT((range<5,1>().nr() == 1),"");
DLIB_CASSERT((trans(range<5,0>()).nc() == 6),""); DLIB_CASSERT((trans(range<5,0>()).nr() == 6),"");
DLIB_CASSERT((trans(range<5,1>()).nc() == 5),""); DLIB_CASSERT((trans(range<5,1>()).nr() == 5),"");
DLIB_CASSERT((trans(range<5,0>()).nr() == 1),""); DLIB_CASSERT((trans(range<5,0>()).nc() == 1),"");
DLIB_CASSERT((trans(range<5,1>()).nr() == 1),""); DLIB_CASSERT((trans(range<5,1>()).nc() == 1),"");
DLIB_CASSERT((range<5,2,0>().nr() == 3),""); DLIB_CASSERT((range<5,2,0>().nc() == 3),"");
DLIB_CASSERT((range<5,2,1>().nr() == 3),""); DLIB_CASSERT((range<5,2,1>().nc() == 3),"");
DLIB_CASSERT((range<5,2,0>().nc() == 1),""); DLIB_CASSERT((range<5,2,0>().nr() == 1),"");
DLIB_CASSERT((range<5,2,1>().nc() == 1),""); DLIB_CASSERT((range<5,2,1>().nr() == 1),"");
DLIB_CASSERT((trans(range<5,2,0>()).nc() == 3),""); DLIB_CASSERT((trans(range<5,2,0>()).nr() == 3),"");
DLIB_CASSERT((trans(range<5,2,1>()).nc() == 3),""); DLIB_CASSERT((trans(range<5,2,1>()).nr() == 3),"");
DLIB_CASSERT((trans(range<5,2,0>()).nr() == 1),""); DLIB_CASSERT((trans(range<5,2,0>()).nc() == 1),"");
DLIB_CASSERT((trans(range<5,2,1>()).nr() == 1),""); DLIB_CASSERT((trans(range<5,2,1>()).nc() == 1),"");
DLIB_CASSERT((range<6,3,0>().nr() == 3),""); DLIB_CASSERT((range<6,3,0>().nc() == 3),"");
DLIB_CASSERT((range<5,3,1>().nr() == 2),""); DLIB_CASSERT((range<5,3,1>().nc() == 2),"");
DLIB_CASSERT((range<5,3,0>().nc() == 1),""); DLIB_CASSERT((range<5,3,0>().nr() == 1),"");
DLIB_CASSERT((range<5,3,1>().nc() == 1),""); DLIB_CASSERT((range<5,3,1>().nr() == 1),"");
DLIB_CASSERT((trans(range<6,3,0>()).nc() == 3),""); DLIB_CASSERT((trans(range<6,3,0>()).nr() == 3),"");
DLIB_CASSERT((trans(range<5,3,1>()).nc() == 2),""); DLIB_CASSERT((trans(range<5,3,1>()).nr() == 2),"");
DLIB_CASSERT((trans(range<5,3,0>()).nr() == 1),""); DLIB_CASSERT((trans(range<5,3,0>()).nc() == 1),"");
DLIB_CASSERT((trans(range<5,3,1>()).nr() == 1),""); DLIB_CASSERT((trans(range<5,3,1>()).nc() == 1),"");
} }
{ {
...@@ -1042,6 +1042,39 @@ namespace ...@@ -1042,6 +1042,39 @@ namespace
DLIB_CASSERT(index_of_max(trans(m)) == 2, ""); DLIB_CASSERT(index_of_max(trans(m)) == 2, "");
} }
{
matrix<double> m1(1,5), m2;
m1 = 3.0000, 3.7500, 4.5000, 5.2500, 6.0000;
m2 = linspace(3, 6, 5);
DLIB_CASSERT(equal(m1, m2), "");
m1 = pow(10, m1);
m2 = logspace(3, 6, 5);
DLIB_CASSERT(equal(m1, m2), "");
}
{
matrix<long> m = cartesian_product(range(1,3), range(0,1));
matrix<long,2,1> c0, c1, c2, c3, c4, c5;
c0 = 1, 0;
c1 = 1, 1;
c2 = 2, 0;
c3 = 2, 1;
c4 = 3, 0;
c5 = 3, 1;
DLIB_CASSERT(colm(m,0) == c0, colm(m,0) << "\n\n" << c0);
DLIB_CASSERT(colm(m,1) == c1, "");
DLIB_CASSERT(colm(m,2) == c2, "");
DLIB_CASSERT(colm(m,3) == c3, "");
DLIB_CASSERT(colm(m,4) == c4, "");
DLIB_CASSERT(colm(m,5) == c5, "");
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment