[PD-cvs] externals/tb/chaos/src circle_map.hpp, 1.7, 1.8 ikeda_laser_map.hpp, 1.7, 1.8 chaos_dsp.hpp, 1.16, 1.17 tent_map.hpp, 1.7, 1.8 delayed_logistic.hpp, 1.3, 1.4 gauss_map.hpp, 1.7, 1.8 gaussian_map.hpp, 1.3, 1.4 ode_base.hpp, 1.7, 1.8 chaos_base.hpp, 1.10, 1.11 bungalow_tent_map.hpp, 1.7, 1.8 chaos_msg.hpp, 1.4, 1.5 latoocarfian.hpp, 1.6, 1.7 bernoulli_map.hpp, 1.7, 1.8 standard_map.hpp, 1.7, 1.8 latoomutgamma.hpp, 1.7, 1.8 sine_map.hpp, 1.7, 1.8 logistic_map.hpp, 1.10, 1.11 chaos_search.hpp, 1.2, 1.3 lozi_map.hpp, 1.8, 1.9 duffing_map.hpp, 1.4, 1.5 latoomutalpha.hpp, 1.6, 1.7 henon_map.hpp, 1.7, 1.8 linear_congruental.hpp, 1.2, 1.3 map_base.hpp, 1.5, 1.6 latoomutbeta.hpp, 1.6, 1.7

Tim Blechmann timblech at users.sourceforge.net
Sun May 21 21:17:06 CEST 2006


Update of /cvsroot/pure-data/externals/tb/chaos/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14977/src

Modified Files:
	circle_map.hpp ikeda_laser_map.hpp chaos_dsp.hpp tent_map.hpp 
	delayed_logistic.hpp gauss_map.hpp gaussian_map.hpp 
	ode_base.hpp chaos_base.hpp bungalow_tent_map.hpp 
	chaos_msg.hpp latoocarfian.hpp bernoulli_map.hpp 
	standard_map.hpp latoomutgamma.hpp sine_map.hpp 
	logistic_map.hpp chaos_search.hpp lozi_map.hpp duffing_map.hpp 
	latoomutalpha.hpp henon_map.hpp linear_congruental.hpp 
	map_base.hpp latoomutbeta.hpp 
Log Message:
improved inlining for maps

Index: bungalow_tent_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/bungalow_tent_map.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bungalow_tent_map.hpp	21 May 2006 18:34:34 -0000	1.7
--- bungalow_tent_map.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 43,47 ****
  	}
  
! 	virtual void m_step()
  	{
  		data_t x = m_data[0];
--- 43,47 ----
  	}
  
! 	void m_step()
  	{
  		data_t x = m_data[0];

Index: latoomutgamma.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/latoomutgamma.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** latoomutgamma.hpp	21 May 2006 18:34:34 -0000	1.7
--- latoomutgamma.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 40,44 ****
  	}
  
! 	virtual void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];
--- 40,44 ----
  	}
  
! 	void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];

Index: lozi_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/lozi_map.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** lozi_map.hpp	21 May 2006 18:34:34 -0000	1.8
--- lozi_map.hpp	21 May 2006 19:17:04 -0000	1.9
***************
*** 39,43 ****
  	}
  
! 	virtual void m_step()
  	{
  		data_t x = m_data[0];
--- 39,43 ----
  	}
  
! 	void m_step()
  	{
  		data_t x = m_data[0];

Index: linear_congruental.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/linear_congruental.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** linear_congruental.hpp	21 May 2006 18:34:34 -0000	1.2
--- linear_congruental.hpp	21 May 2006 19:17:04 -0000	1.3
***************
*** 38,42 ****
  	}
  
! 	virtual void m_step()
  	{
  		data_t x = m_data[0];
--- 38,42 ----
  	}
  
! 	void m_step()
  	{
  		data_t x = m_data[0];

Index: logistic_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/logistic_map.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** logistic_map.hpp	21 May 2006 18:34:34 -0000	1.10
--- logistic_map.hpp	21 May 2006 19:17:04 -0000	1.11
***************
*** 39,43 ****
  	}
  
! 	virtual void m_step()
  	{
  		data_t x = m_data[0];
--- 39,43 ----
  	}
  
! 	void m_step()
  	{
  		data_t x = m_data[0];

Index: chaos_msg.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chaos_msg.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** chaos_msg.hpp	21 May 2006 18:34:34 -0000	1.4
--- chaos_msg.hpp	21 May 2006 19:17:04 -0000	1.5
***************
*** 43,47 ****
  	void m_bang()
  	{
! 		m_system.m_perform();
  		int outlets = m_system.get_num_eq();
  
--- 43,51 ----
  	void m_bang()
  	{
!         m_system.m_step();
!         m_system.m_bash_denormals();
!         m_system.m_verify();
! 
!         
  		int outlets = m_system.get_num_eq();
  

Index: tent_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/tent_map.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** tent_map.hpp	21 May 2006 18:34:34 -0000	1.7
--- tent_map.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 36,40 ****
  	
  
! 	virtual void m_step()
  	{
  		data_t data = m_data[0];
--- 36,40 ----
  	
  
! 	void m_step()
  	{
  		data_t data = m_data[0];

Index: chaos_dsp.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chaos_dsp.hpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** chaos_dsp.hpp	21 May 2006 18:34:34 -0000	1.16
--- chaos_dsp.hpp	21 May 2006 19:17:04 -0000	1.17
***************
*** 258,262 ****
  	for (int i = 0; i!=n; ++i)
  	{
! 		m_system.m_perform();
  		for (int j = 0; j != outlets; ++j)
  		{
--- 258,265 ----
  	for (int i = 0; i!=n; ++i)
  	{
!         m_system.m_step();
!         m_system.m_bash_denormals();
!         m_system.m_verify();
! 
  		for (int j = 0; j != outlets; ++j)
  		{
***************
*** 280,284 ****
  		while (phase <= 0)
  		{
!  			m_system.m_perform();
  			phase += m_sr * m_invfreq;
  		}
--- 283,290 ----
  		while (phase <= 0)
  		{
!             m_system.m_step();
!             m_system.m_bash_denormals();
!             m_system.m_verify();
! 
  			phase += m_sr * m_invfreq;
  		}
***************
*** 310,314 ****
  		if (phase == 0)
  		{
!  			m_system.m_perform();
  			phase = int (m_sr * m_invfreq);
  		}
--- 316,323 ----
  		if (phase == 0)
  		{
!             m_system.m_step();
!             m_system.m_bash_denormals();
!             m_system.m_verify();
! 
  			phase = int (m_sr * m_invfreq);
  		}
***************
*** 342,346 ****
  		if (phase == 0)
  		{
! 			m_system.m_perform();
  			phase = int (m_sr * m_invfreq);
  
--- 351,358 ----
  		if (phase == 0)
  		{
!             m_system.m_step();
!             m_system.m_bash_denormals();
!             m_system.m_verify();
! 
  			phase = int (m_sr * m_invfreq);
  
***************
*** 382,386 ****
  		if (phase <= 0)
  		{
! 			m_system.m_perform();
  			phase = m_sr * m_invfreq;
  
--- 394,401 ----
  		if (phase <= 0)
  		{
!             m_system.m_step();
!             m_system.m_bash_denormals();
!             m_system.m_verify();
! 
  			phase = m_sr * m_invfreq;
  
***************
*** 421,425 ****
  		if (phase == 0)
  		{
! 			m_system.m_perform();
  			phase = int (m_sr * m_invfreq);
  			phase = (phase > 2) ? phase : 2;
--- 436,443 ----
  		if (phase == 0)
  		{
!             m_system.m_step();
!             m_system.m_bash_denormals();
!             m_system.m_verify();
! 
  			phase = int (m_sr * m_invfreq);
  			phase = (phase > 2) ? phase : 2;
***************
*** 473,477 ****
  		if (phase == 0)
  		{
! 			m_system.m_perform();
  			phase = int (m_sr * m_invfreq);
  			phase = (phase > 2) ? phase : 2;
--- 491,499 ----
  		if (phase == 0)
  		{
!             m_system.m_step();
!             m_system.m_bash_denormals();
!             m_system.m_verify();
! 
! 
  			phase = int (m_sr * m_invfreq);
  			phase = (phase > 2) ? phase : 2;

Index: delayed_logistic.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/delayed_logistic.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** delayed_logistic.hpp	21 May 2006 18:34:34 -0000	1.3
--- delayed_logistic.hpp	21 May 2006 19:17:04 -0000	1.4
***************
*** 40,44 ****
  
  
! 	virtual void m_step()
  	{
  		data_t x = m_data[0];
--- 40,44 ----
  
  
! 	void m_step()
  	{
  		data_t x = m_data[0];

Index: latoocarfian.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/latoocarfian.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** latoocarfian.hpp	21 May 2006 18:34:34 -0000	1.6
--- latoocarfian.hpp	21 May 2006 19:17:04 -0000	1.7
***************
*** 43,47 ****
  	}
  
! 	virtual void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];
--- 43,47 ----
  	}
  
! 	void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];

Index: map_base.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/map_base.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** map_base.hpp	21 May 2006 18:34:34 -0000	1.5
--- map_base.hpp	21 May 2006 19:17:04 -0000	1.6
***************
*** 29,33 ****
  {
  protected:
! 	virtual void m_step()
  	{
  	}
--- 29,33 ----
  {
  protected:
! 	void m_step()
  	{
  	}

Index: latoomutbeta.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/latoomutbeta.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** latoomutbeta.hpp	21 May 2006 18:34:34 -0000	1.6
--- latoomutbeta.hpp	21 May 2006 19:17:04 -0000	1.7
***************
*** 40,44 ****
  	}
  	
! 	virtual void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];
--- 40,44 ----
  	}
  	
! 	void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];

Index: standard_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/standard_map.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** standard_map.hpp	21 May 2006 18:34:34 -0000	1.7
--- standard_map.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 44,48 ****
  	}
  
! 	virtual void m_step()
  	{
  		data_t I = m_data[0];
--- 44,48 ----
  	}
  
! 	void m_step()
  	{
  		data_t I = m_data[0];

Index: duffing_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/duffing_map.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** duffing_map.hpp	21 May 2006 18:34:34 -0000	1.4
--- duffing_map.hpp	21 May 2006 19:17:04 -0000	1.5
***************
*** 40,44 ****
  
  
! 	virtual void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];
--- 40,44 ----
  
  
! 	void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];

Index: gaussian_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/gaussian_map.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gaussian_map.hpp	21 May 2006 18:34:34 -0000	1.3
--- gaussian_map.hpp	21 May 2006 19:17:04 -0000	1.4
***************
*** 40,44 ****
  
  
! 	virtual void m_step()
  	{
  		data_t data = m_data[0];
--- 40,44 ----
  
  
! 	void m_step()
  	{
  		data_t data = m_data[0];

Index: ikeda_laser_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/ikeda_laser_map.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ikeda_laser_map.hpp	21 May 2006 18:34:34 -0000	1.7
--- ikeda_laser_map.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 47,51 ****
  	}
  
! 	virtual void m_step()
  	{
  		data_t x = m_data[0];
--- 47,51 ----
  	}
  
! 	void m_step()
  	{
  		data_t x = m_data[0];

Index: chaos_base.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chaos_base.hpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** chaos_base.hpp	21 May 2006 18:34:34 -0000	1.10
--- chaos_base.hpp	21 May 2006 19:17:04 -0000	1.11
***************
*** 43,52 ****
  	}
  
! 	inline void m_perform()
! 	{
! 		m_step();
! 		m_bash_denormals();
! 		m_verify();
! 	}
  
   	std::map<const t_symbol*,int> attr_ind;
--- 43,52 ----
  	}
  
! //	inline void m_perform()
! //	{
! //		m_step();
! //		m_bash_denormals();
! //		m_verify();
! //	}
  
   	std::map<const t_symbol*,int> attr_ind;
***************
*** 71,75 ****
  
  protected:
! 	virtual void m_step() = 0;            // iteration
   	flext::AtomList Parameter;    // parameter
   	flext::AtomList System;       // system
--- 71,75 ----
  
  protected:
! //	void m_step() = 0;            // iteration
   	flext::AtomList Parameter;    // parameter
   	flext::AtomList System;       // system

Index: sine_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/sine_map.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** sine_map.hpp	21 May 2006 18:34:34 -0000	1.7
--- sine_map.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 41,45 ****
  	}
  
! 	virtual void m_step()
  	{
  		m_data[0] = sin (M_PI * m_data[0]);
--- 41,45 ----
  	}
  
! 	void m_step()
  	{
  		m_data[0] = sin (M_PI * m_data[0]);

Index: circle_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/circle_map.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** circle_map.hpp	21 May 2006 18:34:34 -0000	1.7
--- circle_map.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 40,44 ****
  
  
! 	virtual void m_step()
  	{
  		data_t x = m_data[0];
--- 40,44 ----
  
  
! 	void m_step()
  	{
  		data_t x = m_data[0];

Index: gauss_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/gauss_map.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gauss_map.hpp	21 May 2006 18:34:34 -0000	1.7
--- gauss_map.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 38,42 ****
  
  
! 	virtual void m_step()
  	{
  		data_t data = m_data[0];
--- 38,42 ----
  
  
! 	void m_step()
  	{
  		data_t data = m_data[0];

Index: ode_base.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/ode_base.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ode_base.hpp	21 May 2006 18:34:34 -0000	1.7
--- ode_base.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 63,67 ****
  	}
  
! 	virtual void m_step()
  	{
  		(this->*m_routine)();
--- 63,67 ----
  	}
  
! 	void m_step()
  	{
  		(this->*m_routine)();

Index: bernoulli_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/bernoulli_map.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bernoulli_map.hpp	21 May 2006 18:34:34 -0000	1.7
--- bernoulli_map.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 35,39 ****
  	}
  
! 	virtual void m_step()
  	{
  		data_t x = m_data[0];
--- 35,39 ----
  	}
  
! 	void m_step()
  	{
  		data_t x = m_data[0];

Index: henon_map.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/henon_map.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** henon_map.hpp	21 May 2006 18:34:34 -0000	1.7
--- henon_map.hpp	21 May 2006 19:17:04 -0000	1.8
***************
*** 40,44 ****
  
  
! 	virtual void m_step()
  	{
  		data_t x = m_data[0];
--- 40,44 ----
  
  
! 	void m_step()
  	{
  		data_t x = m_data[0];

Index: latoomutalpha.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/latoomutalpha.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** latoomutalpha.hpp	21 May 2006 18:34:34 -0000	1.6
--- latoomutalpha.hpp	21 May 2006 19:17:04 -0000	1.7
***************
*** 42,46 ****
  	
  
! 	virtual void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];
--- 42,46 ----
  	
  
! 	void m_step()
  	{
  		data_t x1 = m_data[0], x2 = m_data[1];

Index: chaos_search.hpp
===================================================================
RCS file: /cvsroot/pure-data/externals/tb/chaos/src/chaos_search.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** chaos_search.hpp	21 May 2006 18:34:34 -0000	1.2
--- chaos_search.hpp	21 May 2006 19:17:04 -0000	1.3
***************
*** 138,142 ****
  	for (int i = 0; i != m_transient_steps; ++i)
  	{
! 		m_system.m_perform();
  	}
  
--- 138,144 ----
  	for (int i = 0; i != m_transient_steps; ++i)
  	{
!         m_system.m_step();
!         m_system.m_bash_denormals();
!         m_system.m_verify();
  	}
  
***************
*** 150,155 ****
  	for (int i = 0; i != m_asymptotic_steps; ++i)
  	{
! 		
! 		m_system.m_perform();
  		
  		data_t diff = 0;
--- 152,158 ----
  	for (int i = 0; i != m_asymptotic_steps; ++i)
  	{
!         m_system.m_step();
!         m_system.m_bash_denormals();
!         m_system.m_verify();
  		
  		data_t diff = 0;





More information about the Pd-cvs mailing list