added new system

svn path=/trunk/externals/tb/; revision=3811

6 files changed, 175 insertions, 7 deletions

diff --git a/chaos/src/chaos_msg.hpp b/chaos/src/chaos_msg.hpp
index 3f80101..357ff6a 100644
--- a/chaos/src/chaos_msg.hpp
+++ b/chaos/src/chaos_msg.hpp
@@ -25,6 +25,11 @@ template <class system> class chaos_msg
 {
 	FLEXT_HEADER(chaos_msg, flext_base);
 
+	~chaos_msg()
+	{
+		delete m_system;
+	}
+
 public:
 
 	/* local data for system, output and interpolation */
@@ -59,10 +64,5 @@ SYSTEM##_msg(int argc, t_atom* argv )			\
         AddOutFloat();							\
 												\
     ATTRIBUTES;									\
-    FLEXT_ADDBANG(0, m_bang);              	\
-}												\
-												\
-~SYSTEM##_msg()									\
-{												\
-	delete m_system;							\
+    FLEXT_ADDBANG(0, m_bang);					\
 }
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);
+
diff --git a/chaos/src/duffing_dsp.cpp b/chaos/src/duffing_dsp.cpp
new file mode 100644
index 0000000..c2c89c1
--- /dev/null
+++ b/chaos/src/duffing_dsp.cpp
@@ -0,0 +1,23 @@
+//
+//  
+//  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 "duffing.hpp"
+#include "chaos_dsp.hpp"
+CHAOS_DSP_CLASS(duffing,DUFFING);
diff --git a/chaos/src/duffing_msg.cpp b/chaos/src/duffing_msg.cpp
new file mode 100644
index 0000000..08f4109
--- /dev/null
+++ b/chaos/src/duffing_msg.cpp
@@ -0,0 +1,23 @@
+//
+//  
+//  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 "duffing.hpp"
+#include "chaos_msg.hpp"
+CHAOS_MSG_CLASS(duffing,DUFFING);
diff --git a/chaos/src/duffing_search.cpp b/chaos/src/duffing_search.cpp
new file mode 100644
index 0000000..13d5cdd
--- /dev/null
+++ b/chaos/src/duffing_search.cpp
@@ -0,0 +1,24 @@
+// 
+//  
+//  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 "duffing.hpp"
+#include "chaos_search.hpp"
+
+CHAOS_SEARCH_CLASS(duffing, DUFFING);
diff --git a/chaos/src/main.cpp b/chaos/src/main.cpp
index 0126f32..354f68a 100644
--- a/chaos/src/main.cpp
+++ b/chaos/src/main.cpp
@@ -23,7 +23,7 @@
 
 void chaos_library_setup()
 {
-	post("chaos~ version 0.01, compiled on "__DATE__);
+	post("\nchaos~ version 0.01, compiled on "__DATE__);
 	post("(C)2005 Tim Blechmann, www.mokabar.tk\n\n");