From 2d6b45e5e5b080d9b4f527734e7f3ae5fb1bf6f4 Mon Sep 17 00:00:00 2001 From: John Glover Date: Thu, 22 Mar 2012 22:46:30 +0000 Subject: [base] updating Cython Frame and PeakDetection classes --- src/simpl/base.cpp | 6 +++--- src/simpl/base.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp index f5a42b0..e07f6fe 100644 --- a/src/simpl/base.cpp +++ b/src/simpl/base.cpp @@ -110,7 +110,7 @@ void Frame::max_peaks(int new_max_peaks) } } -void Frame::add_peak(Peak peak) +void Frame::add_peak(Peak* peak) { _peaks.push_back(peak); } @@ -119,11 +119,11 @@ void Frame::add_peaks(Peaks* peaks) { for(Peaks::iterator i = peaks->begin(); i != peaks->end(); i++) { - add_peak(Peak(*i)); + add_peak(*i); } } -Peak Frame::peak(int peak_number) +Peak* Frame::peak(int peak_number) { return _peaks[peak_number]; } diff --git a/src/simpl/base.h b/src/simpl/base.h index 12df565..f70c952 100644 --- a/src/simpl/base.h +++ b/src/simpl/base.h @@ -39,7 +39,7 @@ public: bool is_free(const string direction = string("forwards")); }; -typedef std::vector Peaks; +typedef std::vector Peaks; // --------------------------------------------------------------------------- // Partial @@ -82,9 +82,9 @@ public: int num_peaks(); int max_peaks(); void max_peaks(int new_max_peaks); - void add_peak(Peak peak); + void add_peak(Peak* peak); void add_peaks(Peaks* peaks); - Peak peak(int peak_number); + Peak* peak(int peak_number); void clear_peaks(); Peaks::iterator peaks_begin(); Peaks::iterator peaks_end(); -- cgit v1.2.3