diff options
| author | Tim Blechmann <timblech@users.sourceforge.net> | 2004-12-23 10:07:17 +0000 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@iem.at> | 2015-10-14 15:11:57 +0200 |
| commit | 404bfef9e23dfc3166cb2005367e7e8a41863914 (patch) | |
| tree | 3995ab20cf7ec984560c44e4fdeef1106ce8ff1c /chaos/src/bernoulli_map.hpp | |
| parent | 5233c01a26329306c9f1d08c1a39733aee2cc518 (diff) | |
base class macros
svn path=/trunk/externals/tb/; revision=2426
Diffstat (limited to 'chaos/src/bernoulli_map.hpp')
| -rw-r--r-- | chaos/src/bernoulli_map.hpp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/chaos/src/bernoulli_map.hpp b/chaos/src/bernoulli_map.hpp index b006c92..50bca13 100644 --- a/chaos/src/bernoulli_map.hpp +++ b/chaos/src/bernoulli_map.hpp @@ -32,10 +32,10 @@ public: { m_num_eq = 1: m_data = new data_t[1]; - set_x(0.5f); + CHAOS_SYS_INIT(x,0.5) } - ~bernoulli() + ~Bernoulli() { delete m_data; } @@ -50,26 +50,19 @@ public: m_data[0] = 2.f * x - 1.f; } - void set_x(t_float f) + CHAOS_SYSVAR_FUNCS_PRED(x,0,m_pred_x); + bool m_pred_x(t_float f) { - if ( (f >= 0) && (f < 1)) - m_data[0] = (data_t) f; - else - post("value for x %f out of range", f); - } - - t_float get_x() - { - return (t_float)m_data[0]; + return (f >= 0) && (f < 1); } }; -#define BERNOULLI_CALLBACKS \ -MAP_CALLBACKS; \ -FLEXT_CALLVAR_F(m_system->get_x, m_system->set_x); +#define BERNOULLI_CALLBACKS \ +MAP_CALLBACKS; \ +CHAOS_SYS_CALLBACKS(x); -#define BERNOULLI_ATTRIBUTES \ -MAP_ATTRIBUTES; \ -FLEXT_ADDATTR_VAR("x",m_system->get_x, m_system->set_x); +#define BERNOULLI_ATTRIBUTES \ +MAP_ATTRIBUTES; \ +CHAOS_SYS_ATTRIBUTE(x); |