aboutsummaryrefslogtreecommitdiff
path: root/chaos/src/ikeda_laser_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/ikeda_laser_map.hpp
parenteced45909ba691a454fec179360ec1c2663f773a (diff)
a lot of new objects ...
svn path=/trunk/externals/tb/; revision=2431
Diffstat (limited to 'chaos/src/ikeda_laser_map.hpp')
-rw-r--r--chaos/src/ikeda_laser_map.hpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/chaos/src/ikeda_laser_map.hpp b/chaos/src/ikeda_laser_map.hpp
index ccc14cc..e267204 100644
--- a/chaos/src/ikeda_laser_map.hpp
+++ b/chaos/src/ikeda_laser_map.hpp
@@ -31,11 +31,11 @@
//
// taken from Willi-Hans Steeb: Chaos and Fractals
-class ikeda:
- protected map_base
+class ikeda_laser_map:
+ public map_base
{
public:
- ikeda()
+ ikeda_laser_map()
{
m_num_eq = 2;
m_data = new data_t[2];
@@ -47,7 +47,7 @@ public:
CHAOS_SYS_INIT(y,0.5);
}
- ~ikeda()
+ ~ikeda_laser_map()
{
delete m_data;
}
@@ -70,15 +70,15 @@ public:
CHAOS_SYSVAR_FUNCS(x, 0);
CHAOS_SYSVAR_FUNCS(y, 1);
- CHAOS_PAR_FUNCS(c1);
- CHAOS_PAR_FUNCS(c2);
- CHAOS_PAR_FUNCS(c3);
- CHAOS_PAR_FUNCS(roh);
+ CHAOS_SYSPAR_FUNCS(c1);
+ CHAOS_SYSPAR_FUNCS(c2);
+ CHAOS_SYSPAR_FUNCS(c3);
+ CHAOS_SYSPAR_FUNCS(roh);
};
-#define IKEDA_CALLBACKS \
+#define IKEDA_LASER_MAP_CALLBACKS \
MAP_CALLBACKS; \
CHAOS_SYS_CALLBACKS(c1); \
CHAOS_SYS_CALLBACKS(c2); \
@@ -87,7 +87,7 @@ CHAOS_SYS_CALLBACKS(roh); \
CHAOS_SYS_CALLBACKS(x); \
CHAOS_SYS_CALLBACKS(y);
-#define IKEDA_ATTRIBUTES \
+#define IKEDA_LASER_MAP_ATTRIBUTES \
MAP_ATTRIBUTES; \
CHAOS_SYS_ATTRIBUTE(c1); \
CHAOS_SYS_ATTRIBUTE(c2); \