generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cv::sort

Browse Source
This commit is contained in:
Ilya Lavrenov 2014-04-15 00:11:16 +04:00
parent cb8743f9aa
commit d5513f522b
2 changed files with 72 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
modules/core/perf/perf_sort.cpp Normal file
View File

@ -0,0 +1,32 @@
#include "perf_precomp.hpp"
using namespace std;
using namespace cv;
using namespace perf;
using std::tr1::tuple;
using std::tr1::make_tuple;
using std::tr1::get;
#define TYPICAL_MAT_SIZES_SORT TYPICAL_MAT_SIZES
#define TYPICAL_MAT_TYPES_SORT CV_8SC1, CV_16UC1, CV_32FC1
#define SORT_TYPES SORT_EVERY_ROW | SORT_ASCENDING, SORT_EVERY_ROW | SORT_DESCENDING
#define TYPICAL_MATS_SORT testing::Combine( testing::Values(TYPICAL_MAT_SIZES_SORT), testing::Values(TYPICAL_MAT_TYPES_SORT), testing::Values(SORT_TYPES) )
typedef tuple<Size, MatType, int> sortParams;
typedef TestBaseWithParam<sortParams> sortFixture;
PERF_TEST_P(sortFixture, sort, TYPICAL_MATS_SORT)
{
const sortParams params = GetParam();
const Size sz = get<0>(params);
const int type = get<1>(params), flags = get<2>(params);
cv::Mat a(sz, type), b(sz, type);
declare.in(a, WARMUP_RNG).out(b);
TEST_CYCLE() cv::sort(a, b, flags);
SANITY_CHECK(b);
}

46
modules/core/src/matrix.cpp
View File

@ -3467,6 +3467,30 @@ void cv::reduce(InputArray _src, OutputArray _dst, int dim, int op, int dtype)
namespace cv namespace cv
{ {
#if IPP_VERSION_X100 > 0 && !defined HAVE_IPP_ICV_ONLY
typedef IppStatus (CV_STDCALL *IppSortFunc)(void *, int);
static IppSortFunc getSortFunc(int depth, bool sortDescending)
{
if (!sortDescending)
return depth == CV_8U ? (IppSortFunc)ippsSortAscend_8u_I :
depth == CV_16U ? (IppSortFunc)ippsSortAscend_16u_I :
depth == CV_16S ? (IppSortFunc)ippsSortAscend_16s_I :
depth == CV_32S ? (IppSortFunc)ippsSortAscend_32s_I :
depth == CV_32F ? (IppSortFunc)ippsSortAscend_32f_I :
depth == CV_64F ? (IppSortFunc)ippsSortAscend_64f_I : 0;
else
return depth == CV_8U ? (IppSortFunc)ippsSortDescend_8u_I :
depth == CV_16U ? (IppSortFunc)ippsSortDescend_16u_I :
depth == CV_16S ? (IppSortFunc)ippsSortDescend_16s_I :
depth == CV_32S ? (IppSortFunc)ippsSortDescend_32s_I :
depth == CV_32F ? (IppSortFunc)ippsSortDescend_32f_I :
depth == CV_64F ? (IppSortFunc)ippsSortDescend_64f_I : 0;
}
#endif
template<typename T> static void sort_( const Mat& src, Mat& dst, int flags ) template<typename T> static void sort_( const Mat& src, Mat& dst, int flags )
{ {
AutoBuffer<T> buf; AutoBuffer<T> buf;
@ -3485,6 +3509,10 @@ template<typename T> static void sort_( const Mat& src, Mat& dst, int flags )
} }
bptr = (T*)buf; bptr = (T*)buf;
#if IPP_VERSION_X100 > 0 && !defined HAVE_IPP_ICV_ONLY
IppSortFunc ippFunc = getSortFunc(src.depth(), sortDescending);
#endif
for( i = 0; i < n; i++ ) for( i = 0; i < n; i++ )
{ {
T* ptr = bptr; T* ptr = bptr;
@ -3494,8 +3522,7 @@ template<typename T> static void sort_( const Mat& src, Mat& dst, int flags )
if( !inplace ) if( !inplace )
{ {
const T* sptr = (const T*)(src.data + src.step*i); const T* sptr = (const T*)(src.data + src.step*i);
for( j = 0; j < len; j++ ) memcpy(dptr, sptr, sizeof(T) * len);
dptr[j] = sptr[j];
} }
ptr = dptr; ptr = dptr;
} }
@ -3504,10 +3531,17 @@ template<typename T> static void sort_( const Mat& src, Mat& dst, int flags )
for( j = 0; j < len; j++ ) for( j = 0; j < len; j++ )
ptr[j] = ((const T*)(src.data + src.step*j))[i]; ptr[j] = ((const T*)(src.data + src.step*j))[i];
} }
std::sort( ptr, ptr + len );
if( sortDescending ) #if IPP_VERSION_X100 > 0 && !defined HAVE_IPP_ICV_ONLY
for( j = 0; j < len/2; j++ ) if (!ippFunc || ippFunc(ptr, len) < 0)
std::swap(ptr[j], ptr[len-1-j]); #endif
{
std::sort( ptr, ptr + len );
if( sortDescending )
for( j = 0; j < len/2; j++ )
std::swap(ptr[j], ptr[len-1-j]);
}
if( !sortRows ) if( !sortRows )
for( j = 0; j < len; j++ ) for( j = 0; j < len; j++ )
((T*)(dst.data + dst.step*j))[i] = ptr[j]; ((T*)(dst.data + dst.step*j))[i] = ptr[j];