[med-svn] [SCM] aghermann branch, master, updated. 5727b0b7844548ed4c4fceab25995fc02b87da50

[Andrei Zavada]

The following commit has been merged in the master branch:
commit ab3ed86d0291756137d2bb1b337b6978d952b6d3
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Tue Dec 4 02:14:41 2012 +0200

    bring ultradian cycle detection into fold

diff --git a/src/expdesign/recording.hh b/src/expdesign/recording.hh
index ef01396..bd217a6 100644
--- a/src/expdesign/recording.hh
+++ b/src/expdesign/recording.hh
@@ -240,11 +240,10 @@ class CRecording {
 
 	bool have_uc_determined() const
 		{
-			return uc_params and isfinite(uc_cf);
+			return uc_params;
 		}
 	agh::beersma::SUltradianCycle
 		*uc_params;
-	double	uc_cf;
 
     protected:
 	int	_status;
diff --git a/src/ui/mw/mw.cc b/src/ui/mw/mw.cc
index a85a5d9..2890352 100644
--- a/src/ui/mw/mw.cc
+++ b/src/ui/mw/mw.cc
@@ -450,9 +450,14 @@ do_detect_ultradian_cycle( agh::CRecording& M)
 	siman_params.t_initial  	=   10 * uc_accuracy_factor;
 	siman_params.mu_t		=    1.003;
 	siman_params.t_min		=    5e-2;
-	agh::beersma::ultradian_cycles(
-		M,
-		{make_active_profile_paramset(), .1, siman_params});
+
+	agh::beersma::SUltradianCycle
+		L = agh::beersma::ultradian_cycles(
+			M, {make_active_profile_paramset(), .1, siman_params});
+
+	if ( M.uc_params )
+		delete M.uc_params;
+	M.uc_params = new agh::beersma::SUltradianCycle (L);
 }
 
 

-- 
Sleep experiment manager