rename noisevector class -> avgvector
The vectors feature is averaging, and not adding noise. Change-Id: I05def8ab9ea7a2cece8db09c36c303e13ef40927
This commit is contained in:
parent
d5cafc2cc0
commit
966af04ff1
|
@ -80,7 +80,7 @@ struct TransceiverState {
|
|||
|
||||
/* Received noise energy levels */
|
||||
float mNoiseLev;
|
||||
noiseVector mNoises;
|
||||
avgVector mNoises;
|
||||
|
||||
/* Shadowed downlink attenuation */
|
||||
int mPower;
|
||||
|
|
|
@ -76,25 +76,30 @@ bool radioVector::setVector(signalVector *vector, size_t chan)
|
|||
return true;
|
||||
}
|
||||
|
||||
noiseVector::noiseVector(size_t size)
|
||||
avgVector::avgVector(size_t size)
|
||||
: std::vector<float>(size), itr(0)
|
||||
{
|
||||
}
|
||||
|
||||
float noiseVector::avg() const
|
||||
float avgVector::avg() const
|
||||
{
|
||||
float val = 0.0;
|
||||
|
||||
if (!size())
|
||||
return 0.0f;
|
||||
|
||||
for (size_t i = 0; i < size(); i++)
|
||||
val += (*this)[i];
|
||||
|
||||
return val / (float) size();
|
||||
}
|
||||
|
||||
bool noiseVector::insert(float val)
|
||||
bool avgVector::insert(float val)
|
||||
{
|
||||
if (!size())
|
||||
return false;
|
||||
if (size() < max) {
|
||||
push_back(val);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (itr >= this->size())
|
||||
itr = 0;
|
||||
|
@ -104,6 +109,16 @@ bool noiseVector::insert(float val)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool avgVector::full() const
|
||||
{
|
||||
return size() >= max;
|
||||
}
|
||||
|
||||
void avgVector::reset()
|
||||
{
|
||||
resize(0);
|
||||
}
|
||||
|
||||
GSM::Time VectorQueue::nextTime() const
|
||||
{
|
||||
GSM::Time retVal;
|
||||
|
|
|
@ -48,9 +48,9 @@ private:
|
|||
GSM::Time mTime;
|
||||
};
|
||||
|
||||
class noiseVector : std::vector<float> {
|
||||
class avgVector : std::vector<float> {
|
||||
public:
|
||||
noiseVector(size_t size = 0);
|
||||
avgVector(size_t size = 0);
|
||||
bool insert(float val);
|
||||
float avg() const;
|
||||
|
||||
|
|
Loading…
Reference in New Issue