Commit 2e4e37dc authored by Davis King's avatar Davis King

made code a little clearer

parent 249b0dd1
...@@ -238,7 +238,7 @@ namespace dlib ...@@ -238,7 +238,7 @@ namespace dlib
template <bool print_tag, typename T, typename U > template <bool print_tag, typename T, typename U >
void print_parse_tree_helper ( void print_parse_tree_helper (
const std::vector<parse_tree_element<T> >& tree, const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items, const std::vector<U>& words,
unsigned long i, unsigned long i,
std::ostream& out std::ostream& out
) )
...@@ -254,19 +254,19 @@ namespace dlib ...@@ -254,19 +254,19 @@ namespace dlib
if (tree[i].left < tree.size()) if (tree[i].left < tree.size())
{ {
left_recurse = true; left_recurse = true;
print_parse_tree_helper<print_tag>(tree, items, tree[i].left, out); print_parse_tree_helper<print_tag>(tree, words, tree[i].left, out);
} }
else else
{ {
if (tree[i].c.begin < items.size()) if (tree[i].c.begin < words.size())
{ {
out << items[tree[i].c.begin] << " "; out << words[tree[i].c.begin] << " ";
} }
else else
{ {
std::ostringstream sout; std::ostringstream sout;
sout << "Parse tree refers to element " << tree[i].c.begin sout << "Parse tree refers to element " << tree[i].c.begin
<< " of sequence which is only of size " << items.size() << "."; << " of sequence which is only of size " << words.size() << ".";
throw parse_tree_to_string_error(sout.str()); throw parse_tree_to_string_error(sout.str());
} }
} }
...@@ -276,19 +276,19 @@ namespace dlib ...@@ -276,19 +276,19 @@ namespace dlib
if (left_recurse == true) if (left_recurse == true)
out << " "; out << " ";
print_parse_tree_helper<print_tag>(tree, items, tree[i].right, out); print_parse_tree_helper<print_tag>(tree, words, tree[i].right, out);
} }
else else
{ {
if (tree[i].c.k < items.size()) if (tree[i].c.k < words.size())
{ {
out << items[tree[i].c.k]; out << words[tree[i].c.k];
} }
else else
{ {
std::ostringstream sout; std::ostringstream sout;
sout << "Parse tree refers to element " << tree[i].c.k sout << "Parse tree refers to element " << tree[i].c.k
<< " of sequence which is only of size " << items.size() << "."; << " of sequence which is only of size " << words.size() << ".";
throw parse_tree_to_string_error(sout.str()); throw parse_tree_to_string_error(sout.str());
} }
} }
...@@ -303,14 +303,14 @@ namespace dlib ...@@ -303,14 +303,14 @@ namespace dlib
template <typename T, typename U> template <typename T, typename U>
std::string parse_tree_to_string ( std::string parse_tree_to_string (
const std::vector<parse_tree_element<T> >& tree, const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items const std::vector<U>& words
) )
{ {
if (tree.size() == 0) if (tree.size() == 0)
return ""; return "";
std::ostringstream sout; std::ostringstream sout;
impl::print_parse_tree_helper<false>(tree, items, 0, sout); impl::print_parse_tree_helper<false>(tree, words, 0, sout);
return sout.str(); return sout.str();
} }
...@@ -319,14 +319,14 @@ namespace dlib ...@@ -319,14 +319,14 @@ namespace dlib
template <typename T, typename U> template <typename T, typename U>
std::string parse_tree_to_string_tagged ( std::string parse_tree_to_string_tagged (
const std::vector<parse_tree_element<T> >& tree, const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items const std::vector<U>& words
) )
{ {
if (tree.size() == 0) if (tree.size() == 0)
return ""; return "";
std::ostringstream sout; std::ostringstream sout;
impl::print_parse_tree_helper<true>(tree, items, 0, sout); impl::print_parse_tree_helper<true>(tree, words, 0, sout);
return sout.str(); return sout.str();
} }
......
...@@ -136,7 +136,7 @@ namespace dlib ...@@ -136,7 +136,7 @@ namespace dlib
template <typename T, typename U> template <typename T, typename U>
std::string parse_tree_to_string ( std::string parse_tree_to_string (
const std::vector<parse_tree_element<T> >& tree, const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items const std::vector<U>& words
); );
/*! /*!
ensures ensures
...@@ -148,7 +148,7 @@ namespace dlib ...@@ -148,7 +148,7 @@ namespace dlib
template <typename T, typename U> template <typename T, typename U>
std::string parse_tree_to_string_tagged ( std::string parse_tree_to_string_tagged (
const std::vector<parse_tree_element<T> >& tree, const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items const std::vector<U>& words
); );
/*! /*!
ensures ensures
......
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