diff --git a/dlib/svm/assignment_function.h b/dlib/svm/assignment_function.h index 8d6fc772f..639623991 100644 --- a/dlib/svm/assignment_function.h +++ b/dlib/svm/assignment_function.h @@ -20,11 +20,11 @@ namespace dlib { public: - typedef typename feature_extractor::lhs_type lhs_type; - typedef typename feature_extractor::rhs_type rhs_type; + typedef typename feature_extractor::lhs_element lhs_element; + typedef typename feature_extractor::rhs_element rhs_element; - typedef std::pair, std::vector > sample_type; + typedef std::pair, std::vector > sample_type; typedef std::vector label_type; typedef label_type result_type; @@ -100,8 +100,8 @@ namespace dlib ) const { return force_assignment; } result_type operator()( - const std::vector& lhs, - const std::vector& rhs + const std::vector& lhs, + const std::vector& rhs ) const /*! ensures diff --git a/dlib/svm/structural_assignment_trainer.h b/dlib/svm/structural_assignment_trainer.h index 092ff328d..731742706 100644 --- a/dlib/svm/structural_assignment_trainer.h +++ b/dlib/svm/structural_assignment_trainer.h @@ -20,10 +20,10 @@ namespace dlib class structural_assignment_trainer { public: - typedef typename feature_extractor::lhs_type lhs_type; - typedef typename feature_extractor::rhs_type rhs_type; + typedef typename feature_extractor::lhs_element lhs_element; + typedef typename feature_extractor::rhs_element rhs_element; - typedef std::pair, std::vector > sample_type; + typedef std::pair, std::vector > sample_type; typedef std::vector label_type; diff --git a/dlib/svm/structural_svm_assignment_problem.h b/dlib/svm/structural_svm_assignment_problem.h index 002818641..0a20bc55a 100644 --- a/dlib/svm/structural_svm_assignment_problem.h +++ b/dlib/svm/structural_svm_assignment_problem.h @@ -25,11 +25,11 @@ namespace dlib typedef matrix matrix_type; typedef typename feature_extractor::feature_vector_type feature_vector_type; - typedef typename feature_extractor::lhs_type lhs_type; - typedef typename feature_extractor::rhs_type rhs_type; + typedef typename feature_extractor::lhs_element lhs_element; + typedef typename feature_extractor::rhs_element rhs_element; - typedef std::pair, std::vector > sample_type; + typedef std::pair, std::vector > sample_type; typedef std::vector label_type;