From fae4d2ec359b596a775973956daf4636856f0141 Mon Sep 17 00:00:00 2001
From: Tim Blechmann <timblech@users.sourceforge.net>
Date: Wed, 6 Sep 2006 20:32:21 +0000
Subject: cleanups

svn path=/trunk/externals/tb/; revision=5880
---
 chaos/src/ode_base.hpp | 79 +++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 40 deletions(-)

(limited to 'chaos/src/ode_base.hpp')

diff --git a/chaos/src/ode_base.hpp b/chaos/src/ode_base.hpp
index f46332c..42478bc 100644
--- a/chaos/src/ode_base.hpp
+++ b/chaos/src/ode_base.hpp
@@ -76,59 +76,58 @@ protected:
     data_t m_k1[dimensions];
     data_t m_k2[dimensions];
     data_t m_k3[dimensions];
-	data_t m_tmp[dimensions];
-//    data_t m_tmp[dimensions];     
+	data_t m_tmp[dimensions];   
 
 	virtual void m_system (data_t* deriv, data_t* data) = 0;
 
     void rk1()
     {
-//        m_system (m_k0, m_data);
-//        for (int i = 0; i != dimensions; ++i)
-//            m_data[i] += m_dt * m_k0[i];
+        m_system (m_k0, chaos_base<dimensions>::m_data);
+        for (int i = 0; i != dimensions; ++i)
+            chaos_base<dimensions>::m_data[i] += m_dt * m_k0[i];
     }
     
     void rk2()
     {
-//        m_system (m_k0, m_data);
-//        for (int i = 0; i != dimensions; ++i)
-//            m_k0[i] = m_k0[i] * 0.5 * m_dt + m_data[i];
-//        
-//        m_system (m_k1, m_k0);
-//        for (int i = 0; i != dimensions; ++i)
-//            m_data[i] += m_dt * m_k1[i];
+        for (int i = 0; i != dimensions; ++i)
+            m_k0[i] = m_k0[i] * 0.5 * m_dt + chaos_base<dimensions>::m_data[i];
+        
+        m_system (m_k0, chaos_base<dimensions>::m_data);
+        m_system (m_k1, m_k0);
+        for (int i = 0; i != dimensions; ++i)
+            chaos_base<dimensions>::m_data[i] += m_dt * m_k1[i];
     }
     
     void rk4()
     {
-//        m_system (m_k0, m_data);
-//        for (int i = 0; i != dimensions; ++i)
-//        {
-//            m_k0[i] *= m_dt;
-//            m_tmp[i] = m_data[i] + 0.5 * m_k0[i];
-//        }
-//    
-//        m_system (m_k1, m_tmp);
-//        for (int i = 0; i != dimensions; ++i)
-//        {
-//            m_k1[i] *= m_dt;
-//            m_tmp[i] = m_data[i] + 0.5 * m_k1[i];
-//        }
-//        
-//        m_system (m_k2, m_tmp);
-//        for (int i = 0; i != dimensions; ++i)
-//        {
-//            m_k2[i] *= m_dt;
-//            m_tmp[i] = m_data[i] + m_k2[i];
-//        }
-//    
-//        m_system (m_k3, m_tmp);
-//        for (int i = 0; i != dimensions; ++i)
-//            m_k3[i] *= m_dt;
-//    
-//        for (int i = 0; i != dimensions; ++i)
-//            m_data[i] += (m_k0[i] + 2. * (m_k1[i] + m_k2[i]) + m_k3[i]) 
-//                / 6.;
+        m_system (m_k0, chaos_base<dimensions>::m_data);
+        for (int i = 0; i != dimensions; ++i)
+        {
+            m_k0[i] *= m_dt;
+            m_tmp[i] = chaos_base<dimensions>::m_data[i] + 0.5 * m_k0[i];
+        }
+    
+        m_system (m_k1, m_tmp);
+        for (int i = 0; i != dimensions; ++i)
+        {
+            m_k1[i] *= m_dt;
+            m_tmp[i] = chaos_base<dimensions>::m_data[i] + 0.5 * m_k1[i];
+        }
+        
+        m_system (m_k2, m_tmp);
+        for (int i = 0; i != dimensions; ++i)
+        {
+            m_k2[i] *= m_dt;
+            m_tmp[i] = chaos_base<dimensions>::m_data[i] + m_k2[i];
+        }
+    
+        m_system (m_k3, m_tmp);
+        for (int i = 0; i != dimensions; ++i)
+            m_k3[i] *= m_dt;
+    
+        for (int i = 0; i != dimensions; ++i)
+            chaos_base<dimensions>::m_data[i] += (m_k0[i] + 2. * (m_k1[i] + m_k2[i]) + m_k3[i]) 
+                / 6.;
     }
 };
 
-- 
cgit v1.2.1