jens/GnuRadio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- improved Peak class

Browse Source 
- added makeBox in Peak class
- sort on Peaks


git-svn-id: http://moon:8086/svn/software/trunk/projects/GnuRadio@474 b431acfa-c32f-4a4a-93f1-934dc6c82436
This commit is contained in:
jens
2019-05-26 07:16:07 +00:00
parent 19fdc08f88
commit cee80819ab
2 changed files with 101 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gr-jay/lib/peak_detect_impl.cc
+18 -77
View File
@@ -202,7 +202,7 @@ namespace gr {
// -----------------------------------------------------------------
// Search true maximum peak using hill climbing
// -----------------------------------------------------------------
std::vector<int> newPeakPos;
std::vector<Peak> newPeakPos;
int numPeaksLast = 0;
while(1)
{
@@ -225,7 +225,9 @@ namespace gr {
}
else
{
addToList(newPeakPos, pos);
Peak peak(m_peak_id++, pos);
peak.height_abs = m_pXds[pos];
addToListByPos(newPeakPos, peak);
numPeaksClimbed++;
break;
}
@@ -237,100 +239,39 @@ namespace gr {
}
numPeaksLast = numPeaksClimbed;
}
peakPos = newPeakPos;
// -----------------------------------------------------------------
// Sort peaks
// -----------------------------------------------------------------
sort<float>(m_pXds, peakPos);
sort(newPeakPos);
// -----------------------------------------------------------------
// Find peak boxes
// -----------------------------------------------------------------
m_peakList.clear();
for (int i = 0; i < peakPos.size(); i++)
for (int i = 0; i < newPeakPos.size(); i++)
{
int pbh = 0;
int pos = peakPos[i];
int left = pos;
int right = pos;
float nom = 10;
int left_found = 0;
int right_found = 0;
while(!(left_found & right_found))
Peak &peak = newPeakPos[i];
bool success = peak.makeBox(m_peak_width_min, m_peak_width_max, m_pXds, nitems_per_block);
if (success)
{
// Determine peak width left from center (pos)
if (m_pXds[left] > nom)
// Intersection check
bool intersection = false;
for (int i = 0; i < m_peakList.size(); i++)
{
if (left > 0)
if (m_peakList[i].isInRange(peak))
{
left--;
}
else
{
break;
intersection = true;
}
}
else
{
left_found = 1;
}
// Determine peak width right from center (pos)
if (m_pXds[right] > nom)
{
if (right < (nitems_per_block-1))
{
right++;
}
else
{
break;
}
}
else
{
right_found = 1;
}
int pbh_left = pos - left;
int pbh_right = right - pos;
// Take larger peak width
pbh = std::max(pbh_left, pbh_right);
// Ensure peak box is at least pb_min
pbh = std::max(pbh, m_peak_width_min);
if (pbh > m_peak_width_max)
if (!intersection)
{
pbh = 0;
break;
peak.height_rel = m_pXds[peak.pos];
peak.height_abs = m_pXs[peak.pos];
m_peakList.push_back(peak);
}
}
if (pbh == 0)
{
continue;
}
Peak peak(m_peak_id, pos, pbh, m_pXds[pos], m_pXs[pos]);
// Intersection check
bool intersection = false;
for (int i = 0; i < m_peakList.size(); i++)
{
if (m_peakList[i].isInRange(peak))
{
intersection = true;
}
}
if (!intersection)
{
m_peakList.push_back(peak);
m_peak_id++;
}
}
// -----------------------------------------------------------------
gr-jay/lib/peak_detect_impl.h
+83 -23
View File
@@ -35,10 +35,15 @@ namespace jay {
{
}
Peak(uint64_t _id, int _pos, int _half_width, float _height_rel, float _height_abs)
Peak(uint64_t _id, int _pos)
: Peak(_id, _pos, 0, 0.0, 0.0)
{
}
Peak(uint64_t _id, int _pos, int _pbh, float _height_rel, float _height_abs)
: id(_id)
, pos(_pos)
, half_width(_half_width)
, pbh(_pbh)
, height_rel(_height_rel)
, height_abs(_height_abs)
, isValid(true)
@@ -47,7 +52,7 @@ namespace jay {
}
uint64_t id;
int pos;
int half_width;
int pbh;
float height_rel;
float height_abs;
bool isValid;
@@ -57,12 +62,74 @@ namespace jay {
return (other.pos >= left()) and (other.pos <= right());
}
bool makeBox(int pbh_min, int pbh_max, float const *pData, int length)
{
pbh = 0;
int left = pos;
int right = pos;
float nom = 10;
int left_found = 0;
int right_found = 0;
while(!(left_found & right_found))
{
// Determine peak width left from center (pos)
if (pData[left] > nom)
{
if (left > 0)
{
left--;
}
else
{
break;
}
}
else
{
left_found = 1;
}
// Determine peak width right from center (pos)
if (pData[right] > nom)
{
if (right < (length-1))
{
right++;
}
else
{
break;
}
}
else
{
right_found = 1;
}
int pbh_left = pos - left;
int pbh_right = right - pos;
// Take larger peak width
pbh = std::max(pbh_left, pbh_right);
// Ensure peak box is at least pb_min
pbh = std::max(pbh, pbh_min);
if (pbh > pbh_max)
{
pbh = 0;
break;
}
}
return pbh > 0;
}
const Peak& update(const Peak &other)
{
float beta = 0.1f;
float alpha = (1.f-beta);
pos = alpha*pos + beta*other.pos;
half_width = alpha*half_width + beta*other.half_width;
pbh = alpha*pbh + beta*other.pbh;
height_rel = std::max(height_rel, other.height_rel);
height_abs = std::max(height_abs, other.height_abs);
isValid = true;
@@ -71,12 +138,12 @@ namespace jay {
int left()
{
return pos - half_width;
return pos - pbh;
}
int right()
{
return pos + half_width;
return pos + pbh;
}
};
@@ -90,12 +157,12 @@ namespace jay {
return result;
}
bool addToList(std::vector<int>&list, int pos)
bool addToListByPos(std::vector<Peak>&list, Peak peak)
{
bool found = false;
for (std::vector<int>::iterator it = list.begin(); it != list.end(); it++)
for (std::vector<Peak>::iterator it = list.begin(); it != list.end(); it++)
{
if (*it == pos)
if (it->pos == peak.pos)
{
found = true;
break;
@@ -104,7 +171,7 @@ namespace jay {
if (!found)
{
list.push_back(pos);
list.push_back(peak);
}
return !found;
}
@@ -140,26 +207,19 @@ namespace jay {
float mean(float *pSrc, int length);
std::vector<int> findPeakPos(float* pSrc, int length, float thresh);
template <typename T>
inline bool cmp(const T a, const T b)
void sort(std::vector<Peak>&peaks)
{
return (a < b);
}
template <typename T>
void sort(T const * const pData, std::vector<int>&pos)
{
int n = pos.size();
int n = peaks.size();
do
{
int newn = 1;
for (int i=0; i < (n-1); i++)
{
if (cmp(pData[pos[i]], pData[pos[i+1]]))
if (peaks[i].height_abs < peaks[i+1].height_abs)
{
int temp = pos[i+1];
pos[i+1] = pos[i];
pos[i] = temp;
Peak temp = peaks[i+1];
peaks[i+1] = peaks[i];
peaks[i] = temp;
newn = i+1;
} // ende if
} // ende for