aboutsummaryrefslogtreecommitdiff
path: root/chaos/src/coupled_logistic.hpp
diff options
context:
space:
mode:
authorTim Blechmann <timblech@users.sourceforge.net>2005-06-16 13:02:02 +0000
committerIOhannes m zmölnig <zmoelnig@iem.at>2015-10-14 15:11:59 +0200
commitd1ed55f96f9cecc818844006fb36cd58ca70da5e (patch)
tree4d1ed404ba54ad7f360cec5ad3d0b38ec4b24840 /chaos/src/coupled_logistic.hpp
parent2434290915cda6ed855e4dc2249312153b995817 (diff)
- parameter searching (broken)
- misc. updates svn path=/trunk/externals/tb/; revision=3192
Diffstat (limited to 'chaos/src/coupled_logistic.hpp')
-rw-r--r--chaos/src/coupled_logistic.hpp12
1 files changed, 9 insertions, 3 deletions
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);
+ }
}