SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter: use static const, rename constants

Browse Source 
* avoid clash with math.h
This commit is contained in:
Guilherme Brondani Torri 2015-01-20 10:56:54 +01:00
parent 08521cb1ac
commit 9ac577f98c
8 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qucs-filter/cline_filter.cpp
View File

@ -57,9 +57,9 @@ QString* CoupledLine_Filter::createSchematic(tFilter *Filter, tSubstrate *Substr
// characteristic admittance of J-inverter (normalized to Y0)
if((i == 0) || (i == Filter->Order))
Value = sqrt(0.5 * M_PI * Bandwidth / Value);
Value = sqrt(0.5 * pi * Bandwidth / Value);
else
Value = 0.5 * M_PI * Bandwidth / sqrt(Value);
Value = 0.5 * pi * Bandwidth / sqrt(Value);
Z0e = (1.0 + Value + Value*Value) * Filter->Impedance;
Z0o = (1.0 - Value + Value*Value) * Filter->Impedance;

6
qucs-filter/eqn_filter.cpp
View File

@ -68,7 +68,7 @@ QString* Equation_Filter::createSchematic(tFilter *Filter)
eqn = QString::number(2.0 / pow(10.0, Filter->Ripple/20.0));
}
Omega *= 2.0*M_PI; // angular frequency
Omega *= 2.0*pi; // angular frequency
QString varS = "*S";
switch(Filter->Class) {
@ -78,11 +78,11 @@ QString* Equation_Filter::createSchematic(tFilter *Filter)
break;
case CLASS_BANDPASS: // transform to bandpass
varS = QString("*(S+%1/S)").arg(Omega*Omega);
Omega = 0.5 / M_PI / fabs(Filter->Frequency2 - Filter->Frequency);
Omega = 0.5 / pi / fabs(Filter->Frequency2 - Filter->Frequency);
break;
case CLASS_BANDSTOP: // transform to bandstop
varS = QString("/(S+%1/S)").arg(Omega*Omega);
Omega = 2.0 * M_PI * fabs(Filter->Frequency2 - Filter->Frequency);
Omega = 2.0 * pi * fabs(Filter->Frequency2 - Filter->Frequency);
break;
}

12
qucs-filter/filter.cpp
View File

@ -227,7 +227,7 @@ double Filter::BesselValue(int No, int Order)
// Calculate normalized component value for Butterworth filter
double Filter::ButterworthValue(int No, int Order)
{
return 2.0 * sin(double(2*No + 1) / double(2*Order) * M_PI);
return 2.0 * sin(double(2*No + 1) / double(2*Order) * pi);
}
@ -242,12 +242,12 @@ double Filter::ChebyshevValue(int No, int Order, double Ripple)
Ripple = sqrt(pow(10.0, Ripple / 10.0) - 1.0);
Ripple = sinh(asinh(1.0 / Ripple) / double(Order));
a = sin(0.5 / double(Order) * M_PI);
a = sin(0.5 / double(Order) * pi);
gk = a / Ripple;
for(i=1; i<=No; i++) { // coefficients are defined recursivly
ak = a;
a = sin(double(2 * i + 1) / double(2 * Order) * M_PI);
b = sin(double(i) * M_PI / double(Order));
a = sin(double(2 * i + 1) / double(2 * Order) * pi);
b = sin(double(i) * pi / double(Order));
gk *= Ripple * Ripple + b * b;
gk = ak * a / gk;
}
@ -323,7 +323,7 @@ double Filter::quadraticButterworthValues(int No, int Order, double &b)
a = double(No);
else
a = double(2*No-1) / 2.0;
a = 2.0 * cos(a * M_PI / double(Order));
a = 2.0 * cos(a * pi / double(Order));
b = 1.0;
return a;
}
@ -345,7 +345,7 @@ double Filter::quadraticChebyshevValues(int No, int Order, double Ripple, double
a = double(No);
else
a = double(2*No-1) / 2.0;
a = cos(a * M_PI / double(Order));
a = cos(a * pi / double(Order));
b = 1.0 / (cosh(c) * cosh(c) - a*a);
a *= 2.0 * b * sinh(c);
return a;

14
qucs-filter/filter.h
View File

@ -26,20 +26,16 @@
#include <cmath>
// guard in case cmath also includes math.h
#ifndef M_PI
const double M_PI = 3.1415926535897932384626433832795029; /* pi */
const double M_1_PI = 0.3183098861837906715377675267450287; /* 1/pi */
const double M_LN2 = 0.6931471805599453094172321214581766;
#endif
static const double pi = 3.1415926535897932384626433832795029; /* pi */
static const double one_over_pi = 0.3183098861837906715377675267450287; /* 1/pi */
static const double ln2 = 0.6931471805599453094172321214581766; /* log_e(2) */
const double LIGHTSPEED = 299792458.0;
const double Z_FIELD = 376.73031346958504364963;
static const double LIGHTSPEED = 299792458.0;
static const double Z_FIELD = 376.73031346958504364963;
#define coth(x) (1.0 + 2.0 / (exp(2.0*(x)) - 1.0))
#define sech(x) (2.0 / (exp(x) + exp(-(x))))
struct tFilter {
int Type;
int Class;

4
qucs-filter/lc_filter.cpp
View File

@ -54,7 +54,7 @@ QString* LC_Filter::createSchematic(tFilter *Filter, bool piType)
}
Bandwidth = fabs(Filter->Frequency2 - Filter->Frequency) / Omega;
Omega *= 2.0*M_PI; // angular frequency
Omega *= 2.0*pi; // angular frequency
// create the Qucs schematic
QString *s = new QString("<Qucs Schematic " PACKAGE_VERSION ">\n");
@ -107,7 +107,7 @@ QString* LC_Filter::createSchematic(tFilter *Filter, bool piType)
case CLASS_BANDPASS:
Value /= Bandwidth; // transform to bandpass
Value2 = 0.25 / Filter->Frequency / Filter->Frequency2 / M_PI / M_PI / Value;
Value2 = 0.25 / Filter->Frequency / Filter->Frequency2 / pi / pi / Value;
if(i & 1) {
*s += QString("<L L1 1 %1 %2 -26 -44 0 0 \"%3H\" 1>\n").arg(x+40).arg(yl).arg(num2str(Value));
*s += QString("<C C1 1 %1 %2 -26 10 0 0 \"%3F\" 1>\n").arg(x-20).arg(yl).arg(num2str(Value2));

8
qucs-filter/line_filter.cpp
View File

@ -38,7 +38,7 @@ QString* Line_Filter::createSchematic(tFilter *Filter, tSubstrate *Substrate, bo
getMicrostrip(Filter->Impedance, Omega, Substrate, width, er_eff);
Wh = width / Substrate->height;
Omega *= 2.0*M_PI; // angular frequency
Omega *= 2.0*pi; // angular frequency
// create the Qucs schematic
QString *s = new QString("<Qucs Schematic " PACKAGE_VERSION ">\n");
@ -64,9 +64,9 @@ QString* Line_Filter::createSchematic(tFilter *Filter, tSubstrate *Substrate, bo
// characteristic admittance of J-inverter (normalized to Y0)
if((i == 0) || (i == Filter->Order))
Value = sqrt(0.5 * M_PI * Bandwidth / Value);
Value = sqrt(0.5 * pi * Bandwidth / Value);
else
Value = 0.5 * M_PI * Bandwidth / sqrt(Value);
Value = 0.5 * pi * Bandwidth / sqrt(Value);
// susceptance
Value /= (1.0 - Value*Value);
@ -90,7 +90,7 @@ QString* Line_Filter::createSchematic(tFilter *Filter, tSubstrate *Substrate, bo
if(i > 0) {
len = LIGHTSPEED / sqrt(er_eff) / Omega
* (M_PI - 0.5*(atan(2.0*Value) + atan(2.0*Value2)));
* (pi - 0.5*(atan(2.0*Value) + atan(2.0*Value2)));
len -= dl;
}
Value2 = Value; // remember for next loop

2
qucs-filter/stepz_filter.cpp
View File

@ -29,7 +29,7 @@ QString* StepImpedance_Filter::createSchematic(tFilter *Filter, tSubstrate *Subs
{
int i, x;
double len, width, er_eff_min, er_eff_max, Z0;
double Omega = 2.0 * M_PI * Filter->Frequency;
double Omega = 2.0 * pi * Filter->Frequency;
double Zlow = 20.0;
double Zhigh = 400.0;

26
qucs-filter/tl_filter.cpp
View File

@ -37,7 +37,7 @@ void TL_Filter::calcMicrostrip(tSubstrate *substrate,
double w1 = Wh;
if(t > 1e-100) { // width correction due to metal thickness?
a = coth(sqrt(6.517*Wh));
b = t / M_PI * log(1.0 + 10.873127 / t / a / a);
b = t / pi * log(1.0 + 10.873127 / t / a / a);
w1 += b;
Wh += 0.5 * b * (1.0 + sech(sqrt(er - 1.0)));
}
@ -51,11 +51,11 @@ void TL_Filter::calcMicrostrip(tSubstrate *substrate,
// characteristic impedance
zl = 6.0 + 0.2831853 * exp(-pow(30.666/Wh, 0.7528));
zl = Z_FIELD / 2.0/M_PI * log(zl/Wh + sqrt(1.0 + 4.0/Wh/Wh));
zl = Z_FIELD / 2.0/pi * log(zl/Wh + sqrt(1.0 + 4.0/Wh/Wh));
// characteristic impedance (same again for "w1")
a = 6.0 + 0.2831853 * exp(-pow(30.666/w1, 0.7528));
a = Z_FIELD / 2.0/M_PI * log(a/w1 + sqrt(1.0 + 4.0/w1/w1));
a = Z_FIELD / 2.0/pi * log(a/w1 + sqrt(1.0 + 4.0/w1/w1));
a /= zl;
zl /= sqrt(er_eff);
@ -183,10 +183,10 @@ void TL_Filter::sythesizeCoupledMicrostrip
Wh_o = 8.0 * sqrt(a * ((7.0 + 4.0 / er) / 11.0) + ((1.0 + 1.0 / er) / 0.81)) / a;
// first rough estimation
ce = cosh(0.5 * M_PI * Wh_e);
co = cosh(0.5 * M_PI * Wh_o);
gap = (2.0 / M_PI) * acosh((ce + co - 2.0) / (co - ce)) * substrate->height;
width = acosh((ce * co - 1.0) / (co - ce)) / M_PI - gap / 2.0;
ce = cosh(0.5 * pi * Wh_e);
co = cosh(0.5 * pi * Wh_o);
gap = (2.0 / pi) * acosh((ce + co - 2.0) / (co - ce)) * substrate->height;
width = acosh((ce * co - 1.0) / (co - ce)) / pi - gap / 2.0;
width *= substrate->height;
int iteration = 0; // iteration counter
@ -308,13 +308,13 @@ void TL_Filter::getCoupledMicrostrip
// width correction due to metal thickness
a = 1.0;
if(t > 1e-20) {
if(Wh_e > (h/2.0/M_PI)) {
if(h > (t*4.0*M_PI))
a = t / M_PI * (1.0 + log(2.0*h/t));
if(Wh_e > (h/2.0/pi)) {
if(h > (t*4.0*pi))
a = t / pi * (1.0 + log(2.0*h/t));
}
else {
if(Wh_e > (t*2.0))
a = t / M_PI * (1.0 + log(4.0*M_PI*Wh_e/t));
a = t / pi * (1.0 + log(4.0*pi*Wh_e/t));
}
}
if(g > 20.0*t) {
@ -363,7 +363,7 @@ void TL_Filter::getCoupledMicrostrip
// static zero-thickness characteristic impedance by Hammerstad and Jensen
zl_e = 6.0 + 0.2831853 * exp(-pow(30.666/Wh_e, 0.7528));
zl_e = Z_FIELD/sqrt(er_e) / 2.0/M_PI * log(zl_e/Wh_e + sqrt(1.0 + 4.0/Wh_e/Wh_e));
zl_e = Z_FIELD/sqrt(er_e) / 2.0/pi * log(zl_e/Wh_e + sqrt(1.0 + 4.0/Wh_e/Wh_e));
// static characteristic impedance of even mode
b = 1.0 + 0.7519 * g + 0.189 * pow(g, 2.31); // = Q2
@ -377,7 +377,7 @@ void TL_Filter::getCoupledMicrostrip
// static zero-thickness characteristic impedance by Hammerstad and Jensen
zl_o = 6.0 + 0.2831853 * exp(-pow(30.666/Wh_o, 0.7528));
zl_o = Z_FIELD/sqrt(er_o) / 2.0/M_PI * log(zl_o/Wh_o + sqrt(1.0 + 4.0/Wh_o/Wh_o));
zl_o = Z_FIELD/sqrt(er_o) / 2.0/pi * log(zl_o/Wh_o + sqrt(1.0 + 4.0/Wh_o/Wh_o));
// static characteristic impedance of odd mode
a = exp(-6.5 - 0.95 * log(g) - pow(g / 0.15, 5.0)); // = Q8