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
c5689ea2
Commit
c5689ea2
authored
Mar 18, 2018
by
Davis King
Browse files
Fixed random forest feature extraction serialization.
parent
60a4af67
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
dlib/random_forest/random_forest_regression.h
dlib/random_forest/random_forest_regression.h
+3
-1
dlib/random_forest/random_forest_regression_abstract.h
dlib/random_forest/random_forest_regression_abstract.h
+1
-1
No files found.
dlib/random_forest/random_forest_regression.h
View file @
c5689ea2
...
@@ -83,7 +83,7 @@ namespace dlib
...
@@ -83,7 +83,7 @@ namespace dlib
serialize
(
item
.
num_feats
,
out
);
serialize
(
item
.
num_feats
,
out
);
}
}
friend
void
serialize
(
dense_feature_extractor
&
item
,
std
::
istream
&
in
)
friend
void
de
serialize
(
dense_feature_extractor
&
item
,
std
::
istream
&
in
)
{
{
check_serialized_version
(
"dense_feature_extractor"
,
in
);
check_serialized_version
(
"dense_feature_extractor"
,
in
);
deserialize
(
item
.
num_feats
,
in
);
deserialize
(
item
.
num_feats
,
in
);
...
@@ -210,6 +210,7 @@ namespace dlib
...
@@ -210,6 +210,7 @@ namespace dlib
friend
void
serialize
(
const
random_forest_regression_function
&
item
,
std
::
ostream
&
out
)
friend
void
serialize
(
const
random_forest_regression_function
&
item
,
std
::
ostream
&
out
)
{
{
serialize
(
"random_forest_regression_function"
,
out
);
serialize
(
"random_forest_regression_function"
,
out
);
serialize
(
item
.
fe
,
out
);
serialize
(
item
.
trees
,
out
);
serialize
(
item
.
trees
,
out
);
serialize
(
item
.
leaves
,
out
);
serialize
(
item
.
leaves
,
out
);
}
}
...
@@ -217,6 +218,7 @@ namespace dlib
...
@@ -217,6 +218,7 @@ namespace dlib
friend
void
deserialize
(
random_forest_regression_function
&
item
,
std
::
istream
&
in
)
friend
void
deserialize
(
random_forest_regression_function
&
item
,
std
::
istream
&
in
)
{
{
check_serialized_version
(
"random_forest_regression_function"
,
in
);
check_serialized_version
(
"random_forest_regression_function"
,
in
);
deserialize
(
item
.
fe
,
in
);
deserialize
(
item
.
trees
,
in
);
deserialize
(
item
.
trees
,
in
);
deserialize
(
item
.
leaves
,
in
);
deserialize
(
item
.
leaves
,
in
);
}
}
...
...
dlib/random_forest/random_forest_regression_abstract.h
View file @
c5689ea2
...
@@ -121,7 +121,7 @@ namespace dlib
...
@@ -121,7 +121,7 @@ namespace dlib
};
};
void
serialize
(
const
dense_feature_extractor
&
item
,
std
::
ostream
&
out
);
void
serialize
(
const
dense_feature_extractor
&
item
,
std
::
ostream
&
out
);
void
serialize
(
dense_feature_extractor
&
item
,
std
::
istream
&
in
);
void
de
serialize
(
dense_feature_extractor
&
item
,
std
::
istream
&
in
);
/*!
/*!
provides serialization support
provides serialization support
!*/
!*/
...
...
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