12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging 'master' into 'wrap'

release/4.3a0
Varun Agrawal 2020-09-25 20:59:12 -04:00
parent b5014b1403 f79a1fb2b3
commit aa173ac230
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wrap/matlab_wrapper.py
View File

@ -210,18 +210,26 @@ class MatlabWrapper(object):
else: else:
formatted_type_name += name formatted_type_name += name
if len(type_name.instantiations) == 1: if separator == "::": # C++
if separator == "::": # C++ templates = []
formatted_type_name += '<{}>'.format(cls._format_type_name(type_name.instantiations[0], for idx in range(len(type_name.instantiations)):
include_namespace=include_namespace, template = '{}'.format(cls._format_type_name(type_name.instantiations[idx],
constructor=constructor, method=method)) include_namespace=include_namespace,
else: constructor=constructor, method=method))
templates.append(template)
if len(templates) > 0: # If there are no templates
formatted_type_name += '<{}>'.format(','.join(templates))
else:
for idx in range(len(type_name.instantiations)):
formatted_type_name += '{}'.format(cls._format_type_name( formatted_type_name += '{}'.format(cls._format_type_name(
type_name.instantiations[0], type_name.instantiations[idx],
separator=separator, separator=separator,
include_namespace=False, include_namespace=False,
constructor=constructor, method=method constructor=constructor, method=method
)) ))
return formatted_type_name return formatted_type_name
@classmethod @classmethod