From 6963657b3f3ee4321394953a2cc67cd7386cce2d Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Mon, 27 Dec 2004 22:55:41 +0000 Subject: additions and better code reuse svn path=/trunk/externals/tb/; revision=2433 --- chaos/src/coupled_logistic.hpp | 82 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 chaos/src/coupled_logistic.hpp (limited to 'chaos/src/coupled_logistic.hpp') diff --git a/chaos/src/coupled_logistic.hpp b/chaos/src/coupled_logistic.hpp new file mode 100644 index 0000000..eb5b326 --- /dev/null +++ b/chaos/src/coupled_logistic.hpp @@ -0,0 +1,82 @@ +// +// +// 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" + +// coupled_logistic map: x[n+1] = r * x[n] * (1 - x[n]) + e * (y[n] - x[n]) +// y[n+1] = r * y[n] * (1 - y[n]) + e * (x[t] - y[t]) +// 1 <= r <= 4 +// taken from Willi-Hans Steeb: Chaos and Fractals + +class coupled_logistic: + public map_base +{ +public: + coupled_logistic() + { + m_num_eq = 2; + m_data = new data_t[2]; + CHAOS_SYS_INIT(e, 0.06); + CHAOS_SYS_INIT(r, 3.7); + CHAOS_SYS_INIT(x, 0.1); + CHAOS_SYS_INIT(x, 0.2); + } + + ~coupled_logistic() + { + delete m_data; + } + + virtual void m_step() + { + data_t x = m_data[0]; + data_t y = m_data[1]; + data_t e = CHAOS_PARAMETER(e); + data_t r = CHAOS_PARAMETER(r); + m_data[0] = r * x * (1.f - x) + e * (y - x); + m_data[1] = r * y * (1.f - y) + e * (x - y); + } + + CHAOS_SYSPAR_FUNCS(e); + CHAOS_SYSPAR_FUNCS_PRED(r, m_pred_r); + bool m_pred_r(t_float f) + { + return (f > 0) && (f < 4); + } + + CHAOS_SYSVAR_FUNCS(x, 0); + CHAOS_SYSVAR_FUNCS(y, 0); + +}; + +#define COUPLED_LOGISTIC_CALLBACKS \ +MAP_CALLBACKS; \ +CHAOS_SYS_CALLBACKS(e); \ +CHAOS_SYS_CALLBACKS(r); \ +CHAOS_SYS_CALLBACKS(x); \ +CHAOS_SYS_CALLBACKS(y); + +#define COUPLED_LOGISTIC_ATTRIBUTES \ +MAP_ATTRIBUTES; \ +CHAOS_SYS_ATTRIBUTE(e); \ +CHAOS_SYS_ATTRIBUTE(r); \ +CHAOS_SYS_ATTRIBUTE(x); \ +CHAOS_SYS_ATTRIBUTE(y); + -- 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/coupled_logistic.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chaos/src/coupled_logistic.hpp') diff --git a/chaos/src/coupled_logistic.hpp b/chaos/src/coupled_logistic.hpp index eb5b326..85b6928 100644 --- a/chaos/src/coupled_logistic.hpp +++ b/chaos/src/coupled_logistic.hpp @@ -32,7 +32,7 @@ public: coupled_logistic() { m_num_eq = 2; - m_data = new data_t[2]; + m_data = new data_t[m_num_eq]; CHAOS_SYS_INIT(e, 0.06); CHAOS_SYS_INIT(r, 3.7); CHAOS_SYS_INIT(x, 0.1); -- 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/coupled_logistic.hpp | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'chaos/src/coupled_logistic.hpp') diff --git a/chaos/src/coupled_logistic.hpp b/chaos/src/coupled_logistic.hpp index 85b6928..7cc8602 100644 --- a/chaos/src/coupled_logistic.hpp +++ b/chaos/src/coupled_logistic.hpp @@ -21,7 +21,7 @@ #include "map_base.hpp" // coupled_logistic map: x[n+1] = r * x[n] * (1 - x[n]) + e * (y[n] - x[n]) -// y[n+1] = r * y[n] * (1 - y[n]) + e * (x[t] - y[t]) +// y[n+1] = r * y[n] * (1 - y[n]) + e * (x[n] - y[n]) // 1 <= r <= 4 // taken from Willi-Hans Steeb: Chaos and Fractals @@ -31,17 +31,19 @@ class coupled_logistic: public: coupled_logistic() { - m_num_eq = 2; - m_data = new data_t[m_num_eq]; - CHAOS_SYS_INIT(e, 0.06); - CHAOS_SYS_INIT(r, 3.7); - CHAOS_SYS_INIT(x, 0.1); - CHAOS_SYS_INIT(x, 0.2); + CHAOS_PRECONSTRUCTOR; + + CHAOS_PAR_INIT(e, 0.06); + CHAOS_PAR_INIT(r, 3.7); + + CHAOS_SYS_INIT(x, 0.1,0); + CHAOS_SYS_INIT(y, 0.2,1); + + CHAOS_POSTCONSTRUCTOR; } ~coupled_logistic() { - delete m_data; } virtual void m_step() @@ -61,8 +63,24 @@ public: return (f > 0) && (f < 4); } - CHAOS_SYSVAR_FUNCS(x, 0); - CHAOS_SYSVAR_FUNCS(y, 0); + CHAOS_SYSVAR_FUNCS_PRED(x, 0, m_pred_xy); + CHAOS_SYSVAR_FUNCS_PRED(y, 0, m_pred_xy); + + bool m_pred_xy(t_float f) + { + return (f > 0) && (f < 1); + } + + virtual void m_verify() + { + data_t x = m_data[0]; + data_t y = m_data[1]; + if (!m_pred_xy(x)) + m_data[0] = 0.5; + if (!m_pred_xy(y)) + m_data[1] = 0.5; + } + }; -- 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/coupled_logistic.hpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'chaos/src/coupled_logistic.hpp') diff --git a/chaos/src/coupled_logistic.hpp b/chaos/src/coupled_logistic.hpp index 7cc8602..d94ceee 100644 --- a/chaos/src/coupled_logistic.hpp +++ b/chaos/src/coupled_logistic.hpp @@ -22,7 +22,7 @@ // coupled_logistic map: x[n+1] = r * x[n] * (1 - x[n]) + e * (y[n] - x[n]) // y[n+1] = r * y[n] * (1 - y[n]) + e * (x[n] - y[n]) -// 1 <= r <= 4 +// 0 <= r <= 4 // taken from Willi-Hans Steeb: Chaos and Fractals class coupled_logistic: @@ -54,6 +54,7 @@ public: data_t r = CHAOS_PARAMETER(r); m_data[0] = r * x * (1.f - x) + e * (y - x); m_data[1] = r * y * (1.f - y) + e * (x - y); + m_verify(); } CHAOS_SYSPAR_FUNCS(e); @@ -76,9 +77,14 @@ public: data_t x = m_data[0]; data_t y = m_data[1]; if (!m_pred_xy(x)) - m_data[0] = 0.5; + m_data[0] = rand_range(0,0.08); if (!m_pred_xy(y)) - m_data[1] = 0.5; + m_data[1] = rand_range(0,0.08); + if (x == y) + { + m_data[0] += rand_range(0,0.2); + m_data[1] += -rand_range(0,0.2); + } } -- 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/coupled_logistic.hpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'chaos/src/coupled_logistic.hpp') diff --git a/chaos/src/coupled_logistic.hpp b/chaos/src/coupled_logistic.hpp index d94ceee..2e4b160 100644 --- a/chaos/src/coupled_logistic.hpp +++ b/chaos/src/coupled_logistic.hpp @@ -29,17 +29,14 @@ class coupled_logistic: public map_base { public: - coupled_logistic() + coupled_logistic(): + map_base(2) { - CHAOS_PRECONSTRUCTOR; - CHAOS_PAR_INIT(e, 0.06); CHAOS_PAR_INIT(r, 3.7); CHAOS_SYS_INIT(x, 0.1,0); CHAOS_SYS_INIT(y, 0.2,1); - - CHAOS_POSTCONSTRUCTOR; } ~coupled_logistic() -- 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/coupled_logistic.hpp | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'chaos/src/coupled_logistic.hpp') diff --git a/chaos/src/coupled_logistic.hpp b/chaos/src/coupled_logistic.hpp index 2e4b160..048aae1 100644 --- a/chaos/src/coupled_logistic.hpp +++ b/chaos/src/coupled_logistic.hpp @@ -26,11 +26,10 @@ // taken from Willi-Hans Steeb: Chaos and Fractals class coupled_logistic: - public map_base + public map_base<2> { public: - coupled_logistic(): - map_base(2) + coupled_logistic() { CHAOS_PAR_INIT(e, 0.06); CHAOS_PAR_INIT(r, 3.7); @@ -39,11 +38,7 @@ public: CHAOS_SYS_INIT(y, 0.2,1); } - ~coupled_logistic() - { - } - - virtual void m_step() + virtual inline void m_step() { data_t x = m_data[0]; data_t y = m_data[1]; @@ -56,7 +51,7 @@ public: CHAOS_SYSPAR_FUNCS(e); CHAOS_SYSPAR_FUNCS_PRED(r, m_pred_r); - bool m_pred_r(t_float f) + static bool m_pred_r(t_float f) { return (f > 0) && (f < 4); } @@ -64,12 +59,12 @@ public: CHAOS_SYSVAR_FUNCS_PRED(x, 0, m_pred_xy); CHAOS_SYSVAR_FUNCS_PRED(y, 0, m_pred_xy); - bool m_pred_xy(t_float f) + static bool m_pred_xy(t_float f) { return (f > 0) && (f < 1); } - virtual void m_verify() + inline void m_verify() { data_t x = m_data[0]; data_t y = m_data[1]; @@ -83,8 +78,6 @@ public: m_data[1] += -rand_range(0,0.2); } } - - }; #define COUPLED_LOGISTIC_CALLBACKS \ -- cgit v1.2.1