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
222f8a3d
Commit
222f8a3d
authored
Aug 03, 2014
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hopefully fixed test failure on Linux
parent
24b01a8e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
30 deletions
+7
-30
morph.cpp
modules/imgproc/src/morph.cpp
+3
-6
boost.cpp
modules/ml/src/boost.cpp
+0
-2
tree.cpp
modules/ml/src/tree.cpp
+4
-22
No files found.
modules/imgproc/src/morph.cpp
View file @
222f8a3d
...
...
@@ -1221,7 +1221,7 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
IPP_MORPH_CASE
(
CV_32FC3
,
32
f_C3R
,
32
f
);
IPP_MORPH_CASE
(
CV_32FC4
,
32
f_C4R
,
32
f
);
default:
return
false
;
;
}
#undef IPP_MORPH_CASE
...
...
@@ -1253,14 +1253,11 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne
IPP_MORPH_CASE
(
CV_32FC3
,
32
f_C3R
,
32
f
);
IPP_MORPH_CASE
(
CV_32FC4
,
32
f_C4R
,
32
f
);
default:
return
false
;
;
}
#undef IPP_MORPH_CASE
#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ >= 8
return
false
;
/// It disables false positive warning in GCC 4.8 and further
#endif
}
return
false
;
}
static
bool
IPPMorphOp
(
int
op
,
InputArray
_src
,
OutputArray
_dst
,
...
...
modules/ml/src/boost.cpp
View file @
222f8a3d
...
...
@@ -220,7 +220,6 @@ public:
void
updateWeightsAndTrim
(
int
treeidx
,
vector
<
int
>&
sidx
)
{
putchar
(
'<'
);
int
i
,
n
=
(
int
)
w
->
sidx
.
size
();
int
nvars
=
(
int
)
varIdx
.
size
();
double
sumw
=
0.
,
C
=
1.
;
...
...
@@ -374,7 +373,6 @@ public:
if
(
w
->
sample_weights
[
si
]
>=
threshold
)
sidx
.
push_back
(
si
);
}
putchar
(
'>'
);
fflush
(
stdout
);
}
float
predictTrees
(
const
Range
&
range
,
const
Mat
&
sample
,
int
flags0
)
const
...
...
modules/ml/src/tree.cpp
View file @
222f8a3d
...
...
@@ -340,26 +340,6 @@ int DTreesImpl::addTree(const vector<int>& sidx )
break
;
w_nidx
=
w
->
wnodes
[
w_pidx
].
right
;
#if 1
if
(
w_nidx
<
0
)
{
size_t
i
,
nnodes
=
w
->
wnodes
.
size
();
printf
(
"w_pidx = %d
\n
wnodes (%d): "
,
w_pidx
,
(
int
)
n
);
for
(
i
=
0
;
i
<
nnodes
;
i
++
)
{
printf
(
"[%d. depth=%d parent=%d, left=%d, right=%d] "
,
(
int
)
i
,
w
->
wnodes
[
i
].
depth
,
w
->
wnodes
[
i
].
parent
,
w
->
wnodes
[
i
].
left
,
w
->
wnodes
[
i
].
right
);
}
nnodes
=
nodes
.
size
();
printf
(
"
\n
nodes (%d): "
,
(
int
)
nnodes
);
for
(
i
=
0
;
i
<
nnodes
;
i
++
)
{
printf
(
"[%d. parent=%d, left=%d, right=%d] "
,
(
int
)
i
,
nodes
[
i
].
parent
,
nodes
[
i
].
left
,
nodes
[
i
].
right
);
}
printf
(
"
\n
"
);
}
#endif
CV_Assert
(
w_nidx
>=
0
);
}
}
...
...
@@ -450,8 +430,10 @@ int DTreesImpl::addNodeAndTrySplit( int parent, const vector<int>& sidx )
if
(
params
.
useSurrogates
)
CV_Error
(
CV_StsNotImplemented
,
"surrogate splits are not implemented yet"
);
w
->
wnodes
[
nidx
].
left
=
addNodeAndTrySplit
(
nidx
,
sleft
);
w
->
wnodes
[
nidx
].
right
=
addNodeAndTrySplit
(
nidx
,
sright
);
int
left
=
addNodeAndTrySplit
(
nidx
,
sleft
);
int
right
=
addNodeAndTrySplit
(
nidx
,
sright
);
w
->
wnodes
[
nidx
].
left
=
left
;
w
->
wnodes
[
nidx
].
right
=
right
;
CV_Assert
(
w
->
wnodes
[
nidx
].
left
>
0
&&
w
->
wnodes
[
nidx
].
right
>
0
);
}
...
...
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