Skip to content
Snippets Groups Projects
Commit 1f3860aa authored by Jan Trávníček's avatar Jan Trávníček
Browse files

simplify postfix to tree transformation

parent 1f3eac19
No related branches found
No related tags found
No related merge requests found
...@@ -84,26 +84,22 @@ ext::tree < common::ranked_symbol < SymbolType, RankType > > TreeAuxiliary::unra ...@@ -84,26 +84,22 @@ ext::tree < common::ranked_symbol < SymbolType, RankType > > TreeAuxiliary::unra
   
template < class SymbolType, class RankType > template < class SymbolType, class RankType >
ext::tree < common::ranked_symbol < SymbolType, RankType > > TreeAuxiliary::postfixToTree ( const ext::vector < common::ranked_symbol < SymbolType, RankType > > & from ) { ext::tree < common::ranked_symbol < SymbolType, RankType > > TreeAuxiliary::postfixToTree ( const ext::vector < common::ranked_symbol < SymbolType, RankType > > & from ) {
std::stack < ext::tree < common::ranked_symbol < SymbolType, RankType > > > tree_stack; std::stack < ext::tree < common::ranked_symbol < SymbolType, RankType > > > tree_stack;
   
for ( auto x : from ) { for ( const common::ranked_symbol < SymbolType, RankType > & x : from ) {
if ( ( unsigned ) x.getRank ( ) == 0 ) { if ( ( unsigned ) x.getRank ( ) == 0 ) {
tree_stack.push ( ext::tree < common::ranked_symbol < SymbolType, RankType > > ( common::ranked_symbol < SymbolType, RankType > ( x.getSymbol ( ), x.getRank ( ) ), ext::vector < ext::tree < common::ranked_symbol < SymbolType, RankType > > > ( ) ) ); tree_stack.push ( ext::tree < common::ranked_symbol < SymbolType, RankType > > ( x, ext::vector < ext::tree < common::ranked_symbol < SymbolType, RankType > > > ( ) ) );
} else { } else {
unsigned children_size = ( unsigned ) x.getRank ( ); ext::vector < ext::tree < common::ranked_symbol < SymbolType, RankType > > > children;
ext::list < ext::tree < common::ranked_symbol < SymbolType, RankType > > > childrenList;
   
for ( unsigned i = 0; i < children_size; ++i ) { for ( unsigned i = 0; i < ( unsigned ) x.getRank ( ); ++i ) {
ext::tree < common::ranked_symbol < SymbolType, RankType > > child = tree_stack.top ( ); children.push_back ( tree_stack.top ( ) );
tree_stack.pop ( ); tree_stack.pop ( );
childrenList.push_front ( child );
} }
   
ext::vector < ext::tree < common::ranked_symbol < SymbolType, RankType > > > children { std::reverse ( children.begin ( ), children.end ( ) );
std::begin ( childrenList ), std::end ( childrenList )
}; tree_stack.push ( ext::tree < common::ranked_symbol < SymbolType, RankType > > ( x, std::move ( children ) ) );
tree_stack.push ( ext::tree < common::ranked_symbol < SymbolType, RankType > > ( common::ranked_symbol < SymbolType, RankType > ( x.getSymbol ( ), x.getRank ( ) ), std::move ( children ) ) );
} }
} }
   
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment