epilectrik
/
pyNgSpice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

function cph()

h_vogt 15 years ago
parent
b8cc44efad
commit
2e2bf04d6a
5 changed files with 150 additions and 107 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ChangeLog
  2. 43
      src/include/fteext.h
  3. 12
      src/maths/cmaths/Makefile.am
  4. 197
      src/maths/cmaths/cmath1.c
  5. 1
      src/maths/cmaths/cmath1.h

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-08-06 Holger Vogt
* fteext.h, cmaths/makefile.am, cmath1.c, cmath1.h:
function cph(vec) delivers phase from a vector without jumps at +-PI
2011-08-06 Robert Larice
* src/frontend/com_sysinfo.c ,
* src/frontend/resource.c :

43
src/include/fteext.h
View File

@ -54,6 +54,7 @@ extern bool clip_to_circle(int *x1, int *y1, int *x2, int *y2, int cx, int cy, i
extern bool cx_degrees;
extern void *cx_mag(void *, short int , int , int *, short int *);
extern void *cx_ph(void *, short int , int , int *, short int *);
extern void *cx_cph(void *, short int , int , int *, short int *);
extern void *cx_j(void *, short int , int , int *, short int *);
extern void *cx_real(void *, short int , int , int *, short int *);
extern void *cx_imag(void *, short int , int , int *, short int *);
@ -67,31 +68,31 @@ extern void *cx_sin(void *, short int , int , int *, short int *);
extern void *cx_sinh(void *, short int , int , int *, short int *);
extern void *cx_cos(void *, short int , int , int *, short int *);
extern void *cx_cosh(void *, short int , int , int *, short int *);
extern void * cx_tan(void *, short int , int , int *, short int *);
extern void * cx_tanh(void *, short int , int , int *, short int *);
extern void * cx_atan(void *, short int , int , int *, short int *);
extern void *cx_tan(void *, short int , int , int *, short int *);
extern void *cx_tanh(void *, short int , int , int *, short int *);
extern void *cx_atan(void *, short int , int , int *, short int *);
/* cmath2.c */
extern void * cx_norm(void *, short int , int , int *, short int *);
extern void * cx_uminus(void *, short int , int , int *, short int *);
extern void * cx_rnd(void *, short int , int , int *, short int *);
extern void * cx_sunif(void *, short int , int , int *, short int *);
extern void * cx_sgauss(void *, short int , int , int *, short int *);
extern void * cx_poisson(void *, short int , int , int *, short int *);
extern void * cx_exponential(void *, short int , int , int *, short int *);
extern void * cx_mean(void *, short int , int , int *, short int *);
extern void * cx_length(void *, short int , int , int *, short int *);
extern void * cx_vector(void *, short int , int , int *, short int *);
extern void * cx_unitvec(void *, short int , int , int *, short int *);
extern void * cx_plus(void *, void *, short int , short int , int );
extern void * cx_minus(void *, void *, short int , short int , int );
extern void * cx_times(void *, void *, short int , short int , int );
extern void * cx_mod(void *, void *, short int , short int , int );
extern void * cx_max(void *, short int , int , int *, short int *);
extern void * cx_min(void *, short int , int , int *, short int *);
extern void * cx_d(void *, short int , int , int *, short int *);
extern void *cx_avg(void *, short int , int , int *, short int *);
extern void *cx_uminus(void *, short int , int , int *, short int *);
extern void *cx_rnd(void *, short int , int , int *, short int *);
extern void *cx_sunif(void *, short int , int , int *, short int *);
extern void *cx_sgauss(void *, short int , int , int *, short int *);
extern void *cx_poisson(void *, short int , int , int *, short int *);
extern void *cx_exponential(void *, short int , int , int *, short int *);
extern void *cx_mean(void *, short int , int , int *, short int *);
extern void *cx_length(void *, short int , int , int *, short int *);
extern void *cx_vector(void *, short int , int , int *, short int *);
extern void *cx_unitvec(void *, short int , int , int *, short int *);
extern void *cx_plus(void *, void *, short int , short int , int );
extern void *cx_minus(void *, void *, short int , short int , int );
extern void *cx_times(void *, void *, short int , short int , int );
extern void *cx_mod(void *, void *, short int , short int , int );
extern void *cx_max(void *, short int , int , int *, short int *);
extern void *cx_min(void *, short int , int , int *, short int *);
extern void *cx_d(void *, short int , int , int *, short int *);
extern void *cx_avg(void *, short int , int , int *, short int *);
/* cmath3.c */

12
src/maths/cmaths/Makefile.am
View File

@ -17,7 +17,7 @@ libcmaths_la_SOURCES = \
if !WINDOWS
if !TCLWIN
noinst_PROGRAMS = test_cx_mag test_cx_j test_cx_ph
noinst_PROGRAMS = test_cx_mag test_cx_j test_cx_ph test_cx_cph
test_cx_ph_SOURCES = \
test_cx_ph.c
@ -27,6 +27,14 @@ test_cx_ph_LDADD = \
../../misc/libmisc.la \
$(TCL_LIB_SPEC)
test_cx_cph_SOURCES = \
test_cx_ph.c
test_cx_cph_LDADD = \
libcmaths.la \
../../misc/libmisc.la \
$(TCL_LIB_SPEC)
test_cx_mag_SOURCES = \
test_cx_mag.c
@ -43,7 +51,7 @@ test_cx_j_LDADD = \
../../misc/libmisc.la \
$(TCL_LIB_SPEC)
TESTS = test_cx_mag test_cx_j test_cx_ph
TESTS = test_cx_mag test_cx_j test_cx_ph test_cx_cph
endif !TCLWIN
endif !WINDOWS

197
src/maths/cmaths/cmath1.c
View File

@ -70,6 +70,35 @@ cx_ph(void *data, short int type, int length, int *newlength, short int *newtype
return ((void *) d);
}
/* SJdV Modified from above to find closest from +2pi,0, -2pi */
void *
cx_cph(void *data, short int type, int length, int *newlength, short int *newtype)
{
double *d = alloc_d(length);
ngcomplex_t *cc = (ngcomplex_t *) data;
int i, j, jmin;
int period = 0;
double ph[3], phd[3];
*newlength = length;
*newtype = VF_REAL;
if (type == VF_COMPLEX) {
d[0] = radtodeg(cph(&cc[0]));
for (i = 1; i < length; i++) {
jmin = 0;
for (j = 0; j < 3; j++) {
ph[j] = radtodeg((period+j-1) * 2*M_PI + cph(&cc[i]));
phd[j] = abs(ph[j] - d[i-1]);
jmin = (phd[j] < phd[jmin]) ? j : jmin;
}
d[i] = ph[jmin];
period += jmin-1;
}
}
/* Otherwise it is 0, but tmalloc zeros the stuff already. */
return ((void *) d);
}
/* If this is pure imaginary we might get real, but never mind... */
void *
@ -169,22 +198,22 @@ cx_db(void *data, short int type, int length, int *newlength, short int *newtype
for (i = 0; i < length; i++) {
tt = cmag(&cc[i]);
rcheck(tt > 0, "db");
/*
if (tt == 0.0)
d[i] = 20.0 * - log(HUGE);
else
*/
d[i] = 20.0 * log10(tt);
/*
if (tt == 0.0)
d[i] = 20.0 * - log(HUGE);
else
*/
d[i] = 20.0 * log10(tt);
}
else
for (i = 0; i < length; i++) {
rcheck(dd[i] > 0, "db");
/*
if (dd[i] == 0.0)
d[i] = 20.0 * - log(HUGE);
else
*/
d[i] = 20.0 * log10(dd[i]);
/*
if (dd[i] == 0.0)
d[i] = 20.0 * - log(HUGE);
else
*/
d[i] = 20.0 * log10(dd[i]);
}
return ((void *) d);
}
@ -194,14 +223,14 @@ cx_log(void *data, short int type, int length, int *newlength, short int *newtyp
{
*newlength = length;
if (type == VF_COMPLEX) {
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
c = alloc_c(length);
*newtype = VF_COMPLEX;
for (i = 0; i < length; i++) {
double td;
double td;
td = cmag(&cc[i]);
/* Perhaps we should trap when td = 0.0, but Ken wants
@ -214,14 +243,14 @@ cx_log(void *data, short int type, int length, int *newlength, short int *newtyp
} else {
realpart(&c[i]) = log10(td);
imagpart(&c[i]) = atan2(imagpart(&cc[i]),
realpart(&cc[i]));
realpart(&cc[i]));
}
}
return ((void *) c);
} else {
double *d;
double *dd = (double *) data;
int i;
double *d;
double *dd = (double *) data;
int i;
d = alloc_d(length);
*newtype = VF_REAL;
@ -229,7 +258,7 @@ cx_log(void *data, short int type, int length, int *newlength, short int *newtyp
rcheck(dd[i] >= 0, "log");
if (dd[i] == 0.0)
d[i] = - log10(HUGE);
else
else
d[i] = log10(dd[i]);
}
return ((void *) d);
@ -241,14 +270,14 @@ cx_ln(void *data, short int type, int length, int *newlength, short int *newtype
{
*newlength = length;
if (type == VF_COMPLEX) {
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
c = alloc_c(length);
*newtype = VF_COMPLEX;
for (i = 0; i < length; i++) {
double td;
double td;
td = cmag(&cc[i]);
rcheck(td >= 0, "ln");
@ -258,14 +287,14 @@ cx_ln(void *data, short int type, int length, int *newlength, short int *newtype
} else {
realpart(&c[i]) = log(td);
imagpart(&c[i]) = atan2(imagpart(&cc[i]),
realpart(&cc[i]));
realpart(&cc[i]));
}
}
return ((void *) c);
} else {
double *d;
double *dd = (double *) data;
int i;
double *d;
double *dd = (double *) data;
int i;
d = alloc_d(length);
*newtype = VF_REAL;
@ -285,14 +314,14 @@ cx_exp(void *data, short int type, int length, int *newlength, short int *newtyp
{
*newlength = length;
if (type == VF_COMPLEX) {
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
c = alloc_c(length);
*newtype = VF_COMPLEX;
for (i = 0; i < length; i++) {
double td;
double td;
td = exp(realpart(&cc[i]));
realpart(&c[i]) = td * cos(imagpart(&cc[i]));
@ -300,9 +329,9 @@ cx_exp(void *data, short int type, int length, int *newlength, short int *newtyp
}
return ((void *) c);
} else {
double *d;
double *dd = (double *) data;
int i;
double *d;
double *dd = (double *) data;
int i;
d = alloc_d(length);
*newtype = VF_REAL;
@ -341,27 +370,27 @@ cx_sqrt(void *data, short int type, int length, int *newlength, short int *newty
imagpart(&c[i]) = 0.0;
} else if (imagpart(&cc[i]) > 0.0) {
realpart(&c[i]) = sqrt (0.5 *
imagpart(&cc[i]));
imagpart(&cc[i]));
imagpart(&c[i]) = realpart(&c[i]);
} else {
imagpart(&c[i]) = sqrt( -0.5 *
imagpart(&cc[i]));
} else {
imagpart(&c[i]) = sqrt( -0.5 *
imagpart(&cc[i]));
realpart(&c[i]) = - imagpart(&c[i]);
}
} else if (realpart(&cc[i]) > 0.0) {
if (imagpart(&cc[i]) == 0.0) {
realpart(&c[i]) =
realpart(&c[i]) =
sqrt(realpart(&cc[i]));
imagpart(&c[i]) = 0.0;
} else if (imagpart(&cc[i]) < 0.0) {
realpart(&c[i]) = -sqrt(0.5 *
(cmag(&cc[i]) + realpart(&cc[i])));
realpart(&c[i]) = -sqrt(0.5 *
(cmag(&cc[i]) + realpart(&cc[i])));
} else {
realpart(&c[i]) = sqrt(0.5 *
(cmag(&cc[i]) + realpart(&cc[i])));
realpart(&c[i]) = sqrt(0.5 *
(cmag(&cc[i]) + realpart(&cc[i])));
}
imagpart(&c[i]) = imagpart(&cc[i]) / (2.0 *
realpart(&c[i]));
imagpart(&c[i]) = imagpart(&cc[i]) / (2.0 *
realpart(&c[i]));
} else { /* realpart(&cc[i]) < 0.0) */
if (imagpart(&cc[i]) == 0.0) {
realpart(&c[i]) = 0.0;
@ -370,14 +399,14 @@ cx_sqrt(void *data, short int type, int length, int *newlength, short int *newty
} else {
if (imagpart(&cc[i]) < 0.0)
imagpart(&c[i]) = - sqrt(0.5 *
(cmag(&cc[i]) -
realpart(&cc[i])));
(cmag(&cc[i]) -
realpart(&cc[i])));
else
imagpart(&c[i]) = sqrt(0.5 *
(cmag(&cc[i]) -
realpart(&cc[i])));
realpart(&c[i]) = imagpart(&cc[i]) /
(2.0 * imagpart(&c[i]));
(cmag(&cc[i]) -
realpart(&cc[i])));
realpart(&c[i]) = imagpart(&cc[i]) /
(2.0 * imagpart(&c[i]));
}
}
}
@ -401,23 +430,23 @@ cx_sin(void *data, short int type, int length, int *newlength, short int *newtyp
{
*newlength = length;
if (type == VF_COMPLEX) {
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
c = alloc_c(length);
*newtype = VF_COMPLEX;
for (i = 0; i < length; i++) {
realpart(&c[i]) = sin(degtorad(realpart(&cc[i]))) *
cosh(degtorad(imagpart(&cc[i])));
cosh(degtorad(imagpart(&cc[i])));
imagpart(&c[i]) = cos(degtorad(realpart(&cc[i]))) *
sinh(degtorad(imagpart(&cc[i])));
sinh(degtorad(imagpart(&cc[i])));
}
return ((void *) c);
} else {
double *d;
double *dd = (double *) data;
int i;
double *d;
double *dd = (double *) data;
int i;
d = alloc_d(length);
*newtype = VF_REAL;
@ -444,7 +473,7 @@ cx_sinh(void *data, short int type, int length, int *newlength, short int *newty
u = degtorad(realpart(&cc[i]));
v = degtorad(imagpart(&cc[i]));
realpart(&c[i]) = sinh(u)*cos(v);
imagpart(&c[i]) = cosh(u)*sin(v);
imagpart(&c[i]) = cosh(u)*sin(v);
}
return ((void *) c);
} else {
@ -466,23 +495,23 @@ cx_cos(void *data, short int type, int length, int *newlength, short int *newtyp
{
*newlength = length;
if (type == VF_COMPLEX) {
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
ngcomplex_t *c;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
c = alloc_c(length);
*newtype = VF_COMPLEX;
for (i = 0; i < length; i++) {
realpart(&c[i]) = cos(degtorad(realpart(&cc[i]))) *
cosh(degtorad(imagpart(&cc[i])));
cosh(degtorad(imagpart(&cc[i])));
imagpart(&c[i]) = - sin(degtorad(realpart(&cc[i]))) *
sinh(degtorad(imagpart(&cc[i])));
sinh(degtorad(imagpart(&cc[i])));
}
return ((void *) c);
} else {
double *d;
double *dd = (double *) data;
int i;
double *d;
double *dd = (double *) data;
int i;
d = alloc_d(length);
*newtype = VF_REAL;
@ -511,13 +540,13 @@ cx_cosh(void *data, short int type, int length, int *newlength, short int *newty
u = degtorad(realpart(&cc[i]));
v = degtorad(imagpart(&cc[i]));
realpart(&c[i]) = cosh(u)*cos(v);
imagpart(&c[i]) = sinh(u)*sin(v);
imagpart(&c[i]) = sinh(u)*sin(v);
}
return ((void *) c);
} else {
double *d;
double *dd = (double *) data;
int i;
double *d;
double *dd = (double *) data;
int i;
d = alloc_d(length);
*newtype = VF_REAL;
@ -535,8 +564,8 @@ d_tan(double *dd, int length)
d = alloc_d(length);
for (i = 0; i < length; i++) {
rcheck(cos(degtorad(dd[i])) != 0, "tan");
d[i] = sin(degtorad(dd[i])) / cos(degtorad(dd[i]));
rcheck(cos(degtorad(dd[i])) != 0, "tan");
d[i] = sin(degtorad(dd[i])) / cos(degtorad(dd[i]));
}
return d;
}
@ -566,9 +595,9 @@ c_tan(ngcomplex_t *cc, int length)
double u, v;
rcheck(cos(degtorad(realpart(&cc[i]))) *
cosh(degtorad(imagpart(&cc[i]))), "tan");
cosh(degtorad(imagpart(&cc[i]))), "tan");
rcheck(sin(degtorad(realpart(&cc[i]))) *
sinh(degtorad(imagpart(&cc[i]))), "tan");
sinh(degtorad(imagpart(&cc[i]))), "tan");
u = degtorad(realpart(&cc[i]));
v = degtorad(imagpart(&cc[i]));
/* The Lattice C compiler won't take multi-line macros, and
@ -620,7 +649,7 @@ cx_tan(void *data, short int type, int length, int *newlength, short int *newtyp
*newlength = length;
if (type == VF_REAL) {
*newtype = VF_REAL;
return (void *) d_tan((double *) data, length);
return (void *) d_tan((double *) data, length);
} else {
*newtype = VF_COMPLEX;
return (void *) c_tan((ngcomplex_t *) data, length);
@ -633,7 +662,7 @@ cx_tanh(void *data, short int type, int length, int *newlength, short int *newty
*newlength = length;
if (type == VF_REAL) {
*newtype = VF_REAL;
return (void *) d_tanh((double *) data, length);
return (void *) d_tanh((double *) data, length);
} else {
*newtype = VF_COMPLEX;
return (void *) c_tanh((ngcomplex_t *) data, length);
@ -649,14 +678,14 @@ cx_atan(void *data, short int type, int length, int *newlength, short int *newty
*newtype = VF_REAL;
*newlength = length;
if (type == VF_COMPLEX) {
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
ngcomplex_t *cc = (ngcomplex_t *) data;
int i;
for (i = 0; i < length; i++)
d[i] = radtodeg(atan(realpart(&cc[i])));
} else {
double *dd = (double *) data;
int i;
double *dd = (double *) data;
int i;
for (i = 0; i < length; i++)
d[i] = radtodeg(atan(dd[i]));

1
src/maths/cmaths/cmath1.h
View File

@ -9,6 +9,7 @@
void * cx_mag(void *data, short int type, int length, int *newlength, short int *newtype);
void * cx_ph(void *data, short int type, int length, int *newlength, short int *newtype);
void * cx_cph(void *data, short int type, int length, int *newlength, short int *newtype);
void * cx_j(void *data, short int type, int length, int *newlength, short int *newtype);
void * cx_real(void *data, short int type, int length, int *newlength, short int *newtype);
void * cx_imag(void *data, short int type, int length, int *newlength, short int *newtype);

Write Preview
Loading…
Cancel
Save