aboutsummaryrefslogtreecommitdiff
path: root/chaos/src/circle_map.hpp
diff options
context:
space:
mode:
authorTim Blechmann <timblech@users.sourceforge.net>2004-12-27 14:44:11 +0000
committerIOhannes m zmölnig <zmoelnig@iem.at>2015-10-14 15:11:58 +0200
commitb2f2fd990f9059db784a7849726c6fc5006c70f9 (patch)
treec867375b241055491d7665624aa24aa84c00c9b1 /chaos/src/circle_map.hpp
parenteced45909ba691a454fec179360ec1c2663f773a (diff)
a lot of new objects ...
svn path=/trunk/externals/tb/; revision=2431
Diffstat (limited to 'chaos/src/circle_map.hpp')
-rw-r--r--chaos/src/circle_map.hpp12
1 files changed, 7 insertions, 5 deletions
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 <cmath>
+
+// 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()