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
50a2113f
Commit
50a2113f
authored
Apr 23, 2014
by
Davis King
Browse files
Added operator+= to discriminant_pca.
parent
81a04634
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
3 deletions
+25
-3
dlib/statistics/dpca.h
dlib/statistics/dpca.h
+9
-1
dlib/statistics/dpca_abstract.h
dlib/statistics/dpca_abstract.h
+15
-1
dlib/test/discriminant_pca.cpp
dlib/test/discriminant_pca.cpp
+1
-1
No files found.
dlib/statistics/dpca.h
View file @
50a2113f
...
...
@@ -346,7 +346,7 @@ namespace dlib
serialize
(
item
.
within_weight
,
out
);
}
const
discriminant_pca
operator
+
(
discriminant_pca
operator
+
(
const
discriminant_pca
&
item
)
const
{
...
...
@@ -408,6 +408,14 @@ namespace dlib
return
temp
;
}
discriminant_pca
&
operator
+=
(
const
discriminant_pca
&
rhs
)
{
(
*
this
+
rhs
).
swap
(
*
this
);
return
*
this
;
}
private:
void
compute_dpca_matrix
(
...
...
dlib/statistics/dpca_abstract.h
View file @
50a2113f
...
...
@@ -281,7 +281,7 @@ namespace dlib
reduction to num_rows dimensions.
!*/
const
discriminant_pca
operator
+
(
discriminant_pca
operator
+
(
const
discriminant_pca
&
item
)
const
;
/*!
...
...
@@ -298,6 +298,20 @@ namespace dlib
been done to R.
!*/
discriminant_pca
&
operator
+=
(
const
discriminant_pca
&
rhs
);
/*!
requires
- in_vector_size() == 0 || rhs.in_vector_size() == 0 || in_vector_size() == rhs.in_vector_size()
(i.e. the in_vector_size() of *this and rhs must match or one must be zero)
- between_class_weight() == rhs.between_class_weight()
- within_class_weight() == rhs.within_class_weight()
ensures
- #*this == *item + rhs
- returns #*this
!*/
void
swap
(
discriminant_pca
&
item
);
...
...
dlib/test/discriminant_pca.cpp
View file @
50a2113f
...
...
@@ -252,7 +252,7 @@ namespace
matrix
<
double
>
mat
,
mat2
;
sum_dpca
=
dpca_type
()
+
dpca_type
()
+
add_dpca1
+
dpca_type
()
+
add_dpca2
+
add_dpca3
+
add_dpca4
;
sum_dpca
+
=
dpca_type
()
+
dpca_type
()
+
add_dpca1
+
dpca_type
()
+
add_dpca2
+
add_dpca3
+
add_dpca4
;
dpca
.
set_within_class_weight
(
0
);
dpca
.
set_between_class_weight
(
0
);
sum_dpca
.
set_within_class_weight
(
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