projects
/
hooke.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b2b9e12
)
Remove differentiation reference from difference's column argument help.
author
W. Trevor King
<wking@drexel.edu>
Sat, 7 Aug 2010 16:26:40 +0000
(12:26 -0400)
committer
W. Trevor King
<wking@drexel.edu>
Sat, 7 Aug 2010 16:26:40 +0000
(12:26 -0400)
hooke/plugin/curve.py
patch
|
blob
|
history
diff --git
a/hooke/plugin/curve.py
b/hooke/plugin/curve.py
index 9daab06c6a5faa48906522d3b33b90cfbd305399..158cb772a3e2c4ba31dcaf0aa4284c24e93c2f92 100644
(file)
--- a/
hooke/plugin/curve.py
+++ b/
hooke/plugin/curve.py
@@
-190,11
+190,11
@@
approaching curve and `1` selects the retracting curve.
help='Block B in A-B.'),
Argument(name='x column', type='int', default=0,
help="""
help='Block B in A-B.'),
Argument(name='x column', type='int', default=0,
help="""
-Column of data
block to differentiate with respect to
.
+Column of data
to return as x values
.
""".strip()),
""".strip()),
- Argument(name='
f
column', type='int', default=1,
+ Argument(name='
y
column', type='int', default=1,
help="""
help="""
-Column of data block to differen
tiat
e.
+Column of data block to differen
c
e.
""".strip()),
],
help=self.__doc__, plugin=plugin)
""".strip()),
],
help=self.__doc__, plugin=plugin)
@@
-205,7
+205,7
@@
Column of data block to differentiate.
assert a[:,params['x column']] == b[:,params['x column']]
out = Data((a.shape[0],2), dtype=a.dtype)
out[:,0] = a[:,params['x column']]
assert a[:,params['x column']] == b[:,params['x column']]
out = Data((a.shape[0],2), dtype=a.dtype)
out[:,0] = a[:,params['x column']]
- out[:,1] = a[:,params['
f column']] - b[:,params['f
column']]
+ out[:,1] = a[:,params['
y column']] - b[:,params['y
column']]
outqueue.put(out)
class DerivativeCommand (Command):
outqueue.put(out)
class DerivativeCommand (Command):