Changeset 45d2332 in git

Timestamp:

Mar 31, 2011, 6:30:18 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

3f2fb2cdc5019bbfc97d4fa27121402be181a8a3

Parents:

ab4f17f53255dd31a9347110c1d434aea6bda6ae

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-03-31 18:30:18+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:16+01:00

Message:

FIX: p_polys.cc
CHG: use mylimits.h instead of limit.h in misc/auxiliary.h!

Location:

libpolys

Files:

• misc/auxiliary.h (modified) (1 diff)
• misc/mylimits.h (modified) (1 diff)
• polys/monomials/p_polys.cc (modified) (9 diffs)
• polys/monomials/p_polys.h (modified) (1 diff)
• polys/nc/nc.h (modified) (4 diffs)
• polys/nc/sca.h (modified) (2 diffs)

libpolys/misc/auxiliary.h

@@ -59 +59 @@
 #ifndef SIZEOF_LONG
 
-#include <limits.h>
+#include <misc/mylimits.h>
 
 #ifndef LONG_BIT

libpolys/misc/mylimits.h

@@ -16 +16 @@
 
 #ifdef IRIX
-#include <omlimits.h>
+#include <omalloc/omlimits.h>
 #else
 #include <limits.h>

libpolys/polys/monomials/p_polys.cc

@@ -4 +4 @@
 /***************************************************************
  *  File:    p_polys.cc
- *  Purpose: implementation of currRing independent poly procedures
+ *  Purpose: implementation of ring independent poly procedures?
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
@@ -12 +12 @@
 #include <ctype.h>
 
+
+#include <omalloc/omalloc.h>
 #include <misc/auxiliary.h>
+#include <misc/options.h>
+#include <misc/intvec.h>
+
+#include <coeffs/longrat.h> // ???
+
+#include <polys/weight.h>
 
 #include <polys/monomials/ring.h>
 #include <polys/monomials/p_polys.h>
-#include <polys/monomials/ring.h>
-#include <polys/weight.h>
-#include <coeffs/longrat.h>
-#include <misc/options.h>
-#include <misc/intvec.h>
+
 // #include <???/ideals.h>
 // #include <???/int64vec.h>
+
 #ifndef NDEBUG
 // #include <???/febase.h>
+#endif
+
+#ifdef HAVE_PLURAL
+#include <polys/nc/nc.h>
+#include <polys/nc/sca.h>
 #endif
 
@@ -744 +754 @@
 long pLDeg1_Deg(poly p,int *l, const ring r)
 {
-  assume(r->pFDeg == pDeg);
+  assume(r->pFDeg == p_Deg);
   p_CheckPolyRing(p, r);
   long k= p_GetComp(p, r);
@@ -775 +785 @@
 long pLDeg1c_Deg(poly p,int *l, const ring r)
 {
-  assume(r->pFDeg == pDeg);
+  assume(r->pFDeg == p_Deg);
   p_CheckPolyRing(p, r);
   int ll=1;
@@ -1313 +1323 @@
 poly p_Div_nn(poly p, const number n, const ring r)
 {
-  pAssume(!n_IsZero(n,r));
+  pAssume(!n_IsZero(n,r->cf));
   p_Test(p, r);
 
@@ -2840 +2850 @@
 // resets the pFDeg and pLDeg: if pLDeg is not given, it is
 // set to currRing->pLDegOrig, i.e. to the respective LDegProc which
-// only uses pFDeg (and not pDeg, or pTotalDegree, etc)
+// only uses pFDeg (and not p_Deg, or pTotalDegree, etc)
 void pSetDegProcs(ring r, pFDegProc new_FDeg, pLDegProc new_lDeg)
 {
@@ -2923 +2933 @@
   if (rField_is_Ring(r))
   {
-    if (!nIsUnit(pGetCoeff(p1))) return;
+    if (!n_IsUnit(pGetCoeff(p1), r->cf)) return;
     // Werror("p_Norm not possible in the case of coefficient rings.");
   }
@@ -2980 +2990 @@
   {
 #ifdef LDEBUG
-    if (currRing==r) {nTest(pGetCoeff(p));}
+    n_Test(pGetCoeff(p), r->cf);
 #endif
     n_Normalize(pGetCoeff(p),r->cf);
@@ -3064 +3074 @@
   while (non_zero != NULL)
   {
-    assume(p_GetExp(non_zero, nm,r) != 0);
+    assume(p_GetExp(non_zero, n, r) != 0);
     qq = non_zero;
     pIter(non_zero);

libpolys/polys/monomials/p_polys.h

@@ -330 +330 @@
  *
  ***************************************************************/
-static inline poly      pLast(poly a, int &length);
-inline   poly      pLast(poly a) { int l; return pLast(a, l);}
+
+// returns the length of a (numbers of monomials)
+// respect syzComp
+// static inline poly pLast(poly a, int &length);
+// static inline poly pLast(poly a) { int l; return pLast(a, l); }
+
+
 static inline poly pReverse(poly p)
 {

libpolys/polys/nc/nc.h

@@ -1 +1 @@
 #ifndef POLYS_NC_H
 #define POLYS_NC_H
+
 
 #ifdef HAVE_PLURAL
@@ -35 +36 @@
 
 // //////////////////////////////////////////////////////
+
+
 
 // NC pProcs:
@@ -181 +184 @@
 
 
+
+// //////////////////////////////////////////////////////////////////////// //
+// we must always have this test!?
+inline bool rIsSCA(const ring r)
+{
+#ifdef HAVE_PLURAL
+  return rIsPluralRing(r) && (ncRingType(r) == nc_exterior);
+#else
+  return false;
+#endif
+}
+
 // //////////////////////////////////////////////////////////////////////// //
 // NC inlines
@@ -281 +296 @@
 }
 
+
+
+/* subst: */
+poly nc_pSubst(poly p, int n, poly e, const ring r);
+
+
+
 #endif /* HAVE_PLURAL */
 

libpolys/polys/nc/sca.h

@@ -2 +2 @@
 #define SCA_H
 
-/****************************************
-*  Computer Algebra System SINGULAR     *
-****************************************/
-/* $Id$ */
+#ifdef HAVE_PLURAL
 
-#include <kernel/ring.h>
-#include <kernel/gring.h>
-#include <kernel/structs.h>
-#include <kernel/intvec.h>
+#include <polys/nc/nc.h>
 
-
-// we must always have this test!
-inline bool rIsSCA(const ring r)
-{
-#ifdef HAVE_PLURAL
-  return rIsPluralRing(r) && (ncRingType(r) == nc_exterior);
-#else
-  return false;
-#endif
-}
-
-
-#ifdef HAVE_PLURAL
 // we must always have this test!
 inline ideal SCAQuotient(const ring r)
@@ -32 +13 @@
 }
 
-#include <kernel/gring.h>