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

More natural sorting of MatType constants in performance reports.

Browse Source
This commit is contained in:
Andrey Kamaev 2012-01-16 07:04:26 +00:00
parent 61cb83b481
commit c326de43c1
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/perf/perf_stat.cpp
View File

@ -87,7 +87,7 @@ PERF_TEST_P(Size_MatType, meanStdDev_mask, TYPICAL_MATS)
SANITY_CHECK(dev, 1e-6); SANITY_CHECK(dev, 1e-6);
} }
PERF_TEST_P(Size_MatType, countNonZero, TYPICAL_MATS_C1) PERF_TEST_P(Size_MatType, countNonZero, testing::Combine( testing::Values( TYPICAL_MAT_SIZES ), testing::Values( CV_8UC1, CV_8SC1, CV_16UC1, CV_16SC1, CV_32SC1, CV_32FC1, CV_64FC1 ) ))
{ {
Size sz = get<0>(GetParam()); Size sz = get<0>(GetParam());
int matType = get<1>(GetParam()); int matType = get<1>(GetParam());

8
modules/core/src/stat.cpp
View File

@ -232,10 +232,10 @@ typedef int (*CountNonZeroFunc)(const uchar*, int);
static CountNonZeroFunc countNonZeroTab[] = static CountNonZeroFunc countNonZeroTab[] =
{ {
(CountNonZeroFunc)GET_OPTIMIZED(countNonZero8u), (CountNonZeroFunc)(countNonZero8u), (CountNonZeroFunc)GET_OPTIMIZED(countNonZero8u), (CountNonZeroFunc)GET_OPTIMIZED(countNonZero8u),
(CountNonZeroFunc)(countNonZero16u), (CountNonZeroFunc)(countNonZero16u), (CountNonZeroFunc)GET_OPTIMIZED(countNonZero16u), (CountNonZeroFunc)GET_OPTIMIZED(countNonZero16u),
(CountNonZeroFunc)(countNonZero32s), (CountNonZeroFunc)GET_OPTIMIZED(countNonZero32f), (CountNonZeroFunc)GET_OPTIMIZED(countNonZero32s), (CountNonZeroFunc)GET_OPTIMIZED(countNonZero32f),
(CountNonZeroFunc)countNonZero64f, 0 (CountNonZeroFunc)GET_OPTIMIZED(countNonZero64f), 0
}; };

7
modules/ts/misc/summary.py
View File

@ -2,8 +2,13 @@ import testlog_parser, sys, os, xml, glob, re
from table_formatter import * from table_formatter import *
from optparse import OptionParser from optparse import OptionParser
numeric_re = re.compile("(\d+)")
cvtype_re = re.compile("(8U|8S|16U|16S|32S|32F|64F)C(\d{1,3})")
cvtypes = { '8U': 0, '8S': 1, '16U': 2, '16S': 3, '32S': 4, '32F': 5, '64F': 6 }
convert = lambda text: int(text) if text.isdigit() else text convert = lambda text: int(text) if text.isdigit() else text
alphanum_keyselector = lambda key: [ convert(c) for c in re.split('([0-9]+)', key) ] keyselector = lambda a: cvtype_re.sub(lambda match: " " + str(cvtypes.get(match.group(1), 7) + (int(match.group(2))-1) * 8) + " ", a)
alphanum_keyselector = lambda key: [ convert(c) for c in numeric_re.split(keyselector(key)) ]
def getSetName(tset, idx, columns, short = True): def getSetName(tset, idx, columns, short = True):
if columns and len(columns) > idx: if columns and len(columns) > idx: