Skip to content

GitLab

"scripts" did not exist on "985f027dcc4304d672d5074d685b69625f654425"
Commit bf2ce54e authored by Davis King's avatar Davis King
Browse files

Added a matrix_type typedef to structural_svm_problem_threaded 

so it matches the interface of the structural_svm_problem.
parent 8e4b63df
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
dlib/svm/structural_svm_problem_threaded.h
View file @ bf2ce54e
...@@ -18,13 +18,14 @@ namespace dlib ...@@ -18,13 +18,14 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template < template <
typename matrix_type, typename matrix_type_,
typename feature_vector_type_ = matrix_type typename feature_vector_type_ = matrix_type_
> >
class structural_svm_problem_threaded : public structural_svm_problem<matrix_type,feature_vector_type_> class structural_svm_problem_threaded : public structural_svm_problem<matrix_type_,feature_vector_type_>
{ {
public: public:
typedef matrix_type_ matrix_type;
typedef typename matrix_type::type scalar_type; typedef typename matrix_type::type scalar_type;
typedef feature_vector_type_ feature_vector_type; typedef feature_vector_type_ feature_vector_type;
......
dlib/svm/structural_svm_problem_threaded_abstract.h
View file @ bf2ce54e
...@@ -12,10 +12,10 @@ namespace dlib ...@@ -12,10 +12,10 @@ namespace dlib
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
template < template <
typename matrix_type, typename matrix_type_,
typename feature_vector_type_ = matrix_type typename feature_vector_type_ = matrix_type_
> >
class structural_svm_problem_threaded : public structural_svm_problem<matrix_type,feature_vector_type_> class structural_svm_problem_threaded : public structural_svm_problem<matrix_type_,feature_vector_type_>
{ {
public: public:
/*! /*!
...@@ -31,6 +31,7 @@ namespace dlib ...@@ -31,6 +31,7 @@ namespace dlib
if you are to use this version of the structural_svm_problem. if you are to use this version of the structural_svm_problem.
!*/ !*/
typedef matrix_type_ matrix_type;
typedef typename matrix_type::type scalar_type; typedef typename matrix_type::type scalar_type;
typedef feature_vector_type_ feature_vector_type; typedef feature_vector_type_ feature_vector_type;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment