=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/lib/defs.h,v retrieving revision 1.2 retrieving revision 1.7 diff -u -p -r1.2 -r1.7 --- OpenXM_contrib2/asir2000/lib/defs.h 2000/08/21 08:31:41 1.2 +++ OpenXM_contrib2/asir2000/lib/defs.h 2004/06/27 13:49:40 1.7 @@ -23,7 +23,7 @@ * shall be made on your publication or presentation in any form of the * results obtained by use of the SOFTWARE. * (4) In the event that you modify the SOFTWARE, you shall notify FLL by - * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification * for such modification or the source code of the modified part of the * SOFTWARE. * @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/lib/defs.h,v 1.1.1.1 1999/12/03 07:39:11 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/lib/defs.h,v 1.6 2004/06/22 16:11:08 ohara Exp $ */ /* some useful macros */ @@ -57,6 +57,8 @@ #define VECT 5 #define MAT 6 #define STR 7 +#define STRUCT 8 +#define DPOLY 9 #define N_Q 0 #define N_R 1 @@ -76,7 +78,11 @@ #define isvect(a) (type(a)==VECT) #define ismat(a) (type(a)==MAT) #define isstr(a) (type(a)==STR) +#define isstruct(A) (type(A)==STRUCT) +#define isdpoly(a) (type(a)==DPOLY) +#define isnum_int(a) ((a)==0 || (type((a))==NUM && ntype((a))==O_Q && dn((a))==1)) + #define FIRST(L) (car(L)) #define SECOND(L) (car(cdr(L))) #define THIRD(L) (car(cdr(cdr(L)))) @@ -89,3 +95,4 @@ #define TS(a) car(cdr(car(a))) #define MAX(a,b) ((a)>(b)?(a):(b)) +#define MIN(a,b) ((a)>(b)?(b):(a))