From f29a18911ce09a638646d90d1f72838313419380 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Tue, 1 Nov 2005 21:28:21 +0000 Subject: added new system svn path=/trunk/externals/tb/; revision=3811 --- chaos/src/duffing.hpp | 98 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 chaos/src/duffing.hpp (limited to 'chaos/src/duffing.hpp') diff --git a/chaos/src/duffing.hpp b/chaos/src/duffing.hpp new file mode 100644 index 0000000..6cdafd6 --- /dev/null +++ b/chaos/src/duffing.hpp @@ -0,0 +1,98 @@ +// +// +// chaos~ +// Copyright (C) 2005 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 "ode_base.hpp" + +// duffing equation: dx/dt = y +// dy/dt = x * (1 - x^2) + R*cos(omega * t) - gamma * y +// + + +class duffing: + public ode_base +{ +public: + duffing(): + ode_base(2) + { + CHAOS_PAR_INIT(method,0); + CHAOS_PAR_INIT(dt,0.01); + + CHAOS_SYS_INIT(x, 0.5, 0); + CHAOS_SYS_INIT(y, 0.5, 1); + + CHAOS_PAR_INIT(R, 0.4); + CHAOS_PAR_INIT(omega, 1); + CHAOS_PAR_INIT(gamma, 0.25); + + t = 0; + } + + ~duffing() + { + } + + virtual void m_system(data_t* deriv, data_t* data) + { + data_t x = data[0], y = data[1]; + + deriv[0] = y; + deriv[1] = x * (1 - x*x) + + CHAOS_PARAMETER(R) * cos( CHAOS_PARAMETER(omega) * t) - + CHAOS_PARAMETER(gamma) * y; + t += CHAOS_PARAMETER(dt); + t = chaos_mod(t, M_PI); + } + + virtual void m_verify() + { + if (m_data[0] == 0 && m_data[1] == 0 && m_data[2] == 0) + for (int i = 0; i != 3; ++i) + m_data[i] = rand_range(0,3); + } + + + CHAOS_SYSVAR_FUNCS(x,0); + CHAOS_SYSVAR_FUNCS(y,1); + + CHAOS_SYSPAR_FUNCS(R); + CHAOS_SYSPAR_FUNCS(omega); + CHAOS_SYSPAR_FUNCS(gamma); + +private: + data_t t; +}; + +#define DUFFING_CALLBACKS \ +ODE_CALLBACKS; \ +CHAOS_SYS_CALLBACKS(x); \ +CHAOS_SYS_CALLBACKS(y); \ +CHAOS_SYS_CALLBACKS(R); \ +CHAOS_SYS_CALLBACKS(gamma); \ +CHAOS_SYS_CALLBACKS(omega); + +#define DUFFING_ATTRIBUTES \ +ODE_ATTRIBUTES; \ +CHAOS_SYS_ATTRIBUTE(x); \ +CHAOS_SYS_ATTRIBUTE(y); \ +CHAOS_SYS_ATTRIBUTE(R); \ +CHAOS_SYS_ATTRIBUTE(gamma); \ +CHAOS_SYS_ATTRIBUTE(omega); + -- 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/duffing.hpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'chaos/src/duffing.hpp') diff --git a/chaos/src/duffing.hpp b/chaos/src/duffing.hpp index 6cdafd6..ee7f7fb 100644 --- a/chaos/src/duffing.hpp +++ b/chaos/src/duffing.hpp @@ -26,11 +26,10 @@ class duffing: - public ode_base + public ode_base<2> { public: - duffing(): - ode_base(2) + duffing() { CHAOS_PAR_INIT(method,0); CHAOS_PAR_INIT(dt,0.01); @@ -45,9 +44,6 @@ public: t = 0; } - ~duffing() - { - } virtual void m_system(data_t* deriv, data_t* data) { -- cgit v1.2.1 From fae4d2ec359b596a775973956daf4636856f0141 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Wed, 6 Sep 2006 20:32:21 +0000 Subject: cleanups svn path=/trunk/externals/tb/; revision=5880 --- chaos/src/duffing.hpp | 124 +++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'chaos/src/duffing.hpp') diff --git a/chaos/src/duffing.hpp b/chaos/src/duffing.hpp index ee7f7fb..b5d931c 100644 --- a/chaos/src/duffing.hpp +++ b/chaos/src/duffing.hpp @@ -1,18 +1,18 @@ -// -// +// +// // chaos~ // Copyright (C) 2005 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, @@ -22,73 +22,73 @@ // duffing equation: dx/dt = y // dy/dt = x * (1 - x^2) + R*cos(omega * t) - gamma * y -// +// class duffing: - public ode_base<2> + public ode_base<2> { public: - duffing() - { - CHAOS_PAR_INIT(method,0); - CHAOS_PAR_INIT(dt,0.01); - - CHAOS_SYS_INIT(x, 0.5, 0); - CHAOS_SYS_INIT(y, 0.5, 1); - - CHAOS_PAR_INIT(R, 0.4); - CHAOS_PAR_INIT(omega, 1); - CHAOS_PAR_INIT(gamma, 0.25); - - t = 0; - } - - - virtual void m_system(data_t* deriv, data_t* data) - { - data_t x = data[0], y = data[1]; - - deriv[0] = y; - deriv[1] = x * (1 - x*x) + - CHAOS_PARAMETER(R) * cos( CHAOS_PARAMETER(omega) * t) - - CHAOS_PARAMETER(gamma) * y; - t += CHAOS_PARAMETER(dt); - t = chaos_mod(t, M_PI); - } - - virtual void m_verify() - { - if (m_data[0] == 0 && m_data[1] == 0 && m_data[2] == 0) - for (int i = 0; i != 3; ++i) - m_data[i] = rand_range(0,3); - } - - - CHAOS_SYSVAR_FUNCS(x,0); - CHAOS_SYSVAR_FUNCS(y,1); - - CHAOS_SYSPAR_FUNCS(R); - CHAOS_SYSPAR_FUNCS(omega); - CHAOS_SYSPAR_FUNCS(gamma); + duffing() + { + CHAOS_PAR_INIT(method,0); + CHAOS_PAR_INIT(dt,0.01); + + CHAOS_SYS_INIT(x, 0.5, 0); + CHAOS_SYS_INIT(y, 0.5, 1); + + CHAOS_PAR_INIT(R, 0.4); + CHAOS_PAR_INIT(omega, 1); + CHAOS_PAR_INIT(gamma, 0.25); + + t = 0; + } + + + virtual void m_system(data_t* deriv, data_t* data) + { + data_t x = data[0], y = data[1]; + + deriv[0] = y; + deriv[1] = x * (1 - x*x) + + CHAOS_PARAMETER(R) * cos( CHAOS_PARAMETER(omega) * t) - + CHAOS_PARAMETER(gamma) * y; + t += CHAOS_PARAMETER(dt); + t = std::fmod(t, data_t(M_PI)); + } + + virtual void m_verify() + { + if (m_data[0] == 0 && m_data[1] == 0 && m_data[2] == 0) + for (int i = 0; i != 3; ++i) + m_data[i] = rand_range(0,3); + } + + + CHAOS_SYSVAR_FUNCS(x,0); + CHAOS_SYSVAR_FUNCS(y,1); + + CHAOS_SYSPAR_FUNCS(R); + CHAOS_SYSPAR_FUNCS(omega); + CHAOS_SYSPAR_FUNCS(gamma); private: - data_t t; + data_t t; }; -#define DUFFING_CALLBACKS \ -ODE_CALLBACKS; \ -CHAOS_SYS_CALLBACKS(x); \ -CHAOS_SYS_CALLBACKS(y); \ -CHAOS_SYS_CALLBACKS(R); \ -CHAOS_SYS_CALLBACKS(gamma); \ +#define DUFFING_CALLBACKS \ +ODE_CALLBACKS; \ +CHAOS_SYS_CALLBACKS(x); \ +CHAOS_SYS_CALLBACKS(y); \ +CHAOS_SYS_CALLBACKS(R); \ +CHAOS_SYS_CALLBACKS(gamma); \ CHAOS_SYS_CALLBACKS(omega); -#define DUFFING_ATTRIBUTES \ -ODE_ATTRIBUTES; \ -CHAOS_SYS_ATTRIBUTE(x); \ -CHAOS_SYS_ATTRIBUTE(y); \ -CHAOS_SYS_ATTRIBUTE(R); \ -CHAOS_SYS_ATTRIBUTE(gamma); \ +#define DUFFING_ATTRIBUTES \ +ODE_ATTRIBUTES; \ +CHAOS_SYS_ATTRIBUTE(x); \ +CHAOS_SYS_ATTRIBUTE(y); \ +CHAOS_SYS_ATTRIBUTE(R); \ +CHAOS_SYS_ATTRIBUTE(gamma); \ CHAOS_SYS_ATTRIBUTE(omega); -- cgit v1.2.1