experiments/STT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

PR #3279 - Added some comments, harmonized a few names, removed unneeded spaces

Browse Source
This commit is contained in:
godeffroy 2020-09-17 14:27:33 +02:00
parent 23944b97db
commit 5bf5124366
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native_client/ctcdecode/ctc_beam_search_decoder.cpp
View File

@ -37,7 +37,7 @@ DecoderState::init(const Alphabet& alphabet,
prefix_root_.reset(root); prefix_root_.reset(root);
prefix_root_->timesteps = &timestep_tree_root_; prefix_root_->timesteps = &timestep_tree_root_;
prefixes_.push_back(root); prefixes_.push_back(root);
if (ext_scorer && (bool)(ext_scorer_->dictionary)) { if (ext_scorer && (bool)(ext_scorer_->dictionary)) {
// no need for std::make_shared<>() since Copy() does 'new' behind the doors // no need for std::make_shared<>() since Copy() does 'new' behind the doors
auto dict_ptr = std::shared_ptr<PathTrie::FstType>(ext_scorer->dictionary->Copy(true)); auto dict_ptr = std::shared_ptr<PathTrie::FstType>(ext_scorer->dictionary->Copy(true));

16
native_client/ctcdecode/path_trie.h
View File

@ -24,11 +24,17 @@ struct TreeNode {
TreeNode(TreeNode<DataT>* parent_, DataT const& data_): parent{parent_}, data{data_} {} TreeNode(TreeNode<DataT>* parent_, DataT const& data_): parent{parent_}, data{data_} {}
}; };
/* Creates a new TreeNode<NodeDataT> with given data as a child to the given node.
* Returns a pointer to the created node. This pointer remains valid as long as the child is not destroyed.
*/
template<class NodeDataT, class ChildDataT> template<class NodeDataT, class ChildDataT>
TreeNode<NodeDataT>* add_child(TreeNode<NodeDataT>* node, ChildDataT&& data_); TreeNode<NodeDataT>* add_child(TreeNode<NodeDataT>* tree_node, ChildDataT&& data);
/* Returns the sequence of tree node's data from the given root (exclusive) to the given tree_node (inclusive).
* By default (if no root is provided), the full sequence from the root of the tree is returned.
*/
template<class DataT> template<class DataT>
std::vector<DataT> get_history(TreeNode<DataT> const*, TreeNode<DataT> const* = nullptr); std::vector<DataT> get_history(TreeNode<DataT> const* tree_node, TreeNode<DataT> const* root = nullptr);
using TimestepTreeNode = TreeNode<unsigned int>; using TimestepTreeNode = TreeNode<unsigned int>;
@ -108,10 +114,10 @@ private:
// TreeNode implementation // TreeNode implementation
template<class NodeDataT, class ChildDataT> template<class NodeDataT, class ChildDataT>
TreeNode<NodeDataT>* add_child(TreeNode<NodeDataT>* node, ChildDataT&& data_) { TreeNode<NodeDataT>* add_child(TreeNode<NodeDataT>* tree_node, ChildDataT&& data) {
static thread_local godefv::memory::object_pool_t<TreeNode<NodeDataT>> tree_node_pool; static thread_local godefv::memory::object_pool_t<TreeNode<NodeDataT>> tree_node_pool;
node->children.push_back(tree_node_pool.make_unique(node, std::forward<ChildDataT>(data_))); tree_node->children.push_back(tree_node_pool.make_unique(tree_node, std::forward<ChildDataT>(data)));
return node->children.back().get(); return tree_node->children.back().get();
} }
template<class DataT> template<class DataT>