From 5233c01a26329306c9f1d08c1a39733aee2cc518 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Tue, 21 Dec 2004 09:22:10 +0000 Subject: This commit was generated by cvs2svn to compensate for changes in r2423, which included commits to RCS files with non-trunk default branches. svn path=/trunk/externals/tb/; revision=2424 --- chaos/src/circle_map.hpp | 106 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 chaos/src/circle_map.hpp (limited to 'chaos/src/circle_map.hpp') diff --git a/chaos/src/circle_map.hpp b/chaos/src/circle_map.hpp new file mode 100644 index 0000000..f1ef406 --- /dev/null +++ b/chaos/src/circle_map.hpp @@ -0,0 +1,106 @@ +// +// +// chaos~ +// Copyright (C) 2004 Tim Blechmann +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; see the file COPYING. If not, write to +// the Free Software Foundation, Inc., 59 Temple Place - Suite 330, +// Boston, MA 02111-1307, USA. + +#include "map_base.hpp" + +// circle_map map: x[n+1] = x[n] * omega - r / (2*pi) * sin (2 * pi * x [n]) +// +// taken from Willi-Hans Steeb: Chaos and Fractals + +class circle_map: + protected map_base +{ +public: + circle_map() + : m_omega(0.4), m_r(1) + { + m_num_eq = 1; + m_data = new data_t[1]; + set_x(0.5); + } + + ~circle_map() + { + delete m_data; + } + + virtual void m_step() + { + data_t x = m_data[0]; + data_t omega = m_omega; + data_t r = m_r; + + m_data[0] = x + omega - r / (2.f * M_PI) * sin (2.f * M_PI * x); + } + + void set_x(t_float f) + { + m_data[0] = (data_t) f; + } + + t_float get_x() + { + return (t_float)m_data[0]; + } + + void set_r(t_float f) + { + m_r = (data_t) f; + } + + + t_float get_r() + { + return (t_float)m_r; + } + + + void set_omega (t_float f) + { + m_omega = (data_t) f; + } + + t_float get_omega() + { + return (t_float)m_omega; + } + + +private: + data_t m_omega; + data_t m_r; +}; + +#define CIRCLE_MAP_CALLBACKS \ +MAP_CALLBACKS; \ +FLEXT_ATTRVAR_F(m_system->m_omega); \ +FLEXT_ATTRVAR_F(m_system->m_r); \ +FLEXT_CALLVAR_F(m_system->get_omega, m_system->set_omega); \ +FLEXT_CALLVAR_F(m_system->get_r, m_system->set_r); \ +FLEXT_CALLVAR_F(m_system->get_x, m_system->set_x); + +#define CIRCLE_MAP_ATTRIBUTES \ +MAP_ATTRIBUTES; \ +FLEXT_ADDATTR_VAR1("omega",m_system->m_omega); \ +FLEXT_ADDATTR_VAR1("r",m_system->m_r); \ +FLEXT_ADDATTR_VAR("omega",m_system->get_omega, m_system->set_omega); \ +FLEXT_ADDATTR_VAR("r",m_system->get_r, m_system->set_r); \ +FLEXT_ADDATTR_VAR("x",m_system->get_x, m_system->set_x); + -- cgit v1.2.1 From 404bfef9e23dfc3166cb2005367e7e8a41863914 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Thu, 23 Dec 2004 10:07:17 +0000 Subject: base class macros svn path=/trunk/externals/tb/; revision=2426 --- chaos/src/circle_map.hpp | 73 +++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 54 deletions(-) (limited to 'chaos/src/circle_map.hpp') diff --git a/chaos/src/circle_map.hpp b/chaos/src/circle_map.hpp index f1ef406..02817de 100644 --- a/chaos/src/circle_map.hpp +++ b/chaos/src/circle_map.hpp @@ -29,11 +29,12 @@ class circle_map: { public: circle_map() - : m_omega(0.4), m_r(1) { m_num_eq = 1; m_data = new data_t[1]; - set_x(0.5); + CHAOS_SYS_INIT(omega, 0.4); + CHAOS_SYS_INIT(r, 1); + CHAOS_SYS_INIT(x, 0.5); } ~circle_map() @@ -44,63 +45,27 @@ public: virtual void m_step() { data_t x = m_data[0]; - data_t omega = m_omega; - data_t r = m_r; + data_t omega = CHAOS_PARAMETER(omega); + data_t r = CHAOS_PARAMETER(r); m_data[0] = x + omega - r / (2.f * M_PI) * sin (2.f * M_PI * x); } - void set_x(t_float f) - { - m_data[0] = (data_t) f; - } - - t_float get_x() - { - return (t_float)m_data[0]; - } - - void set_r(t_float f) - { - m_r = (data_t) f; - } - - - t_float get_r() - { - return (t_float)m_r; - } - - - void set_omega (t_float f) - { - m_omega = (data_t) f; - } - - t_float get_omega() - { - return (t_float)m_omega; - } - - -private: - data_t m_omega; - data_t m_r; + CHAOS_SYSVAR_FUNCS(x,0); + CHAOS_SYSPAR_FUNCS(r); + CHAOS_SYSPAR_FUNCS(omega); }; -#define CIRCLE_MAP_CALLBACKS \ -MAP_CALLBACKS; \ -FLEXT_ATTRVAR_F(m_system->m_omega); \ -FLEXT_ATTRVAR_F(m_system->m_r); \ -FLEXT_CALLVAR_F(m_system->get_omega, m_system->set_omega); \ -FLEXT_CALLVAR_F(m_system->get_r, m_system->set_r); \ -FLEXT_CALLVAR_F(m_system->get_x, m_system->set_x); +#define CIRCLE_MAP_CALLBACKS \ +MAP_CALLBACKS; \ +CHAOS_SYS_CALLBACKS(omega); \ +CHAOS_SYS_CALLBACKS(r); \ +CHAOS_SYS_CALLBACKS(x); + -#define CIRCLE_MAP_ATTRIBUTES \ -MAP_ATTRIBUTES; \ -FLEXT_ADDATTR_VAR1("omega",m_system->m_omega); \ -FLEXT_ADDATTR_VAR1("r",m_system->m_r); \ -FLEXT_ADDATTR_VAR("omega",m_system->get_omega, m_system->set_omega); \ -FLEXT_ADDATTR_VAR("r",m_system->get_r, m_system->set_r); \ -FLEXT_ADDATTR_VAR("x",m_system->get_x, m_system->set_x); +#define CIRCLE_MAP_ATTRIBUTES \ +MAP_ATTRIBUTES; \ +CHAOS_SYS_ATTRIBUTE(omega); \ +CHAOS_SYS_ATTRIBUTE(r); \ +CHAOS_SYS_ATTRIBUTE(x); -- cgit v1.2.1 From b2f2fd990f9059db784a7849726c6fc5006c70f9 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Mon, 27 Dec 2004 14:44:11 +0000 Subject: a lot of new objects ... svn path=/trunk/externals/tb/; revision=2431 --- chaos/src/circle_map.hpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'chaos/src/circle_map.hpp') diff --git a/chaos/src/circle_map.hpp b/chaos/src/circle_map.hpp index 02817de..0e12ad0 100644 --- a/chaos/src/circle_map.hpp +++ b/chaos/src/circle_map.hpp @@ -20,21 +20,23 @@ #include "map_base.hpp" -// circle_map map: x[n+1] = x[n] * omega - r / (2*pi) * sin (2 * pi * x [n]) +#include + +// circle_map map: x[n+1] = x[n] + omega - r / (2*pi) * sin (2 * pi * x [n]) // // taken from Willi-Hans Steeb: Chaos and Fractals class circle_map: - protected map_base + public map_base { public: circle_map() { m_num_eq = 1; m_data = new data_t[1]; - CHAOS_SYS_INIT(omega, 0.4); - CHAOS_SYS_INIT(r, 1); - CHAOS_SYS_INIT(x, 0.5); + CHAOS_SYS_INIT(omega, 0.1); + CHAOS_SYS_INIT(r, 3); + CHAOS_SYS_INIT(x, 0.4); } ~circle_map() -- cgit v1.2.1 From 2a0d532e5965402f19f74f70dfdcc7efd1055b15 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Sat, 1 Jan 2005 11:06:58 +0000 Subject: speedup using function pointers svn path=/trunk/externals/tb/; revision=2439 --- chaos/src/circle_map.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chaos/src/circle_map.hpp') diff --git a/chaos/src/circle_map.hpp b/chaos/src/circle_map.hpp index 0e12ad0..91f11d6 100644 --- a/chaos/src/circle_map.hpp +++ b/chaos/src/circle_map.hpp @@ -33,7 +33,7 @@ public: circle_map() { m_num_eq = 1; - m_data = new data_t[1]; + m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(omega, 0.1); CHAOS_SYS_INIT(r, 3); CHAOS_SYS_INIT(x, 0.4); -- cgit v1.2.1 From 2434290915cda6ed855e4dc2249312153b995817 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Thu, 9 Jun 2005 12:52:17 +0000 Subject: changed initialisation svn path=/trunk/externals/tb/; revision=3145 --- chaos/src/circle_map.hpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'chaos/src/circle_map.hpp') diff --git a/chaos/src/circle_map.hpp b/chaos/src/circle_map.hpp index 91f11d6..b6442a8 100644 --- a/chaos/src/circle_map.hpp +++ b/chaos/src/circle_map.hpp @@ -32,16 +32,19 @@ class circle_map: public: circle_map() { - m_num_eq = 1; - m_data = new data_t[m_num_eq]; - CHAOS_SYS_INIT(omega, 0.1); - CHAOS_SYS_INIT(r, 3); - CHAOS_SYS_INIT(x, 0.4); + CHAOS_PRECONSTRUCTOR; + + CHAOS_SYS_INIT(x, 0.4,0); + + CHAOS_PAR_INIT(omega, 0.1); + CHAOS_PAR_INIT(r, 3); + + CHAOS_POSTCONSTRUCTOR; } ~circle_map() { - delete m_data; + } virtual void m_step() -- cgit v1.2.1 From ef53e19b3d9019b1b1f3345390f55ae9229ce390 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Sat, 22 Oct 2005 15:11:45 +0000 Subject: cleanups and new system svn path=/trunk/externals/tb/; revision=3750 --- chaos/src/circle_map.hpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'chaos/src/circle_map.hpp') diff --git a/chaos/src/circle_map.hpp b/chaos/src/circle_map.hpp index b6442a8..0a52993 100644 --- a/chaos/src/circle_map.hpp +++ b/chaos/src/circle_map.hpp @@ -31,15 +31,12 @@ class circle_map: { public: circle_map() + : map_base(1) { - CHAOS_PRECONSTRUCTOR; - CHAOS_SYS_INIT(x, 0.4,0); CHAOS_PAR_INIT(omega, 0.1); CHAOS_PAR_INIT(r, 3); - - CHAOS_POSTCONSTRUCTOR; } ~circle_map() -- cgit v1.2.1 From 13cba7a7997e318fbba01a36912219355e387d52 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Sun, 21 May 2006 18:34:34 +0000 Subject: rewrote most stuff using templates svn path=/trunk/externals/tb/; revision=5105 --- chaos/src/circle_map.hpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'chaos/src/circle_map.hpp') diff --git a/chaos/src/circle_map.hpp b/chaos/src/circle_map.hpp index 0a52993..294b7d6 100644 --- a/chaos/src/circle_map.hpp +++ b/chaos/src/circle_map.hpp @@ -27,11 +27,10 @@ // taken from Willi-Hans Steeb: Chaos and Fractals class circle_map: - public map_base + public map_base<1> { public: circle_map() - : map_base(1) { CHAOS_SYS_INIT(x, 0.4,0); @@ -39,10 +38,6 @@ public: CHAOS_PAR_INIT(r, 3); } - ~circle_map() - { - - } virtual void m_step() { -- cgit v1.2.1 From 2c157bd8aa1f5387169cc0c0910d36c8068c4068 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Sun, 21 May 2006 19:17:04 +0000 Subject: improved inlining for maps svn path=/trunk/externals/tb/; revision=5106 --- chaos/src/circle_map.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chaos/src/circle_map.hpp') diff --git a/chaos/src/circle_map.hpp b/chaos/src/circle_map.hpp index 294b7d6..c58391a 100644 --- a/chaos/src/circle_map.hpp +++ b/chaos/src/circle_map.hpp @@ -39,7 +39,7 @@ public: } - virtual void m_step() + void m_step() { data_t x = m_data[0]; data_t omega = CHAOS_PARAMETER(omega); -- cgit v1.2.1