[med-svn] [SCM] aghermann branch, master, updated. 3b87b4f8039ed683022537a0599b7dea069974d2

[Andrei Zavada]

The following commit has been merged in the master branch:
commit 81d2d350dc84f3fc99da681e9a149ca91f608a3a
Author: Andrei Zavada <johnhommer at gmail.com>
Date:   Sun Sep 30 19:51:58 2012 +0300

    use typedefs for clarity

diff --git a/src/expdesign/primaries-tree-scanner.cc b/src/expdesign/primaries-tree-scanner.cc
index b7aa241..5cd8699 100644
--- a/src/expdesign/primaries-tree-scanner.cc
+++ b/src/expdesign/primaries-tree-scanner.cc
@@ -348,14 +348,13 @@ void
 agh::CExpDesign::
 compute_profiles()
 {
-	function<void(CRecording&)> F =
+	TRecordingOpFun F =
 		[&]( CRecording& R)
 		{
 			R.CBinnedPower::compute();
 			R.CBinnedMC::compute();
 		};
-	function<void(const CJGroup&, const CSubject&, const string&, const CSubject::SEpisode&, const CRecording&,
-		      size_t, size_t)> G =
+	TRecordingReportFun G =
 		[&]( const CJGroup&, const CSubject&, const string&, const CSubject::SEpisode&, const CRecording& R,
 		     size_t i, size_t total)
 		{
@@ -363,7 +362,7 @@ compute_profiles()
 				(string ("Compute ") + R.F().filename() + ":"+R.F().channel_by_id(R.h())).c_str(),
 				total, i);
 		};
-	function<bool(CRecording&)> filter =
+	TRecordingFilterFun filter =
 		[&]( CRecording& R)
 		{
 			return R.signal_type() == sigfile::SChannel::TType::eeg;
diff --git a/src/expdesign/primaries.cc b/src/expdesign/primaries.cc
index 47a24eb..7d577c5 100644
--- a/src/expdesign/primaries.cc
+++ b/src/expdesign/primaries.cc
@@ -117,10 +117,7 @@ log_message( const char* fmt, ...)
 
 void
 agh::CExpDesign::
-for_all_subjects( function<void(CSubject&)>& F,
-		  function<void(const CJGroup&, const CSubject&,
-				size_t, size_t)>& report,
-		  function<bool(CSubject&)>& filter)
+for_all_subjects( const TSubjectOpFun& F, const TSubjectReportFun& report, const TSubjectFilterFun& filter)
 {
 	vector<tuple<CJGroup*,
 		     CSubject*>> v;
@@ -143,10 +140,7 @@ for_all_subjects( function<void(CSubject&)>& F,
 
 void
 agh::CExpDesign::
-for_all_episodes( function<void(CSubject::SEpisode&)>& F,
-		  function<void(const CJGroup&, const CSubject&, const string&, const CSubject::SEpisode&,
-				size_t, size_t)>& report,
-		  function<bool(CSubject::SEpisode&)>& filter)
+for_all_episodes( const TEpisodeOpFun& F, const TEpisodeReportFun& report, const TEpisodeFilterFun& filter)
 {
 	vector<tuple<CJGroup*,
 		     CSubject*,
@@ -173,10 +167,7 @@ for_all_episodes( function<void(CSubject::SEpisode&)>& F,
 
 void
 agh::CExpDesign::
-for_all_recordings( function<void(CRecording&)>& F,
-		    function<void(const CJGroup&, const CSubject&, const string&, const CSubject::SEpisode&, const CRecording&,
-				  size_t, size_t)>& report,
-		    function<bool(CRecording&)>& filter)
+for_all_recordings( const TRecordingOpFun& F, const TRecordingReportFun& report, const TRecordingFilterFun& filter)
 {
 	vector<tuple<CJGroup*,
 		     CSubject*,
diff --git a/src/expdesign/primaries.hh b/src/expdesign/primaries.hh
index 5abbc74..476cd10 100644
--- a/src/expdesign/primaries.hh
+++ b/src/expdesign/primaries.hh
@@ -372,21 +372,43 @@ class CExpDesign {
 	list<size_t> used_samplerates( sigfile::SChannel::TType type = sigfile::SChannel::other) const;
 
       // omp-enabled lists:foreach
+	typedef function<void(CSubject&)>
+		TSubjectOpFun;
+	typedef function<void(const CJGroup&,
+			      const CSubject&,
+			      size_t, size_t)>
+		TSubjectReportFun;
+	typedef function<bool(CSubject&)>
+		TSubjectFilterFun;
 	void
-	for_all_subjects( function<void(CSubject&)>&,
-			  function<void(const CJGroup&, const CSubject&,
-					size_t, size_t)>&,
-			  function<bool(CSubject&)>& filter);
+	for_all_subjects( const TSubjectOpFun&, const TSubjectReportFun&, const TSubjectFilterFun&);
+
+	typedef function<void(CSubject::SEpisode&)>
+		TEpisodeOpFun;
+	typedef function<void(const CJGroup&,
+			      const CSubject&,
+			      const string&,
+			      const CSubject::SEpisode&,
+			      size_t, size_t)>
+		TEpisodeReportFun;
+	typedef function<bool(CSubject::SEpisode&)>
+		TEpisodeFilterFun;
 	void
-	for_all_episodes( function<void(CSubject::SEpisode&)>&,
-			  function<void(const CJGroup&, const CSubject&, const string&, const CSubject::SEpisode&,
-					size_t, size_t)>&,
-			  function<bool(CSubject::SEpisode&)>& filter);
+	for_all_episodes( const TEpisodeOpFun&, const TEpisodeReportFun&, const TEpisodeFilterFun&);
+
+	typedef function<void(CRecording&)>
+		TRecordingOpFun;
+	typedef function<void(const CJGroup&,
+			      const CSubject&,
+			      const string&,
+			      const CSubject::SEpisode&,
+			      const CRecording&,
+			      size_t, size_t)>
+		TRecordingReportFun;
+	typedef function<bool(CRecording&)>
+		TRecordingFilterFun;
 	void
-	for_all_recordings( function<void(CRecording&)>&,
-			    function<void(const CJGroup&, const CSubject&, const string&, const CSubject::SEpisode&, const CRecording&,
-					  size_t, size_t)>&,
-			    function<bool(CRecording&)>&);
+	for_all_recordings( const TRecordingOpFun&, const TRecordingReportFun&, const TRecordingFilterFun&);
 
       // inventory
 	sigfile::SFFTParamSet

-- 
Sleep experiment manager