From 0359dd57f0124e5de73c4726f30213bc2cf03ca8 Mon Sep 17 00:00:00 2001 From: David C Sterratt Date: Mon, 31 Oct 2022 11:59:55 +0000 Subject: [PATCH] Issue #101: Fix MorrisLecar examples The function name "tau" collides with "math.tau", which ultimately leads to a TypeError: 'float' object is not callable. This fix renames "tau" to "tauw". --- examples/PyCont_MorrisLecar_TypeI.py | 8 ++++---- examples/PyCont_MorrisLecar_TypeII.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/PyCont_MorrisLecar_TypeI.py b/examples/PyCont_MorrisLecar_TypeI.py index a68142ed..339bffbf 100644 --- a/examples/PyCont_MorrisLecar_TypeI.py +++ b/examples/PyCont_MorrisLecar_TypeI.py @@ -24,12 +24,12 @@ # Set up model auxfndict = {'minf': (['v'], '0.5*(1 + tanh((v-v1)/v2))'), \ - 'winf': (['v'], '0.5*(1 + tanh((v-v3)/v4))'), \ - 'tau': (['v'], '1/cosh((v-v3)/(2*v4))') \ - } + 'winf': (['v'], '0.5*(1 + tanh((v-v3)/v4))'), \ + 'tauw': (['v'], '1/cosh((v-v3)/(2*v4))') \ + } vstr = '(Iapp - gCa*minf(v)*(v-vCa) - gK*w*(v-vK) - gL*(v-vL))/C' -wstr = 'phi*(winf(v)-w)/tau(v)' +wstr = 'phi*(winf(v)-w)/tauw(v)' DSargs = args(name='MorrisLecar') DSargs.pars = pars diff --git a/examples/PyCont_MorrisLecar_TypeII.py b/examples/PyCont_MorrisLecar_TypeII.py index fc8c0b3c..dc4f9f9a 100644 --- a/examples/PyCont_MorrisLecar_TypeII.py +++ b/examples/PyCont_MorrisLecar_TypeII.py @@ -24,12 +24,12 @@ # Set up model auxfndict = {'minf': (['v'], '0.5*(1 + tanh((v-v1)/v2))'), \ - 'winf': (['v'], '0.5*(1 + tanh((v-v3)/v4))'), \ - 'tau': (['v'], '1/cosh((v-v3)/(2*v4))') \ - } + 'winf': (['v'], '0.5*(1 + tanh((v-v3)/v4))'), \ + 'tauw': (['v'], '1/cosh((v-v3)/(2*v4))') \ + } vstr = '(Iapp - gCa*minf(v)*(v-vCa) - gK*w*(v-vK) - gL*(v-vL))/C' -wstr = 'phi*(winf(v)-w)/tau(v)' +wstr = 'phi*(winf(v)-w)/tauw(v)' DSargs = args(name='MorrisLecar') DSargs.pars = pars