luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleaned up the code (no more parentheses warning).

This commit is contained in:
pnenzi 2001-12-01 15:14:41 +00:00
parent 6013fda3ba
commit 8fa2d2f361
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/spicelib/analysis/cktpzstr.c
View File

@ -305,8 +305,8 @@ PZeval(int strat, PZtrial **set, PZtrial **new_trial_p)
} }
} else if (CKTpzTrapped == 3) { } else if (CKTpzTrapped == 3) {
if (new_trial->s.real <= set[0]->s.real if (new_trial->s.real <= set[0]->s.real
|| new_trial->s.real == set[1]->s.real || (new_trial->s.real == set[1]->s.real
&& new_trial->s.imag == set[1]->s.imag && new_trial->s.imag == set[1]->s.imag)
|| new_trial->s.real >= set[2]->s.real) { || new_trial->s.real >= set[2]->s.real) {
#ifdef PZDEBUG #ifdef PZDEBUG
DEBUG(1) DEBUG(1)
@ -481,8 +481,8 @@ int CKTpzStrat(PZtrial **set)
/* minima in magnitude */ /* minima in magnitude */
/* Search for exact mag. minima, look for complex pair */ /* Search for exact mag. minima, look for complex pair */
suggestion = SYM; suggestion = SYM;
} else if (a_mag > b_mag || a_mag == b_mag } else if (a_mag > b_mag || (a_mag == b_mag
&& fabs(a) > fabs(b)) && fabs(a) > fabs(b)))
suggestion = SPLIT_LEFT; suggestion = SPLIT_LEFT;
else else
suggestion = SPLIT_RIGHT; suggestion = SPLIT_RIGHT;
@ -557,7 +557,7 @@ CKTpzRunTrial(CKTcircuit *ckt, PZtrial **new_trialp, PZtrial **set)
C_SUBEQ(diff_frac,p->s,new_trial->s); C_SUBEQ(diff_frac,p->s,new_trial->s);
if (diff_frac.real < 0.0 if (diff_frac.real < 0.0
|| diff_frac.real == 0.0 && diff_frac.imag < 0.0) { || (diff_frac.real == 0.0 && diff_frac.imag < 0.0)) {
prev = p; prev = p;
if (p->flags & ISAMINIMA) if (p->flags & ISAMINIMA)
base = p; base = p;
@ -705,8 +705,8 @@ CKTpzRunTrial(CKTcircuit *ckt, PZtrial **new_trialp, PZtrial **set)
} }
} }
if (error == E_SINGULAR || new_trial->f_raw.real == 0.0 if (error == E_SINGULAR || (new_trial->f_raw.real == 0.0
&& new_trial->f_raw.imag == 0.0) { && new_trial->f_raw.imag == 0.0)) {
new_trial->f_raw.real = 0.0; new_trial->f_raw.real = 0.0;
new_trial->f_raw.imag = 0.0; new_trial->f_raw.imag = 0.0;
new_trial->mag_raw = 0; new_trial->mag_raw = 0;
@ -942,8 +942,8 @@ CKTpzUpdateSet(PZtrial **set, PZtrial *new)
this_move = FAR_LEFT; this_move = FAR_LEFT;
} else if (new->s.real < set[1]->s.real) { } else if (new->s.real < set[1]->s.real) {
if (!CKTpzTrapped || new->mag_def < set[1]->mag_def if (!CKTpzTrapped || new->mag_def < set[1]->mag_def
|| new->mag_def == set[1]->mag_def || (new->mag_def == set[1]->mag_def
&& fabs(new->f_def.real) < fabs(set[1]->f_def.real)) { && fabs(new->f_def.real) < fabs(set[1]->f_def.real))) {
/* Really should check signs, not just compare fabs( ) */ /* Really should check signs, not just compare fabs( ) */
set[2] = set[1]; /* XXX = set[2]->prev :: possible opt */ set[2] = set[1]; /* XXX = set[2]->prev :: possible opt */
set[1] = new; set[1] = new;
@ -954,8 +954,8 @@ CKTpzUpdateSet(PZtrial **set, PZtrial *new)
} }
} else if (new->s.real < set[2]->s.real) { } else if (new->s.real < set[2]->s.real) {
if (!CKTpzTrapped || new->mag_def < set[1]->mag_def if (!CKTpzTrapped || new->mag_def < set[1]->mag_def
|| new->mag_def == set[1]->mag_def || (new->mag_def == set[1]->mag_def
&& fabs(new->f_def.real) < fabs(set[1]->f_def.real)) { && fabs(new->f_def.real) < fabs(set[1]->f_def.real))) {
/* Really should check signs, not just compare fabs( ) */ /* Really should check signs, not just compare fabs( ) */
set[0] = set[1]; set[0] = set[1];
set[1] = new; set[1] = new;