Browse Source

numparam, use `trunc()'

pre-master-46
rlar 10 years ago
parent
commit
15e8fab975
  1. 1
      src/frontend/numparam/general.h
  2. 10
      src/frontend/numparam/mystring.c
  3. 4
      src/frontend/numparam/xpressn.c

1
src/frontend/numparam/general.h

@ -41,6 +41,5 @@ int yes_or_no(void);
int freadstr(FILE *f, SPICE_DSTRINGPTR dstr_p);
double np_round(double d); // sjb to avoid clash with round() in math.h
double np_trunc(double x); // sjb to avoid clash with trunc() in math.h
double absf(double x); /* abs */
long absi(long i);

10
src/frontend/numparam/mystring.c

@ -479,13 +479,3 @@ np_round(double r)
{
return floor(r + 0.5);
}
double
np_trunc(double r)
{
if (r >= 0.0)
return floor(r);
else
return ceil(r);
}

4
src/frontend/numparam/xpressn.c

@ -843,11 +843,11 @@ operate(char op, double x, double y)
x = z;
break;
case '%': /* % */
t = np_trunc(x / y);
t = trunc(x / y);
x = x - y * t;
break;
case '\\': /* / */
x = np_trunc(fabs(x / y));
x = trunc(fabs(x / y));
break;
}

Loading…
Cancel
Save