* src/frontend/diff.c src/frontend/diff.h
src/frontend/evaluate.c src/frontend/evaluate.h src/frontend/parse.c src/frontend/parse.h: Trimmed down the amount of included files. * src/include/macros.h: Removed complex functionality duplicated from src/include/complex.h src/include/Makefile.am src/include/ftecmath.h: Removed header file and adjusted Makefile.am
This commit is contained in:
arno
parent
b4b54b3aa5
commit
353282b3ef
|
|
@ -7,12 +7,10 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
|
|||
* Do a 'diff' of two plots.
|
||||
*/
|
||||
|
||||
#include "ngspice.h"
|
||||
#include "cpdefs.h"
|
||||
#include "ftedefs.h"
|
||||
#include "dvec.h"
|
||||
#include "ftecmath.h"
|
||||
#include "sim.h"
|
||||
#include <ngspice.h>
|
||||
#include <ftedefs.h>
|
||||
#include <dvec.h>
|
||||
#include <sim.h>
|
||||
|
||||
#include "diff.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
* 1999 E. Rouat
|
||||
************/
|
||||
|
||||
#ifndef DIFF_H_INCLUDED
|
||||
#define DIFF_H_INCLUDED
|
||||
#ifndef _DIFF_H
|
||||
#define _DIFF_H
|
||||
|
||||
#include <wordlist.h>
|
||||
|
||||
|
||||
void com_diff(wordlist *wl);
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -7,14 +7,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
|
|||
* Convert a parse tree to a list of data vectors.
|
||||
*/
|
||||
|
||||
#include "ngspice.h"
|
||||
#include "cpdefs.h"
|
||||
#include "ftedefs.h"
|
||||
#include "dvec.h"
|
||||
#include "fteparse.h"
|
||||
#include "ftecmath.h"
|
||||
#include <setjmp.h>
|
||||
#include <signal.h>
|
||||
|
||||
#include <ngspice.h>
|
||||
#include <ftedefs.h>
|
||||
#include <dvec.h>
|
||||
|
||||
#include "evaluate.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,11 @@
|
|||
* 1999 E. Rouat
|
||||
************/
|
||||
|
||||
#ifndef EVALUATE_H_INCLUDED
|
||||
#define EVALUATE_H_INCLUDED
|
||||
#ifndef _EVALUATE_H
|
||||
#define _EVALUATE_H
|
||||
|
||||
#include <dvec.h>
|
||||
#include <pnode.h>
|
||||
|
||||
struct dvec * ft_evaluate(struct pnode *node);
|
||||
struct dvec * op_plus(struct pnode *arg1, struct pnode *arg2);
|
||||
|
|
|
|||
|
|
@ -8,14 +8,13 @@ Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
|
|||
* This also handles relational and logical expressions.
|
||||
*/
|
||||
|
||||
#include "ngspice.h"
|
||||
#include "cpdefs.h"
|
||||
#include "ftedefs.h"
|
||||
#include "fteparse.h"
|
||||
#include "dvec.h"
|
||||
#include "ftecmath.h"
|
||||
#include <ngspice.h>
|
||||
#include <bool.h>
|
||||
#include <fteparse.h>
|
||||
#include <fteext.h>
|
||||
#include <sim.h>
|
||||
|
||||
#include "parse.h"
|
||||
#include "sim.h"
|
||||
|
||||
|
||||
/* static declarations */
|
||||
|
|
|
|||
|
|
@ -3,8 +3,11 @@
|
|||
* 1999 E. Rouat
|
||||
************/
|
||||
|
||||
#ifndef PARSE_H_INCLUDED
|
||||
#define PARSE_H_INCLUDED
|
||||
#ifndef _PARSE_H
|
||||
#define _PARSE_H
|
||||
|
||||
#include <pnode.h>
|
||||
#include <wordlist.h>
|
||||
|
||||
struct pnode * ft_getpnames(wordlist *wl, bool check);
|
||||
void free_pnode(struct pnode *t);
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ noinst_HEADERS = \
|
|||
dgen.h \
|
||||
distodef.h \
|
||||
dvec.h \
|
||||
ftecmath.h \
|
||||
fteconst.h \
|
||||
ftedata.h \
|
||||
ftedbgra.h \
|
||||
|
|
|
|||
|
|
@ -1,41 +0,0 @@
|
|||
/**********
|
||||
Copyright 1990 Regents of the University of California. All rights reserved.
|
||||
Author: 1985 Wayne A. Christopher, U. C. Berkeley CAD Group
|
||||
**********/
|
||||
|
||||
/*
|
||||
* Macros for complex mathematical functions.
|
||||
*/
|
||||
|
||||
/* Some defines used mainly in cmath.c. */
|
||||
#define alloc_c(len) ((complex *) tmalloc((len) * sizeof (complex)))
|
||||
#define alloc_d(len) ((double *) tmalloc((len) * sizeof (double)))
|
||||
#define FTEcabs(d) (((d) < 0.0) ? - (d) : (d))
|
||||
#define cph(c) (atan2(imagpart(c), (realpart(c))))
|
||||
#define cmag(c) (sqrt(imagpart(c) * imagpart(c) + realpart(c) * realpart(c)))
|
||||
#define radtodeg(c) (cx_degrees ? ((c) / 3.14159265358979323846 * 180) : (c))
|
||||
#define degtorad(c) (cx_degrees ? ((c) * 3.14159265358979323846 / 180) : (c))
|
||||
#define rcheck(cond, name) if (!(cond)) { \
|
||||
fprintf(cp_err, "Error: argument out of range for %s\n", name); \
|
||||
return (NULL); }
|
||||
|
||||
|
||||
#define cdiv(r1, i1, r2, i2, r3, i3) \
|
||||
{ \
|
||||
double r, s; \
|
||||
if (FTEcabs(r2) > FTEcabs(i2)) { \
|
||||
r = (i2) / (r2); \
|
||||
s = (r2) + r * (i2); \
|
||||
(r3) = ((r1) + r * (i1)) / s; \
|
||||
(i3) = ((i1) - r * (r1)) / s; \
|
||||
} else { \
|
||||
r = (r2) / (i2); \
|
||||
s = (i2) + r * (r2); \
|
||||
(r3) = (r * (r1) + (i1)) / s; \
|
||||
(i3) = (r * (i1) - (r1)) / s; \
|
||||
} \
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -105,10 +105,4 @@
|
|||
#define DEBUGMSG(testargs)
|
||||
#endif
|
||||
|
||||
|
||||
#define realpart(cval) ((struct _complex *) (cval))->cx_real
|
||||
#define imagpart(cval) ((struct _complex *) (cval))->cx_imag
|
||||
|
||||
|
||||
|
||||
#endif /* _MACROS_H_ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue