From f7bbf2c1d8d780294f3e016aff239ca35eb6516e Mon Sep 17 00:00:00 2001
From: Marcus Müller <mmueller@gnuradio.org>
Date: Wed, 7 Aug 2019 21:45:12 +0200
Subject: Tree: clang-format without the include sorting
---
gr-blocks/lib/control_loop.cc | 243 +++++++++++++++++-------------------------
1 file changed, 95 insertions(+), 148 deletions(-)
(limited to 'gr-blocks/lib/control_loop.cc')
diff --git a/gr-blocks/lib/control_loop.cc b/gr-blocks/lib/control_loop.cc
index 30260b5646..c8bca8ef12 100644
--- a/gr-blocks/lib/control_loop.cc
+++ b/gr-blocks/lib/control_loop.cc
@@ -29,186 +29,133 @@
#include <stdexcept>
namespace gr {
- namespace blocks {
-
-#define M_TWOPI (2.0f*GR_M_PI)
-
- control_loop::control_loop(float loop_bw,
- float max_freq, float min_freq)
- : d_phase(0), d_freq(0), d_max_freq(max_freq), d_min_freq(min_freq)
- {
- // Set the damping factor for a critically damped system
- d_damping = sqrtf(2.0f)/2.0f;
-
- // Set the bandwidth, which will then call update_gains()
- set_loop_bandwidth(loop_bw);
- }
-
- control_loop::~control_loop()
- {
- }
-
- void
- control_loop::update_gains()
- {
- float denom = (1.0 + 2.0*d_damping*d_loop_bw + d_loop_bw*d_loop_bw);
- d_alpha = (4*d_damping*d_loop_bw) / denom;
- d_beta = (4*d_loop_bw*d_loop_bw) / denom;
- }
-
- void
- control_loop::advance_loop(float error)
- {
- d_freq = d_freq + d_beta * error;
- d_phase = d_phase + d_freq + d_alpha * error;
- }
-
- void
- control_loop::phase_wrap()
- {
- while(d_phase>M_TWOPI)
+namespace blocks {
+
+#define M_TWOPI (2.0f * GR_M_PI)
+
+control_loop::control_loop(float loop_bw, float max_freq, float min_freq)
+ : d_phase(0), d_freq(0), d_max_freq(max_freq), d_min_freq(min_freq)
+{
+ // Set the damping factor for a critically damped system
+ d_damping = sqrtf(2.0f) / 2.0f;
+
+ // Set the bandwidth, which will then call update_gains()
+ set_loop_bandwidth(loop_bw);
+}
+
+control_loop::~control_loop() {}
+
+void control_loop::update_gains()
+{
+ float denom = (1.0 + 2.0 * d_damping * d_loop_bw + d_loop_bw * d_loop_bw);
+ d_alpha = (4 * d_damping * d_loop_bw) / denom;
+ d_beta = (4 * d_loop_bw * d_loop_bw) / denom;
+}
+
+void control_loop::advance_loop(float error)
+{
+ d_freq = d_freq + d_beta * error;
+ d_phase = d_phase + d_freq + d_alpha * error;
+}
+
+void control_loop::phase_wrap()
+{
+ while (d_phase > M_TWOPI)
d_phase -= M_TWOPI;
- while(d_phase<-M_TWOPI)
+ while (d_phase < -M_TWOPI)
d_phase += M_TWOPI;
- }
+}
- void
- control_loop::frequency_limit()
- {
- if(d_freq > d_max_freq)
+void control_loop::frequency_limit()
+{
+ if (d_freq > d_max_freq)
d_freq = d_max_freq;
- else if(d_freq < d_min_freq)
+ else if (d_freq < d_min_freq)
d_freq = d_min_freq;
- }
-
- /*******************************************************************
- * SET FUNCTIONS
- *******************************************************************/
+}
- void
- control_loop::set_loop_bandwidth(float bw)
- {
- if(bw < 0) {
- throw std::out_of_range ("control_loop: invalid bandwidth. Must be >= 0.");
- }
+/*******************************************************************
+ * SET FUNCTIONS
+ *******************************************************************/
- d_loop_bw = bw;
- update_gains();
+void control_loop::set_loop_bandwidth(float bw)
+{
+ if (bw < 0) {
+ throw std::out_of_range("control_loop: invalid bandwidth. Must be >= 0.");
}
- void
- control_loop::set_damping_factor(float df)
- {
- if(df <= 0) {
- throw std::out_of_range ("control_loop: invalid damping factor. Must be > 0.");
- }
+ d_loop_bw = bw;
+ update_gains();
+}
- d_damping = df;
- update_gains();
+void control_loop::set_damping_factor(float df)
+{
+ if (df <= 0) {
+ throw std::out_of_range("control_loop: invalid damping factor. Must be > 0.");
}
- void
- control_loop::set_alpha(float alpha)
- {
- if(alpha < 0 || alpha > 1.0) {
- throw std::out_of_range ("control_loop: invalid alpha. Must be in [0,1].");
- }
- d_alpha = alpha;
+ d_damping = df;
+ update_gains();
+}
+
+void control_loop::set_alpha(float alpha)
+{
+ if (alpha < 0 || alpha > 1.0) {
+ throw std::out_of_range("control_loop: invalid alpha. Must be in [0,1].");
}
+ d_alpha = alpha;
+}
- void
- control_loop::set_beta(float beta)
- {
- if(beta < 0 || beta > 1.0) {
- throw std::out_of_range ("control_loop: invalid beta. Must be in [0,1].");
- }
- d_beta = beta;
+void control_loop::set_beta(float beta)
+{
+ if (beta < 0 || beta > 1.0) {
+ throw std::out_of_range("control_loop: invalid beta. Must be in [0,1].");
}
+ d_beta = beta;
+}
- void
- control_loop::set_frequency(float freq)
- {
- if(freq > d_max_freq)
+void control_loop::set_frequency(float freq)
+{
+ if (freq > d_max_freq)
d_freq = d_min_freq;
- else if(freq < d_min_freq)
+ else if (freq < d_min_freq)
d_freq = d_max_freq;
- else
+ else
d_freq = freq;
- }
+}
- void
- control_loop::set_phase(float phase)
- {
- d_phase = phase;
- while(d_phase>M_TWOPI)
+void control_loop::set_phase(float phase)
+{
+ d_phase = phase;
+ while (d_phase > M_TWOPI)
d_phase -= M_TWOPI;
- while(d_phase<-M_TWOPI)
+ while (d_phase < -M_TWOPI)
d_phase += M_TWOPI;
- }
+}
- void
- control_loop::set_max_freq(float freq)
- {
- d_max_freq = freq;
- }
+void control_loop::set_max_freq(float freq) { d_max_freq = freq; }
- void
- control_loop::set_min_freq(float freq)
- {
- d_min_freq = freq;
- }
+void control_loop::set_min_freq(float freq) { d_min_freq = freq; }
- /*******************************************************************
- * GET FUNCTIONS
- *******************************************************************/
+/*******************************************************************
+ * GET FUNCTIONS
+ *******************************************************************/
- float
- control_loop::get_loop_bandwidth() const
- {
- return d_loop_bw;
- }
+float control_loop::get_loop_bandwidth() const { return d_loop_bw; }
- float
- control_loop::get_damping_factor() const
- {
- return d_damping;
- }
+float control_loop::get_damping_factor() const { return d_damping; }
- float
- control_loop::get_alpha() const
- {
- return d_alpha;
- }
+float control_loop::get_alpha() const { return d_alpha; }
- float
- control_loop::get_beta() const
- {
- return d_beta;
- }
+float control_loop::get_beta() const { return d_beta; }
- float
- control_loop::get_frequency() const
- {
- return d_freq;
- }
+float control_loop::get_frequency() const { return d_freq; }
- float
- control_loop::get_phase() const
- {
- return d_phase;
- }
+float control_loop::get_phase() const { return d_phase; }
- float
- control_loop::get_max_freq() const
- {
- return d_max_freq;
- }
+float control_loop::get_max_freq() const { return d_max_freq; }
- float
- control_loop::get_min_freq() const
- {
- return d_min_freq;
- }
+float control_loop::get_min_freq() const { return d_min_freq; }
- } /* namespace blocks */
+} /* namespace blocks */
} /* namespace gr */
--
cgit v1.2.3