Commit 82230b59 authored by Davis King's avatar Davis King

renamed some things

parent 8a7fb193
......@@ -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<lhs_type>, std::vector<rhs_type> > sample_type;
typedef std::pair<std::vector<lhs_element>, std::vector<rhs_element> > sample_type;
typedef std::vector<long> label_type;
typedef label_type result_type;
......@@ -100,8 +100,8 @@ namespace dlib
) const { return force_assignment; }
result_type operator()(
const std::vector<lhs_type>& lhs,
const std::vector<rhs_type>& rhs
const std::vector<lhs_element>& lhs,
const std::vector<rhs_element>& rhs
) const
/*!
ensures
......
......@@ -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<lhs_type>, std::vector<rhs_type> > sample_type;
typedef std::pair<std::vector<lhs_element>, std::vector<rhs_element> > sample_type;
typedef std::vector<long> label_type;
......
......@@ -25,11 +25,11 @@ namespace dlib
typedef matrix<double,0,1> 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<lhs_type>, std::vector<rhs_type> > sample_type;
typedef std::pair<std::vector<lhs_element>, std::vector<rhs_element> > sample_type;
typedef std::vector<long> label_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