diff --git a/robowaiter/behavior_tree/ptml/ptmlCompiler.py b/robowaiter/behavior_tree/ptml/ptmlCompiler.py index 216c3f5..b3b5b12 100644 --- a/robowaiter/behavior_tree/ptml/ptmlCompiler.py +++ b/robowaiter/behavior_tree/ptml/ptmlCompiler.py @@ -93,15 +93,21 @@ def format_trans_to_bracket(file_path: str) -> str: level = 0 for i in ptml_tab: + + if i.startswith('//'): + continue + new_level = counter_(i) // 4 if new_level == level: ptml_new += i elif new_level > level: ptml_new += '{\n' + i + level += 1 elif new_level < level: ptml_new += '\n}' + i - level = new_level - ptml_new += '}' + level -= 1 + for i in range(level): + ptml_new += '}' import re new_path = re.sub('/[a-zA-Z0-9_]*\.ptml', '/bracket_ptml.ptml',file_path) diff --git a/robowaiter/behavior_tree/ptml/test/bracket_ptml.ptml b/robowaiter/behavior_tree/ptml/test/bracket_ptml.ptml index 1dbbf34..ae237e0 100644 --- a/robowaiter/behavior_tree/ptml/test/bracket_ptml.ptml +++ b/robowaiter/behavior_tree/ptml/test/bracket_ptml.ptml @@ -1,11 +1,6 @@ selector { - selector -{ - cond HasMap() - act ExploreEnv() - -} sequence + sequence { cond Chatting() act DealChat() @@ -15,6 +10,6 @@ selector cond HasSubTask() sequence { - cond At(Robot,Table) + act SubTaskPlaceHolder() -} cond At(Robot,Table)} \ No newline at end of file +} cond At(Talb,ea)}} \ No newline at end of file diff --git a/robowaiter/behavior_tree/ptml/test/tab_test.ptml b/robowaiter/behavior_tree/ptml/test/tab_test.ptml index 6753f4e..cabe285 100644 --- a/robowaiter/behavior_tree/ptml/test/tab_test.ptml +++ b/robowaiter/behavior_tree/ptml/test/tab_test.ptml @@ -1,5 +1,12 @@ selector +// selector +// cond HasMap() +// act ExploreEnv() sequence cond Chatting() act DealChat() - act At(Coffee,Table) + sequence + cond HasSubTask() + sequence + act SubTaskPlaceHolder() + cond At(Talb,ea) \ No newline at end of file