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
6ff2f395
Commit
6ff2f395
authored
Feb 18, 2015
by
Vadim Pisarevsky
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3702 from Dmitry-Me:reduceVariableScope
parents
009ab702
10368787
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
conjugate_gradient.cpp
modules/core/src/conjugate_gradient.cpp
+1
-2
No files found.
modules/core/src/conjugate_gradient.cpp
View file @
6ff2f395
...
...
@@ -136,7 +136,6 @@ namespace cv
dprintf
((
"d first time
\n
"
));
print_matrix
(
d
);
dprintf
((
"r
\n
"
));
print_matrix
(
r
);
double
beta
=
0
;
for
(
int
count
=
0
;
count
<
_termcrit
.
maxCount
;
count
++
){
minimizeOnTheLine
(
_Function
,
proxy_x
,
d
,
minimizeOnTheLine_buf1
,
minimizeOnTheLine_buf2
);
r
.
copyTo
(
r_old
);
...
...
@@ -147,7 +146,7 @@ namespace cv
break
;
}
r_norm_sq
=
r_norm_sq
*
r_norm_sq
;
beta
=
MAX
(
0.0
,(
r_norm_sq
-
r
.
dot
(
r_old
))
/
r_norm_sq
);
double
beta
=
MAX
(
0.0
,(
r_norm_sq
-
r
.
dot
(
r_old
))
/
r_norm_sq
);
d
=
r
+
beta
*
d
;
}
...
...
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