Changeset 9d72fe in git

Timestamp:

Aug 24, 2000, 4:42:47 PM (23 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

d04e5c6da27fdd8c08fbad5b2d62afe127e20d5c

Parents:

30d8a152a104abfe89fae353b5945c3210760945

Message:

* new p_Procs stuff


git-svn-id: file:///usr/local/Singular/svn/trunk@4559 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• Makefile.in (modified) (9 diffs)
• extra.cc (modified) (3 diffs)
• febase.cc (modified) (2 diffs)
• iparith.cc (modified) (2 diffs)
• mod2.h.in (modified) (2 diffs)
• omSingularConfig.h (modified) (1 diff)
• p_Add_q__Template.cc (added)
• p_Copy__Template.cc (added)
• p_Delete__Template.cc (added)
• p_Minus_m_Mult_q__Template.cc (added)
• p_Mult_m__Template.cc (added)
• p_Mult_n__Template.cc (added)
• p_Procs.cc (added)
• p_Procs.h (added)
• p_ShallowCopyDelete__Template.cc (added)
• polys-comp.h (modified) (3 diffs)
• polys-impl.cc (modified) (3 diffs)
• polys.h (modified) (5 diffs)
• polys1.cc (modified) (3 diffs)
• prProcs.cc (modified) (2 diffs)
• ring.cc (modified) (11 diffs)
• structs.h (modified) (4 diffs)
• subexpr.cc (modified) (2 diffs)

Singular/Makefile.in

@@ -100 +100 @@
     pcv.cc kbuckets.cc prProcs.cc \
     mpr_inout.cc mpr_base.cc mpr_numeric.cc \
-    prCopy.cc
+    prCopy.cc p_Procs.cc
 
 
@@ -110 +110 @@
 
 SOURCES=${CSOURCES} ${CXXSOURCES} ${ESOURCES} mmalloc.cc\
-        grammar.y scanner.l libparse.l syz2.cc
+        grammar.y scanner.l libparse.l syz2.cc \
+        p_Delete__Template.cc p_ShallowCopyDelete__Template.cc \
+        p_Copy__Template.cc p_Mult_n__Template.cc p_Mult_m__Template.cc \
+        p_Minus_m_Mult_q__Template.cc p_Add_q__Template.cc
 
 
@@ -130 +133 @@
         mpr_global.h mpr_inout.h mpr_base.h mpr_numeric.h \
         feOpt.h fegetopt.h distrib.h walk.h \
-        prCopy.h
+        prCopy.h \
+        p_MemAdd.h p_MemCopy.h p_MemCmp.h p_Numbers.h
 
 INCS=febase.inc polys.inc iparith.inc mpsr_Tok.inc feOpt.inc
@@ -268 +272 @@
         $(PERL) prCopy.pl > prCopy.inc
 
+p_Procs.inc: p_Procs.cc p_Procs.h mod2.h 
+        $(CXX) -g -Wall -DGENERATE_P_PROCS p_Procs.cc -o p_Procs
+        ./p_Procs > p_Procs.inc
+
+
 src: scanner.cc grammar.h grammar.cc libparse.cc 
 
@@ -348 +357 @@
 ##
 mostlyclean: 
-        -rm -f Singular Singular-static Singularg Singularp Singularb libparse feOpt*.inc
-        -rm -f *.o *.og core *.op *.ob *.ot Singulart
+        -rm -f Singular Singular-static Singulara Singularg Singularp Singularb libparse feOpt*.inc p_Procs.inc
+        -rm -f *.o *.og core *.op *.ob *.ot Singulart *.od *_d.cc *_d.c p_Procs *.oa
         -rm ESingular* TSingular*
 
@@ -498 +507 @@
 
 ##
-## op and ob files for gprof and bprof, ot for mtrack
+## op and ob files for gprof and bprof, ot for mtrack, oc for OMCHECK=1
 ##
 
@@ -585 +594 @@
 
 
+#
+# for Singulara
+#
+DEFSA = -DOM_CHECK=1 -DHAVE_ASSUME -DNDEBUG -D@SING_UNAME@ @DEFS@
+OBJA1 := $(CXXSOURCES:.cc=.oa) 
+OBJA2 := $(CSOURCES:.c=.oa) 
+OBJA=$(OBJA1) $(OBJA2)
+CFLAGSA         = -g  -O -Wall -Wno-unused ${PIPE}
+CXXFLAGSA       = -g  -O -Wall -Wno-unused ${PIPE}
+
+claptmpl.oa: claptmpl.cc mod2.h
+        $(CXX)  ${CXXFLAGSA} ${CPPFLAGS} ${DEFSA} -c $< -o $@
+
+$(OBJA1) mmalloc.oa: %.oa: %.cc
+        $(CXX) ${CXXFLAGSA} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSA} -c $< -o $@
+
+$(OBJA2) : %.oa: %.c
+        $(CCP)  ${CFLAGSA} ${CPPFLAGS} ${DEFSA} -c $< -o $@
+
+Singulara: scanner.cc   $(OBJA) iparith.oa mpsr_Tok.oa claptmpl.oa tesths.cc version.h  mmalloc.oa
+        $(CXXP) ${CXXFLAGSA} ${CPPFLAGS} ${DEFSA} -o Singulara \
+        tesths.cc iparith.oa mpsr_Tok.oa claptmpl.oa $(OBJA) ${LDFLAGS} ${LIBS} -lomalloc mmalloc.oa \
+        ${LD_DYN_FLAGS} 
+
+iparith.oa: iparith.inc iparith.cc
+        $(CXXP)  ${CXXFLAGSA} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSA} -c iparith.cc -o iparith.oa
+
+mpsr_Tok.oa: iparith.inc mpsr_Tok.cc
+        $(CXXP) ${CXXFLAGAT} ${CXXTEMPLFLAGSB} ${CPPFLAGS} ${DEFSA} -c mpsr_Tok.cc -o mpsr_Tok.oa
+
+#
+# for Macro expansion
+# 
+CXXSOURCESD := $(CXXSOURCES:%.cc=%_d.cc)
+CSOURCESD := $(CSOURCES:%.c=%_d.c)
+OBJD1 := $(CXXSOURCESD:.cc=.od)
+OBJD2 := $(CSOURCESD:.c=.od)
+
+p_ProcsGen_d.cc: p_Procs.cc p_Procs.h mod2.h 
+        $(CCG) -DGENERATE_P_PROCS ${CPPFLAGS} -E -P p_Procs.cc | $(PERL) -p -e 's/;/;\n/g' | $(PERL) -p -e 's/\{/\n\{/g' | $(PERL) -p -e 's/\}/\n\}/g' > $@
+p_ProcsGen_d: p_Procs_d.cc
+        gcc -g -Wall -DGENERATE_P_PROCS p_Procs_d.cc -o p_ProcsGen_d
+
+%_d.c : %.c
+        $(CCG) $(CFLAGSG) ${CPPFLAGS} -E -P $< | $(PERL) -p -e 's/;/;\n/g' | $(PERL) -p -e 's/\{/\n\{/g' | $(PERL) -p -e 's/\}/\n\}/g' > $@
+
+%_d.cc : %.cc
+        $(CCG) $(CXXFLAGS) ${CPPFLAGS} -E -P $< | $(PERL) -p -e 's/;/;\n/g' | $(PERL) -p -e 's/\{/\n\{/g' | $(PERL) -p -e 's/\}/\n\}/g' > $@
+
+.PRECIOUS: %_d.cc %_d.c
+
+%.od : %.c
+        $(CCG)  ${CFLAGSG} ${CPPFLAGS} ${DEFSG} -c $< -o $@
+
+%.od : %.cc
+        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -c $< -o $@
+
+Singular_d: scanner.cc  $(OBJD)  mmalloc.od\
+           iparith.od mpsr_Tok.od claptmpl.og tesths.cc version.h 
+        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGSG} ${CPPFLAGS} ${DEFSG} -o Singularg_d \
+        tesths.cc iparith.od mpsr_Tok.od claptmpl.og $(OBJG) ${LDFLAGS} ${LIBS} -lomalloc mmalloc.od \
+        ${LD_DYN_FLAGS} ${LD_LIBC} 
+
 ##
 ## check_aso
@@ -595 +667 @@
 
 %.dd: %.cc mod2.h 
-        echo $(@:.dd=.og) $(@:.dd=.op) $(@:.dd=.ob) $(@:.dd=.ot)" " \\ > $@
+        echo $(@:.dd=.og) $(@:.dd=.op) $(@:.dd=_d.cc) $(@:.dd=.od) $(@:.dd=.ob) $(@:.dd=.ot) $(@:.dd=.oa) " " \\ > $@
         $(CXXM) -DGENTABLE ${CPPFLAGS} ${DEFSG} $< >> $@
 
 %.d: %.c mod2.h 
-        echo $(@:.d=.og) $(@:.d=.op) $(@:.d=.ob) $(@:.d=.ot)" " \\ > $@
+        echo $(@:.d=.og) $(@:.d=.od) $(@:.dd=_d.c) $(@:.d=.op) $(@:.d=.ob) $(@:.d=.ot) $(@:.dd=.oa)" " \\ > $@
         $(CCM) ${CPPFLAGS} ${DEFSG} $< >> $@
 
-depend:   $(CXXSOURCES:.cc=.dd) $(CSOURCES:.c=.d) mmalloc.dd mod2.h 
+depend:   $(CXXSOURCES:.cc=.dd) $(CSOURCES:.c=.d) iparith.dd mmalloc.dd mod2.h 
         cat *.d *.dd >depend
 
@@ -610 +682 @@
 
 
-

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.138 2000-08-14 14:35:50 Singular Exp $ */
+/* $Id: extra.cc,v 1.139 2000-08-24 14:42:39 obachman Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -628 +628 @@
     char *sys_cmd=(char *)(h->Data());
     h=h->next;
+#ifdef RDEBUG
 /*==================== poly debug ==================================*/
     if(strcmp(sys_cmd,"p")==0)
@@ -642 +643 @@
     }
     else
+#endif
 /*==================== mtrack ==================================*/
     if(strcmp(sys_cmd,"mtrack")==0)

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.88 2000-08-14 12:56:06 obachman Exp $ */
+/* $Id: febase.cc,v 1.89 2000-08-24 14:42:40 obachman Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -407 +407 @@
 {
   fprintf(stderr, "Internal assume violation: file %s line %d\n", file, line);
+  omPrintCurrentBackTrace(stderr);
 }
 }

Singular/iparith.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: iparith.cc,v 1.220 2000-08-14 12:56:21 obachman Exp $ */
+/* $Id: iparith.cc,v 1.221 2000-08-24 14:42:40 obachman Exp $ */
 
 /*
@@ -24 +24 @@
 #include "longalg.h"
 #include "polys.h"
+#include "polys-comp.h"
 #include "ideals.h"
 #include "matpol.h"

Singular/mod2.h.in

@@ -6 +6 @@
  *          DO NOT EDIT!
  *
- *  Version: $Id: mod2.h.in,v 1.84 2000-08-14 12:56:39 obachman Exp $
+ *  Version: $Id: mod2.h.in,v 1.85 2000-08-24 14:42:42 obachman Exp $
  *******************************************************************/
 #ifndef MOD2_H
@@ -104 +104 @@
 /* Define if you have petpwnam */
 #undef HAVE_GETPWNAM
+/* Define if you have popen */
+#undef HAVE_POPEN
 /* Define sizeof(char) */
 #define SIZEOF_CHAR 1

Singular/omSingularConfig.h

@@ -2 +2 @@
  *  File:    omSingularConfig.h
  *  Purpose: declaration of External Config stuff for omalloc 
+ *           This file is inlcuded by omDefaultConfig.h, i.e., at the the time 
+ *           the omalloc library is built. Any changes to the default config 
+ *           of omalloc should be done here (and, of course, you need to 
+ *           rebuilt the library).
  *  Author:  obachman@mathematik.uni-kl.de (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: omSingularConfig.h,v 1.1 2000-08-14 12:57:49 obachman Exp $
+ *  Version: $Id: omSingularConfig.h,v 1.2 2000-08-24 14:42:42 obachman Exp $
  *******************************************************************/
 #ifndef OM_SINGULAR_CONFIG_H

Singular/polys-comp.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-comp.h,v 1.23 2000-08-18 15:42:06 Singular Exp $ */
+/* $Id: polys-comp.h,v 1.24 2000-08-24 14:42:44 obachman Exp $ */
 
 /***************************************************************
@@ -100 +100 @@
 
 // need to undefine this, since longs might be negative
-#define u_s
+#define u_s unsigned
 
 #define _memcmp(p1, p2, i, l, actionE, actionD) \
@@ -137 +137 @@
 #endif
 
-#if defined(PDEBUG) && defined(HAVE_SHIFTED_EXPONENTS)
-extern int pDBsyzComp;
-int rComp0(poly p1, poly p2);
+#ifdef PDEBUG
+extern int rComp0(poly p1, poly p2);
 #else
 inline int rComp0(poly p1, poly p2)

Singular/polys-impl.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys-impl.cc,v 1.46 2000-08-24 14:28:55 Singular Exp $ */
+/* $Id: polys-impl.cc,v 1.47 2000-08-24 14:42:44 obachman Exp $ */
 
 /***************************************************************
@@ -915 +915 @@
 
 #ifdef HAVE_SHIFTED_EXPONENTS
-#ifdef PDEBUG
-int rComp0(poly p1,poly p2)
+int rComp0_Func(poly p1,poly p2)
 {
   int i;
@@ -931 +930 @@
   return 0;
 }
+
+#ifdef PDEBUG
+int rComp0(poly p1,poly p2)
+{
+  int i;
+  for(i=0; i<=currRing->pCompHighIndex;i++)
+  {
+    if (p1->exp.l[i] != p2->exp.l[i])
+    {
+      if (p1->exp.l[i] > p2->exp.l[i])
+        return currRing->ordsgn[i];
+      else
+        return -currRing->ordsgn[i];
+    }
+  }
+  return 0;
+}
 #endif
 #endif

Singular/polys.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.h,v 1.32 2000-08-14 12:56:46 obachman Exp $ */
+/* $Id: polys.h,v 1.33 2000-08-24 14:42:45 obachman Exp $ */
 /*
 * ABSTRACT - all basic methods to manipulate polynomials
@@ -124 +124 @@
 // frees the space of monomial and frees coefficient
 #define pDelete1(m)     _pDelete1(m, currPolyBin)
-// deletes the whole polynomial p
-#define pDelete(p)      _pDelete(p, currPolyBin)
+
 
 // similar to routines above, except that monomials are assumed to be from heap h (resp. are allocated from heap h)
@@ -154 +153 @@
 
 extern  poly pHeadProc(poly p);
-// Returns copy of the whole polynomial
-#define pCopy(p)        _pCopy(currPolyBin, p)
 // Returns copy of the whole poly, new monomials are taken from dest_heap
 #define pHeapCopy(dest_heap, p) _pCopy(dest_heap, p)
@@ -180 +177 @@
 
 /*-------------operations on polynomials:------------*/
-poly      pAdd(poly p1, poly p2);
 poly      pNeg(poly p);
 poly      pSub(poly a, poly b);
@@ -187 +183 @@
 poly      pMultCopyN(poly a, number c);
 poly      pPower(poly p, int i);
+
+
+// ----------------- define to enable new p_procs -----*/
+// #define HAVE_P_PROCS
+#ifdef HAVE_P_PROCS
+#include "p_Procs.h"
+#define pDelete p_Delete
+#define pCopy   p_Copy
+#define pAdd    p_Add_q
+#else
+// deletes the whole polynomial p
+#define pDelete(p)      _pDelete(p, currPolyBin)
+// Returns copy of the whole polynomial
+#define pCopy(p)        _pCopy(currPolyBin, p)
+poly      pAdd(poly p1, poly p2);
+#endif
 
 // return TRUE, if exponent and component of Lm(p1) and Lm(p2) are equal,

Singular/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.42 2000-08-24 11:21:45 Singular Exp $ */
+/* $Id: polys1.cc,v 1.43 2000-08-24 14:42:45 obachman Exp $ */
 
 /*
@@ -136 +136 @@
 }
 
+#ifndef HAVE_P_PROCS
 /*-------------operations on polynomials:------------*/
 /*2
@@ -206 +207 @@
   return p;
 }
+#endif
+
 
 /*2

Singular/prProcs.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: prProcs.cc,v 1.3 2000-08-14 12:56:47 obachman Exp $ */
+/* $Id: prProcs.cc,v 1.4 2000-08-24 14:42:45 obachman Exp $ */
 /*
 *  ABSTRACT -  Routines for primitive poly arithmetic
@@ -43 +43 @@
 }                                               \
 while(0)
-/***************************************************************
- *
- * General:  pr_Mult_n which always works
- * Returns:  p*n
- * Destroys: p
- * Const:    n
- *
- ***************************************************************/
 
 poly pr_Mult_n_General(poly p, number n)

Singular/ring.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ring.cc,v 1.106 2000-08-24 11:21:46 Singular Exp $ */
+/* $Id: ring.cc,v 1.107 2000-08-24 14:42:46 obachman Exp $ */
 
 /*
@@ -28 +28 @@
 #include "ring.h"
 #include "prCopy.h"
+#include "p_Procs.h"
 
 #define BITS_PER_LONG 8*SIZEOF_LONG
@@ -186 +187 @@
 
   if (ppNoether!=NULL) pDelete(&ppNoether);
-  if ((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING))
+  if (((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING)) ||
+      ((sLastPrinted.rtyp==LIST_CMD)&&(lRingDependend((lists)sLastPrinted.data))))
+
   {
     sLastPrinted.CleanUp();
@@ -874 +877 @@
       }
       if (ppNoether!=NULL) pDelete(&ppNoether);
-      if ((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING))
+      if (((sLastPrinted.rtyp>BEGIN_RING) && (sLastPrinted.rtyp<END_RING)) ||
+          ((sLastPrinted.rtyp==LIST_CMD)&&(lRingDependend((lists)sLastPrinted.data))))
       {
         sLastPrinted.CleanUp();
@@ -2555 +2559 @@
   // r->pCompHighIndex already set
   r->pCompLSize = r->pCompHighIndex + 1;
-  r->ordsgn=(long *)omAlloc0(r->pCompLSize*sizeof(long));
+  r->ordsgn=(long *)omAlloc0(r->ExpLSize*sizeof(long));
 
   for(j=0;j<=r->pCompHighIndex;j++)
@@ -2578 +2582 @@
   // ----------------------------
   // indices for (first copy of ) variable entries in exp.e vector (VarOffset):
-  // BIGENDIAN:
   r->VarOffset=v;
 
@@ -2598 +2601 @@
   if (i==r->pCompIndex) i++;
   r->pOrdIndex=i;
+
+  // ----------------------------
+  // p_Procs
+  r->p_Procs = omAlloc(sizeof(p_Procs_s));
+  p_SetProcs(r, r->p_Procs);
   return FALSE;
 }
@@ -2985 +2993 @@
 #endif
   r->pCompLSize = r->pCompHighIndex - r->pCompLowIndex + 1;
-  r->ordsgn=(long *)omAlloc0(r->pCompLSize*sizeof(long));
+  r->ordsgn=(long *)omAlloc0(r->ExpLSize*sizeof(long));
 
 #ifndef WORDS_BIGENDIAN
@@ -3116 +3124 @@
     }
     if (r->ordsgn != NULL && r->pCompLSize != 0)
-      omFreeSize((ADDRESS)r->ordsgn,r->pCompLSize*sizeof(long));
-  }
-}
-
+      omFreeSize((ADDRESS)r->ordsgn,r->pExpLSize*sizeof(long));
+    if (r->p_Procs != NULL)
+      omFreeSize(r->p_Procs, sizeof(p_Procs_s));
+  }
+}
+
+#ifdef RDEBUG
 void rDebugPrint(ring r)
 {
@@ -3225 +3236 @@
       PrintLn();
   }
-}
+
+  // p_Procs stuff
+  p_Procs_s proc_names;
+  char* field;
+  char* length;
+  char* ord;
+  p_Debug_GetProcNames(r, &proc_names);
+  p_Debug_GetSpecNames(r, field, length, ord);
+
+  Print("p_Spec  : %s, %s, %s\n", field, length, ord);
+  PrintS("p_Procs :\n");
+  for (i=0; i<sizeof(p_Procs_s)/sizeof(void*); i++)
+  {
+    Print(" %s,\n", ((char**) &proc_names)[i]);
+  }
+}
+
 void pDebugPrint(poly p)
 {
@@ -3250 +3277 @@
   }
 }
+#endif // RDEBUG
 
 

Singular/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.34 2000-08-24 11:21:47 Singular Exp $ */
+/* $Id: structs.h,v 1.35 2000-08-24 14:42:46 obachman Exp $ */
 /*
 * ABSTRACT
@@ -105 +105 @@
 typedef struct reca *      alg;
 
-
 #ifdef __cplusplus
 typedef idrec *            idhdl;
@@ -120 +119 @@
 typedef namerec *          namehdl;
 typedef kBucket*           kBucket_pt;
+typedef struct p_Procs_s p_Procs_s;
 
 // for hdegree.cc   
@@ -305 +305 @@
   short      OrdSize; /* size of ord vector (in sro_ord) */
 
+  p_Procs_s* p_Procs;
   short      ref; /* reference counter to the ring */
 };

Singular/subexpr.cc

@@ -5 +5 @@
 * ABSTRACT: handling of leftv
 */
-/* $Id: subexpr.cc,v 1.58 2000-08-14 12:56:52 obachman Exp $ */
+/* $Id: subexpr.cc,v 1.59 2000-08-24 14:42:47 obachman Exp $ */
 
 #include <stdlib.h>
@@ -1523 +1523 @@
           omCheckAddr(d->arg1.name);
           nok=nok||iiAssign(&d->arg1,&d->arg2);
-          omDebugIf(d->arg1.name != NULL,  // OB: ????
-                   omCheckAddr(d->arg1.name));
+          omCheckIf(d->arg1.name != NULL,  // OB: ????
+                    omCheckAddr(d->arg1.name));
           if (!nok)
           {