aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric <ewild@sysmocom.de>2022-07-19 21:15:24 +0200
committerEric <ewild@sysmocom.de>2022-11-30 16:40:42 +0100
commit8984d7f2ca3cca6374f66df2af00693e5e4e168d (patch)
tree8df8f31646f29fea67bea0e70627ddf9e5a704ea
parentaa7a40ee846ccd6f3a940db64f02ed71ab5e6c3a (diff)
rename noisevector class -> avgvector
The vectors feature is averaging, and not adding noise. Change-Id: I05def8ab9ea7a2cece8db09c36c303e13ef40927
-rw-r--r--Transceiver52M/Transceiver.h2
-rw-r--r--Transceiver52M/radioVector.cpp9
-rw-r--r--Transceiver52M/radioVector.h4
3 files changed, 9 insertions, 6 deletions
diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h
index 45a4159..0389e60 100644
--- a/Transceiver52M/Transceiver.h
+++ b/Transceiver52M/Transceiver.h
@@ -80,7 +80,7 @@ struct TransceiverState {
/* Received noise energy levels */
float mNoiseLev;
- noiseVector mNoises;
+ avgVector mNoises;
/* Shadowed downlink attenuation */
int mPower;
diff --git a/Transceiver52M/radioVector.cpp b/Transceiver52M/radioVector.cpp
index 68e42c5..acefc97 100644
--- a/Transceiver52M/radioVector.cpp
+++ b/Transceiver52M/radioVector.cpp
@@ -76,22 +76,25 @@ 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;
diff --git a/Transceiver52M/radioVector.h b/Transceiver52M/radioVector.h
index 84e3987..90db626 100644
--- a/Transceiver52M/radioVector.h
+++ b/Transceiver52M/radioVector.h
@@ -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;