OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

made code a little clearer

This commit is contained in:
Davis King 2012-11-11 23:03:13 -05:00
parent 249b0dd116
commit 2e4e37dc80
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlib/optimization/find_max_parse_cky.h
View File

@ -238,7 +238,7 @@ namespace dlib
template <bool print_tag, typename T, typename U >
void print_parse_tree_helper (
const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items,
const std::vector<U>& words,
unsigned long i,
std::ostream& out
)
@ -254,19 +254,19 @@ namespace dlib
if (tree[i].left < tree.size())
{
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
{
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
{
std::ostringstream sout;
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());
}
}
@ -276,19 +276,19 @@ namespace dlib
if (left_recurse == true)
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
{
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
{
std::ostringstream sout;
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());
}
}
@ -303,14 +303,14 @@ namespace dlib
template <typename T, typename U>
std::string parse_tree_to_string (
const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items
const std::vector<U>& words
)
{
if (tree.size() == 0)
return "";
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();
}
@ -319,14 +319,14 @@ namespace dlib
template <typename T, typename U>
std::string parse_tree_to_string_tagged (
const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items
const std::vector<U>& words
)
{
if (tree.size() == 0)
return "";
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();
}

4
dlib/optimization/find_max_parse_cky_abstract.h
View File

@ -136,7 +136,7 @@ namespace dlib
template <typename T, typename U>
std::string parse_tree_to_string (
const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items
const std::vector<U>& words
);
/*!
ensures
@ -148,7 +148,7 @@ namespace dlib
template <typename T, typename U>
std::string parse_tree_to_string_tagged (
const std::vector<parse_tree_element<T> >& tree,
const std::vector<U>& items
const std::vector<U>& words
);
/*!
ensures