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/lozi_map.hpp | 126 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) create mode 100644 chaos/src/lozi_map.hpp (limited to 'chaos/src/lozi_map.hpp') diff --git a/chaos/src/lozi_map.hpp b/chaos/src/lozi_map.hpp new file mode 100644 index 0000000..50192c4 --- /dev/null +++ b/chaos/src/lozi_map.hpp @@ -0,0 +1,126 @@ +// +// +// 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" + +// lozi map: x[n+1] = y[n] + 1 - a * abs(x[n]) +// y[n+1] = b * x[n] +// b != 0 +// taken from Willi-Hans Steeb: Chaos and Fractals + +class lozi: + protected map_base +{ +public: + lozi() + : m_a(1.4), m_b(0.3) + { + m_num_eq = 2; + m_data = new data_t[1]; + set_x(0.5); + set_y(0.5); + } + + ~lozi() + { + delete m_data; + } + + virtual void m_step() + { + data_t x = m_data[0]; + data_t y = m_data[1]; + + if (x > 0) + m_data[0] = 1 + y - m_a * x; + else + m_data[0] = 1 + y + m_a * x; + + m_data[1] = m_b * 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_y(t_float f) + { + m_data[1] = (data_t) f; + } + + t_float get_y() + { + return (t_float)m_data[1]; + } + + + void set_a(t_float f) + { + m_a = (data_t) f; + } + + t_float get_a() + { + return (t_float)m_a; + } + + + void set_b(t_float f) + { + if (f != 0) + m_b = (data_t) f; + else + post("value for b %f out of range", f); + } + + t_float get_b() + { + return (t_float)m_b; + } + + +private: + data_t m_a; + data_t m_b; +}; + + +#define LOZI_CALLBACKS \ +MAP_CALLBACKS; \ +FLEXT_CALLVAR_F(m_system->get_a, m_system->set_a); \ +FLEXT_CALLVAR_F(m_system->get_b, m_system->set_b); \ +FLEXT_CALLVAR_F(m_system->get_x, m_system->set_x); \ +FLEXT_CALLVAR_F(m_system->get_y, m_system->set_y); + +#define LOZI_ATTRIBUTES \ +MAP_ATTRIBUTES; \ +FLEXT_ADDATTR_VAR("a",m_system->get_a, m_system->set_a); \ +FLEXT_ADDATTR_VAR("b",m_system->get_b, m_system->set_b); \ +FLEXT_ADDATTR_VAR("x",m_system->get_x, m_system->set_x); \ +FLEXT_ADDATTR_VAR("y",m_system->get_y, m_system->set_y); -- 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/lozi_map.hpp | 90 ++++++++++++++------------------------------------ 1 file changed, 25 insertions(+), 65 deletions(-) (limited to 'chaos/src/lozi_map.hpp') diff --git a/chaos/src/lozi_map.hpp b/chaos/src/lozi_map.hpp index 50192c4..8bee655 100644 --- a/chaos/src/lozi_map.hpp +++ b/chaos/src/lozi_map.hpp @@ -30,12 +30,13 @@ class lozi: { public: lozi() - : m_a(1.4), m_b(0.3) { m_num_eq = 2; m_data = new data_t[1]; - set_x(0.5); - set_y(0.5); + CHAOS_SYS_INIT(x,0); + CHAOS_SYS_INIT(y,0); + CHAOS_SYS_INIT(a,1.4); + CHAOS_SYS_INIT(b,0.3); } ~lozi() @@ -49,78 +50,37 @@ public: data_t y = m_data[1]; if (x > 0) - m_data[0] = 1 + y - m_a * x; + m_data[0] = 1 + y - CHAOS_PARAMETER(a) * x; else - m_data[0] = 1 + y + m_a * x; + m_data[0] = 1 + y + CHAOS_PARAMETER(a) * x; - m_data[1] = m_b * x; + m_data[1] = CHAOS_PARAMETER(b) * x; } + CHAOS_SYSVAR_FUNCS(x, 0); + CHAOS_SYSVAR_FUNCS(y, 1); - void set_x(t_float f) - { - m_data[0] = (data_t) f; - } - - t_float get_x() - { - return (t_float)m_data[0]; - } - - - void set_y(t_float f) - { - m_data[1] = (data_t) f; - } - - t_float get_y() - { - return (t_float)m_data[1]; - } - + CHAOS_SYSPAR_FUNCS(a); - void set_a(t_float f) + CHAOS_SYSPAR_FUNCS_PRED(b, m_pred_b); + bool m_pred_b(t_float f) { - m_a = (data_t) f; + return (f != 0); } - - t_float get_a() - { - return (t_float)m_a; - } - - - void set_b(t_float f) - { - if (f != 0) - m_b = (data_t) f; - else - post("value for b %f out of range", f); - } - - t_float get_b() - { - return (t_float)m_b; - } - - -private: - data_t m_a; - data_t m_b; }; -#define LOZI_CALLBACKS \ -MAP_CALLBACKS; \ -FLEXT_CALLVAR_F(m_system->get_a, m_system->set_a); \ -FLEXT_CALLVAR_F(m_system->get_b, m_system->set_b); \ -FLEXT_CALLVAR_F(m_system->get_x, m_system->set_x); \ -FLEXT_CALLVAR_F(m_system->get_y, m_system->set_y); +#define LOZI_CALLBACKS \ +MAP_CALLBACKS; \ +CHAOS_SYS_CALLBACKS(a); \ +CHAOS_SYS_CALLBACKS(b); \ +CHAOS_SYS_CALLBACKS(x); \ +CHAOS_SYS_CALLBACKS(y); -#define LOZI_ATTRIBUTES \ -MAP_ATTRIBUTES; \ -FLEXT_ADDATTR_VAR("a",m_system->get_a, m_system->set_a); \ -FLEXT_ADDATTR_VAR("b",m_system->get_b, m_system->set_b); \ -FLEXT_ADDATTR_VAR("x",m_system->get_x, m_system->set_x); \ -FLEXT_ADDATTR_VAR("y",m_system->get_y, m_system->set_y); +#define LOZI_ATTRIBUTES \ +MAP_ATTRIBUTES; \ +CHAOS_SYS_ATTRIBUTE(a); \ +CHAOS_SYS_ATTRIBUTE(b); \ +CHAOS_SYS_ATTRIBUTE(x); \ +CHAOS_SYS_ATTRIBUTE(y); -- 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/lozi_map.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'chaos/src/lozi_map.hpp') diff --git a/chaos/src/lozi_map.hpp b/chaos/src/lozi_map.hpp index 8bee655..37cab54 100644 --- a/chaos/src/lozi_map.hpp +++ b/chaos/src/lozi_map.hpp @@ -25,11 +25,11 @@ // b != 0 // taken from Willi-Hans Steeb: Chaos and Fractals -class lozi: - protected map_base +class lozi_map: + public map_base { public: - lozi() + lozi_map() { m_num_eq = 2; m_data = new data_t[1]; @@ -39,7 +39,7 @@ public: CHAOS_SYS_INIT(b,0.3); } - ~lozi() + ~lozi_map() { delete m_data; } @@ -71,14 +71,14 @@ public: }; -#define LOZI_CALLBACKS \ +#define LOZI_MAP_CALLBACKS \ MAP_CALLBACKS; \ CHAOS_SYS_CALLBACKS(a); \ CHAOS_SYS_CALLBACKS(b); \ CHAOS_SYS_CALLBACKS(x); \ CHAOS_SYS_CALLBACKS(y); -#define LOZI_ATTRIBUTES \ +#define LOZI_MAP_ATTRIBUTES \ MAP_ATTRIBUTES; \ CHAOS_SYS_ATTRIBUTE(a); \ CHAOS_SYS_ATTRIBUTE(b); \ -- 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/lozi_map.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chaos/src/lozi_map.hpp') diff --git a/chaos/src/lozi_map.hpp b/chaos/src/lozi_map.hpp index 37cab54..9219390 100644 --- a/chaos/src/lozi_map.hpp +++ b/chaos/src/lozi_map.hpp @@ -32,7 +32,7 @@ public: lozi_map() { m_num_eq = 2; - m_data = new data_t[1]; + m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(x,0); CHAOS_SYS_INIT(y,0); CHAOS_SYS_INIT(a,1.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/lozi_map.hpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'chaos/src/lozi_map.hpp') diff --git a/chaos/src/lozi_map.hpp b/chaos/src/lozi_map.hpp index 9219390..3358cf5 100644 --- a/chaos/src/lozi_map.hpp +++ b/chaos/src/lozi_map.hpp @@ -31,17 +31,20 @@ class lozi_map: public: lozi_map() { - m_num_eq = 2; - m_data = new data_t[m_num_eq]; - CHAOS_SYS_INIT(x,0); - CHAOS_SYS_INIT(y,0); - CHAOS_SYS_INIT(a,1.4); - CHAOS_SYS_INIT(b,0.3); + CHAOS_PRECONSTRUCTOR; + + CHAOS_SYS_INIT(x,0,0); + CHAOS_SYS_INIT(y,0,1); + + CHAOS_PAR_INIT(a,1.4); + CHAOS_PAR_INIT(b,0.3); + + CHAOS_POSTCONSTRUCTOR; } ~lozi_map() { - delete m_data; + } virtual void m_step() @@ -57,7 +60,12 @@ public: m_data[1] = CHAOS_PARAMETER(b) * x; } - + virtual void m_verify() + { + if (PD_BIGORSMALL(m_data[0])) + m_data[0] = 1; + } + CHAOS_SYSVAR_FUNCS(x, 0); CHAOS_SYSVAR_FUNCS(y, 1); -- cgit v1.2.1 From d1ed55f96f9cecc818844006fb36cd58ca70da5e Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Thu, 16 Jun 2005 13:02:02 +0000 Subject: - parameter searching (broken) - misc. updates svn path=/trunk/externals/tb/; revision=3192 --- chaos/src/lozi_map.hpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'chaos/src/lozi_map.hpp') diff --git a/chaos/src/lozi_map.hpp b/chaos/src/lozi_map.hpp index 3358cf5..b30a95b 100644 --- a/chaos/src/lozi_map.hpp +++ b/chaos/src/lozi_map.hpp @@ -60,11 +60,6 @@ public: m_data[1] = CHAOS_PARAMETER(b) * x; } - virtual void m_verify() - { - if (PD_BIGORSMALL(m_data[0])) - m_data[0] = 1; - } CHAOS_SYSVAR_FUNCS(x, 0); CHAOS_SYSVAR_FUNCS(y, 1); -- 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/lozi_map.hpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'chaos/src/lozi_map.hpp') diff --git a/chaos/src/lozi_map.hpp b/chaos/src/lozi_map.hpp index b30a95b..dee6b0d 100644 --- a/chaos/src/lozi_map.hpp +++ b/chaos/src/lozi_map.hpp @@ -29,17 +29,14 @@ class lozi_map: public map_base { public: - lozi_map() + lozi_map(): + map_base(2) { - CHAOS_PRECONSTRUCTOR; - CHAOS_SYS_INIT(x,0,0); CHAOS_SYS_INIT(y,0,1); CHAOS_PAR_INIT(a,1.4); CHAOS_PAR_INIT(b,0.3); - - CHAOS_POSTCONSTRUCTOR; } ~lozi_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/lozi_map.hpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'chaos/src/lozi_map.hpp') diff --git a/chaos/src/lozi_map.hpp b/chaos/src/lozi_map.hpp index dee6b0d..24096a6 100644 --- a/chaos/src/lozi_map.hpp +++ b/chaos/src/lozi_map.hpp @@ -26,11 +26,10 @@ // taken from Willi-Hans Steeb: Chaos and Fractals class lozi_map: - public map_base + public map_base<2> { public: - lozi_map(): - map_base(2) + lozi_map() { CHAOS_SYS_INIT(x,0,0); CHAOS_SYS_INIT(y,0,1); @@ -39,11 +38,6 @@ public: CHAOS_PAR_INIT(b,0.3); } - ~lozi_map() - { - - } - virtual void m_step() { data_t x = m_data[0]; -- 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/lozi_map.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chaos/src/lozi_map.hpp') diff --git a/chaos/src/lozi_map.hpp b/chaos/src/lozi_map.hpp index 24096a6..07656d2 100644 --- a/chaos/src/lozi_map.hpp +++ b/chaos/src/lozi_map.hpp @@ -38,7 +38,7 @@ public: CHAOS_PAR_INIT(b,0.3); } - virtual void m_step() + void m_step() { data_t x = m_data[0]; data_t y = m_data[1]; -- cgit v1.2.1