Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
03bcfe41
Commit
03bcfe41
authored
Dec 12, 2016
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test: fix RNG problem in accuracy tests
parent
2fded5d8
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
3 deletions
+11
-3
ts.hpp
modules/ts/include/opencv2/ts.hpp
+3
-1
ts_ext.hpp
modules/ts/include/opencv2/ts/ts_ext.hpp
+3
-1
ts.cpp
modules/ts/src/ts.cpp
+5
-0
ts_perf.cpp
modules/ts/src/ts_perf.cpp
+0
-1
No files found.
modules/ts/include/opencv2/ts.hpp
View file @
03bcfe41
...
...
@@ -539,11 +539,13 @@ protected:
}
};
extern
uint64
param_seed
;
struct
CV_EXPORTS
DefaultRngAuto
{
const
uint64
old_state
;
DefaultRngAuto
()
:
old_state
(
cv
::
theRNG
().
state
)
{
cv
::
theRNG
().
state
=
(
uint64
)
-
1
;
}
DefaultRngAuto
()
:
old_state
(
cv
::
theRNG
().
state
)
{
cv
::
theRNG
().
state
=
cvtest
::
param_seed
;
}
~
DefaultRngAuto
()
{
cv
::
theRNG
().
state
=
old_state
;
}
DefaultRngAuto
&
operator
=
(
const
DefaultRngAuto
&
);
...
...
modules/ts/include/opencv2/ts/ts_ext.hpp
View file @
03bcfe41
...
...
@@ -12,7 +12,9 @@ namespace cvtest {
void
checkIppStatus
();
}
#define CV_TEST_INIT cv::ipp::setIppStatus(0);
#define CV_TEST_INIT \
cv::ipp::setIppStatus(0); \
cv::theRNG().state = cvtest::param_seed;
#define CV_TEST_CLEANUP ::cvtest::checkIppStatus();
#define CV_TEST_BODY_IMPL \
{ \
...
...
modules/ts/src/ts.cpp
View file @
03bcfe41
...
...
@@ -80,6 +80,8 @@
namespace
cvtest
{
uint64
param_seed
=
0x12345678
;
// real value is passed via parseCustomOptions function
static
std
::
string
path_join
(
const
std
::
string
&
prefix
,
const
std
::
string
&
subpath
)
{
CV_Assert
(
subpath
.
empty
()
||
subpath
[
0
]
!=
'/'
);
...
...
@@ -695,6 +697,7 @@ void parseCustomOptions(int argc, char **argv)
{
const
char
*
const
command_line_keys
=
"{ ipp test_ipp_check |false |check whether IPP works without failures }"
"{ test_seed |809564 |seed for random numbers generator }"
"{ h help |false |print help info }"
;
cv
::
CommandLineParser
parser
(
argc
,
argv
,
command_line_keys
);
...
...
@@ -711,6 +714,8 @@ void parseCustomOptions(int argc, char **argv)
#else
test_ipp_check
=
false
;
#endif
param_seed
=
parser
.
get
<
unsigned
int
>
(
"test_seed"
);
}
...
...
modules/ts/src/ts_perf.cpp
View file @
03bcfe41
...
...
@@ -38,7 +38,6 @@ static double param_max_outliers;
static
double
param_max_deviation
;
static
unsigned
int
param_min_samples
;
static
unsigned
int
param_force_samples
;
static
uint64
param_seed
;
static
double
param_time_limit
;
static
int
param_threads
;
static
bool
param_write_sanity
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment