Skip to content

Commit

Permalink
Squashed 'wrap/' changes from f69f8b01f..09f8bbf71
Browse files Browse the repository at this point in the history
09f8bbf71 Merge pull request #25 from borglab/fix/function-name
0dbfb6c13 fix function name to be the correct one

git-subtree-dir: wrap
git-subtree-split: 09f8bbf7172ba8b1bd3d2484795743f16e1a5893
  • Loading branch information
varunagrawal committed Jan 4, 2021
1 parent cabb76d commit 5f7ee8a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion gtwrap/matlab_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -1698,7 +1698,7 @@ def _debug(message):
for sub_content in c:
import sys
_debug("sub object: {}".format(sub_content[1][0][0]))
_generate_content(sub_content[1], path_to_folder)
generate_content(sub_content[1], path_to_folder)
elif type(c[1]) == list:
path_to_folder = path + '/' + c[0]

Expand Down
6 changes: 3 additions & 3 deletions tests/test_matlab_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class TestWrap(unittest.TestCase):
MATLAB_TEST_DIR = TEST_DIR + "expected-matlab/"
MATLAB_ACTUAL_DIR = TEST_DIR + "actual-matlab/"

def _generate_content(self, cc_content, path=''):
def generate_content(self, cc_content, path=''):
"""Generate files and folders from matlab wrapper content.
Keyword arguments:
Expand Down Expand Up @@ -48,7 +48,7 @@ def _generate_content(self, cc_content, path=''):
for sub_content in c:
import sys
print("sub object: {}".format(sub_content[1][0][0]), file=sys.stderr)
self._generate_content(sub_content[1], path_to_folder)
self.generate_content(sub_content[1], path_to_folder)
elif type(c[1]) == list:
path_to_folder = path + '/' + c[0]

Expand Down Expand Up @@ -104,7 +104,7 @@ def test_geometry_matlab(self):

cc_content = wrapper.wrap()

self._generate_content(cc_content)
self.generate_content(cc_content)

def compare_and_diff(file):
output = self.MATLAB_ACTUAL_DIR + file
Expand Down

0 comments on commit 5f7ee8a

Please sign in to comment.