From fe8d08d0a9d05dd5fcb84db1e1a5cd6595ade092 Mon Sep 17 00:00:00 2001 From: arno Date: Mon, 3 Jul 2000 15:32:29 +0000 Subject: [PATCH] * ChangeLog: Summarize recents changes. * src/devices/Makefile.am: Updates to EXTRA_DIST. * src/misc/misc_time.c, src/misc/printnum.c, src/misc/tilde.c: Code formatting updates. * tests/fourbitadder.out: Updates. --- ChangeLog | 40 +++++++++++ src/misc/misc_time.c | 1 + src/misc/printnum.c | 2 +- src/misc/tilde.c | 1 + src/spicelib/devices/Makefile.am | 2 + tests/fourbitadder.out | 114 +++++++++++++++---------------- 6 files changed, 102 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index 046500368..57959956a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,43 @@ +2000-07-03 Arno W. Peters + + * src/parser/alias.c, src/parser/alias.h: contain frontend alias + command. Moved them to src/frontend/com_alias.c and + src/frontend/com_alias.h. Updated Makefile.am's as appropreate. + + * src/parser/front.c, src/parser/front.h, src/parser/history.c, + src/parser/history.h, src/parser/modify.c, src/parser/modify.h, + src/parser/variable.c, src/parser/variable.h: Empty files. + Removed. + + * src/include/spconfig.h: Removed spCOMPLEX, + spSEPARATED_COMPLEX_VECTORS and spCOMPATIBILITY defines. This + made including this file from src/include/spmatrix.h unnecessary. + Moved this file to src/maths/sparse/spconfig.h. + + * src/include/spmatrix.h: Removed include of + src/include/spconfig.h. + + * src/maths/sparse/spalloc.c, src/maths/sparse/spbuild.c, + src/maths/sparse/spcombin.c, src/maths/sparse/spdefs.h, + src/maths/sparse/spfactor.c, src/maths/sparse/spoutput.c, + src/maths/sparse/spsmp.c, src/maths/sparse/spsolve.c, + src/maths/sparse/sputils.c: The other files affected by the + removal of spCOMPLEX, spSEPARATED_COMPLEX_VECTORS and + spCOMPATIBILITY defines. Also: assertions are enabled by + default. + + * src/include/smpdefs.h, src/maths/sparse/spsmp.c: SMPmatrix is + now a typedef for void, instead of char. Updated all function + declarations to match this. Also added function prototypes not + previously mentioned in src/include/smpdefs.h. + + * src/include/complex.h: Updates of cast from char * to void * + + * src/analysis/cktsens.c: Matrixes cannot be created non-complex. + Also added a check to detect an error condition on delta_Y = + spCreate(...). + + 2000-06-27 Arno W. Peters * src/parser: Refactored commands from the frontend into the diff --git a/src/misc/misc_time.c b/src/misc/misc_time.c index acbfd12af..3913335dd 100644 --- a/src/misc/misc_time.c +++ b/src/misc/misc_time.c @@ -9,6 +9,7 @@ Copyright 1990 Regents of the University of California. All rights reserved. #include #include "ngspice.h" #include +#include #include "misc_time.h" #ifdef HAVE_LOCALTIME diff --git a/src/misc/printnum.c b/src/misc/printnum.c index 6ff51adfb..9b9c12117 100644 --- a/src/misc/printnum.c +++ b/src/misc/printnum.c @@ -26,7 +26,7 @@ printnum(double num) if (num < 0.0) n--; - (void) sprintf(buf, "%.*le", n, num); + (void) sprintf(buf, "%.*e", n, num); return (buf); } diff --git a/src/misc/tilde.c b/src/misc/tilde.c index 8633e366b..dd6d0bbc5 100644 --- a/src/misc/tilde.c +++ b/src/misc/tilde.c @@ -6,6 +6,7 @@ Copyright 1991 Regents of the University of California. All rights reserved. #include #include "ngspice.h" #include +#include #include "tilde.h" #ifdef HAVE_PWD_H diff --git a/src/spicelib/devices/Makefile.am b/src/spicelib/devices/Makefile.am index c50e19f72..3e6c6c143 100644 --- a/src/spicelib/devices/Makefile.am +++ b/src/spicelib/devices/Makefile.am @@ -46,6 +46,8 @@ libdev_a_SOURCES = \ cktfinddev.c \ cktinit.c +EXTRA_DIST = README + INCLUDES = -I$(top_srcdir)/src/include MAINTAINERCLEANFILES = Makefile.in diff --git a/tests/fourbitadder.out b/tests/fourbitadder.out index 99661b4c4..4b858f78e 100644 --- a/tests/fourbitadder.out +++ b/tests/fourbitadder.out @@ -10,66 +10,66 @@ Index time v(1) -------------------------------------------------------------------------------- 0 0.000000e+00 0.000000e+00 1 1.200000e-12 3.600000e-04 -2 1.542463e-12 4.627390e-04 -3 2.227390e-12 6.682170e-04 -4 3.597243e-12 1.079173e-03 -5 6.336950e-12 1.901085e-03 -6 1.181636e-11 3.544909e-03 -7 2.277519e-11 6.832557e-03 -8 4.469284e-11 1.340785e-02 -9 8.852815e-11 2.655844e-02 -10 1.761988e-10 5.285963e-02 -11 2.824896e-10 8.474689e-02 -12 4.024896e-10 1.207469e-01 -13 5.224896e-10 1.567469e-01 -14 6.424896e-10 1.927469e-01 -15 7.624896e-10 2.287469e-01 -16 8.824896e-10 2.647469e-01 -17 1.002490e-09 3.007469e-01 -18 1.122490e-09 3.367469e-01 -19 1.242490e-09 3.727469e-01 -20 1.362490e-09 4.087469e-01 -21 1.482490e-09 4.447469e-01 -22 1.602490e-09 4.807469e-01 -23 1.722490e-09 5.167469e-01 -24 1.842490e-09 5.527469e-01 -25 1.962490e-09 5.887469e-01 -26 2.082490e-09 6.247469e-01 -27 2.202490e-09 6.607469e-01 -28 2.322490e-09 6.967469e-01 -29 2.442490e-09 7.327469e-01 -30 2.562490e-09 7.687469e-01 -31 2.682490e-09 8.047469e-01 -32 2.802490e-09 8.407469e-01 -33 2.922490e-09 8.767469e-01 -34 3.042490e-09 9.127469e-01 -35 3.162490e-09 9.487469e-01 -36 3.282490e-09 9.847469e-01 -37 3.402490e-09 1.020747e+00 -38 3.522490e-09 1.056747e+00 -39 3.642490e-09 1.092747e+00 -40 3.762490e-09 1.128747e+00 -41 3.882490e-09 1.164747e+00 -42 4.002490e-09 1.200747e+00 -43 4.122490e-09 1.236747e+00 -44 4.242490e-09 1.272747e+00 -45 4.362490e-09 1.308747e+00 -46 4.482490e-09 1.344747e+00 -47 4.602490e-09 1.380747e+00 -48 4.722490e-09 1.416747e+00 -49 4.842490e-09 1.452747e+00 -50 4.962490e-09 1.488747e+00 -51 5.082490e-09 1.524747e+00 -52 5.202490e-09 1.560747e+00 -53 5.322490e-09 1.596747e+00 -54 5.442490e-09 1.632747e+00 +2 1.542463e-12 4.627389e-04 +3 2.227389e-12 6.682166e-04 +4 3.597240e-12 1.079172e-03 +5 6.336944e-12 1.901083e-03 +6 1.181635e-11 3.544905e-03 +7 2.277516e-11 6.832549e-03 +8 4.469279e-11 1.340784e-02 +9 8.852804e-11 2.655841e-02 +10 1.761985e-10 5.285956e-02 +11 2.824894e-10 8.474683e-02 +12 4.024894e-10 1.207468e-01 +13 5.224894e-10 1.567468e-01 +14 6.424894e-10 1.927468e-01 +15 7.624894e-10 2.287468e-01 +16 8.824894e-10 2.647468e-01 +17 1.002489e-09 3.007468e-01 +18 1.122489e-09 3.367468e-01 +19 1.242489e-09 3.727468e-01 +20 1.362489e-09 4.087468e-01 +21 1.482489e-09 4.447468e-01 +22 1.602489e-09 4.807468e-01 +23 1.722489e-09 5.167468e-01 +24 1.842489e-09 5.527468e-01 +25 1.962489e-09 5.887468e-01 +26 2.082489e-09 6.247468e-01 +27 2.202489e-09 6.607468e-01 +28 2.322489e-09 6.967468e-01 +29 2.442489e-09 7.327468e-01 +30 2.562489e-09 7.687468e-01 +31 2.682489e-09 8.047468e-01 +32 2.802489e-09 8.407468e-01 +33 2.922489e-09 8.767468e-01 +34 3.042489e-09 9.127468e-01 +35 3.162489e-09 9.487468e-01 +36 3.282489e-09 9.847468e-01 +37 3.402489e-09 1.020747e+00 +38 3.522489e-09 1.056747e+00 +39 3.642489e-09 1.092747e+00 +40 3.762489e-09 1.128747e+00 +41 3.882489e-09 1.164747e+00 +42 4.002489e-09 1.200747e+00 +43 4.122489e-09 1.236747e+00 +44 4.242489e-09 1.272747e+00 +45 4.362489e-09 1.308747e+00 +46 4.482489e-09 1.344747e+00 +47 4.602489e-09 1.380747e+00 +48 4.722489e-09 1.416747e+00 +49 4.842489e-09 1.452747e+00 +50 4.962489e-09 1.488747e+00 +51 5.082489e-09 1.524747e+00 +52 5.202489e-09 1.560747e+00 +53 5.322489e-09 1.596747e+00 +54 5.442489e-09 1.632747e+00 Index time v(1) -------------------------------------------------------------------------------- -55 5.562490e-09 1.668747e+00 -56 5.682490e-09 1.704747e+00 -57 5.802490e-09 1.740747e+00 -58 5.922490e-09 1.776747e+00 +55 5.562489e-09 1.668747e+00 +56 5.682489e-09 1.704747e+00 +57 5.802489e-09 1.740747e+00 +58 5.922489e-09 1.776747e+00 59 6.000000e-09 1.800000e+00