Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
dlib
Commits
1af517bc
Commit
1af517bc
authored
Feb 12, 2016
by
Davis E. King
Browse files
Merge pull request #78 from ernestotapiar/issue_orthogonalize
orthogonalize does not work with fixed-sized matrices
parents
4bcecf25
e553b0fc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
dlib/matrix/matrix_qr.h
dlib/matrix/matrix_qr.h
+4
-2
dlib/test/matrix4.cpp
dlib/test/matrix4.cpp
+10
-0
No files found.
dlib/matrix/matrix_qr.h
View file @
1af517bc
...
@@ -62,8 +62,9 @@ namespace dlib
...
@@ -62,8 +62,9 @@ namespace dlib
const
matrix_type
get_q
(
const
matrix_type
get_q
(
)
const
;
)
const
;
template
<
typename
T
,
long
R
,
long
C
,
typename
MM
,
typename
L
>
void
get_q
(
void
get_q
(
matrix
_type
&
Q
matrix
<
T
,
R
,
C
,
MM
,
L
>
&
Q
)
const
;
)
const
;
template
<
typename
EXP
>
template
<
typename
EXP
>
...
@@ -270,9 +271,10 @@ namespace dlib
...
@@ -270,9 +271,10 @@ namespace dlib
// ----------------------------------------------------------------------------------------
// ----------------------------------------------------------------------------------------
template
<
typename
matrix_exp_type
>
template
<
typename
matrix_exp_type
>
template
<
typename
T
,
long
R
,
long
C
,
typename
MM
,
typename
L
>
void
qr_decomposition
<
matrix_exp_type
>::
void
qr_decomposition
<
matrix_exp_type
>::
get_q
(
get_q
(
matrix
_type
&
X
matrix
<
T
,
R
,
C
,
MM
,
L
>
&
X
)
const
)
const
{
{
#ifdef DLIB_USE_LAPACK
#ifdef DLIB_USE_LAPACK
...
...
dlib/test/matrix4.cpp
View file @
1af517bc
...
@@ -631,6 +631,16 @@ namespace
...
@@ -631,6 +631,16 @@ namespace
3
,
3
,
3
;
3
,
3
,
3
;
DLIB_TEST
(
upperbound
(
m
,
3
)
==
M
);
DLIB_TEST
(
upperbound
(
m
,
3
)
==
M
);
}
}
{
matrix
<
double
,
9
,
5
>
A
=
randm
(
9
,
5
);
matrix
<
double
>
B
=
A
;
orthogonalize
(
A
);
orthogonalize
(
B
);
DLIB_TEST
(
equal
(
A
,
B
));
}
}
}
...
...
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