Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
tsoc
openmm
Commits
f7e5492d
Commit
f7e5492d
authored
Jan 30, 2014
by
peastman
Browse files
Fixed errors in wrapper generation related to TabulatedFunctions
parent
3279c73a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
wrappers/generateWrappers.py
wrappers/generateWrappers.py
+3
-1
wrappers/python/src/swig_doxygen/swigInputConfig.py
wrappers/python/src/swig_doxygen/swigInputConfig.py
+1
-0
No files found.
wrappers/generateWrappers.py
View file @
f7e5492d
...
@@ -42,7 +42,7 @@ def getText(subNodePath, node):
...
@@ -42,7 +42,7 @@ def getText(subNodePath, node):
def
convertOpenMMPrefix
(
name
):
def
convertOpenMMPrefix
(
name
):
return
name
.
replace
(
'OpenMM::'
,
'OpenMM_'
)
return
name
.
replace
(
'OpenMM::'
,
'OpenMM_'
)
OPENMM_RE_PATTERN
=
re
.
compile
(
"(.*)OpenMM:[a-zA-Z:]*:(.*)"
)
OPENMM_RE_PATTERN
=
re
.
compile
(
"(.*)OpenMM:[a-zA-Z
0-9_
:]*:(.*)"
)
def
stripOpenMMPrefix
(
name
,
rePattern
=
OPENMM_RE_PATTERN
):
def
stripOpenMMPrefix
(
name
,
rePattern
=
OPENMM_RE_PATTERN
):
try
:
try
:
m
=
rePattern
.
search
(
name
)
m
=
rePattern
.
search
(
name
)
...
@@ -123,6 +123,8 @@ class WrapperGenerator:
...
@@ -123,6 +123,8 @@ class WrapperGenerator:
methodName
=
shortMethodDefinition
.
split
()[
-
1
]
methodName
=
shortMethodDefinition
.
split
()[
-
1
]
if
className
+
'::'
+
methodName
in
self
.
skipMethods
:
if
className
+
'::'
+
methodName
in
self
.
skipMethods
:
continue
continue
if
any
(
getNodeText
(
node
)
==
"Deprecated"
for
node
in
findNodes
(
memberNode
,
"detaileddescription/para/xrefsect/xreftitle"
)):
continue
# Skip deprecated methods
methodList
.
append
(
memberNode
)
methodList
.
append
(
memberNode
)
return
methodList
return
methodList
...
...
wrappers/python/src/swig_doxygen/swigInputConfig.py
View file @
f7e5492d
...
@@ -155,6 +155,7 @@ UNITS = {
...
@@ -155,6 +155,7 @@ UNITS = {
(
"*"
,
"getErrorTolerance"
)
:
(
None
,
()),
(
"*"
,
"getErrorTolerance"
)
:
(
None
,
()),
(
"*"
,
"getEwaldErrorTolerance"
)
:
(
None
,
()),
(
"*"
,
"getEwaldErrorTolerance"
)
:
(
None
,
()),
(
"*"
,
"getFriction"
)
:
(
"1/unit.picosecond"
,
()),
(
"*"
,
"getFriction"
)
:
(
"1/unit.picosecond"
,
()),
(
"*"
,
"getFunction"
)
:
(
None
,
()),
(
"*"
,
"getGlobalVariable"
)
:
(
None
,
()),
(
"*"
,
"getGlobalVariable"
)
:
(
None
,
()),
(
"*"
,
"getIntegrator"
)
:
(
None
,
()),
(
"*"
,
"getIntegrator"
)
:
(
None
,
()),
(
"*"
,
"getMapParameters"
)
:
(
None
,
()),
(
"*"
,
"getMapParameters"
)
:
(
None
,
()),
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment