Changeset 48a41a in git

Timestamp:

Feb 17, 2012, 11:35:47 AM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

26acab557e4ad73e2c8ba02fa1ad998773365fff66e25f2bbb3969a1769c9710fee12d7ca6262dd7

Parents:

46eef0a30be9c81870e8f7f971a5e0748c9e8fcd

Message:

chg: introduce n_ParDeg for pardeg(number)

Files:

• Singular/iparith.cc (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (2 diffs)
• libpolys/coeffs/numbers.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/algext.cc (modified) (2 diffs)
• libpolys/polys/ext_fields/transext.cc (modified) (2 diffs)

Singular/iparith.cc

@@ -4445 +4445 @@
 static BOOLEAN jjPARDEG(leftv res, leftv v)
 {
-  res->data = (char *)0L;
   number nn=(number)v->Data();
-  if (nn!=NULL) 
-  {
-    if (getCoeffType(currRing->cf)==n_algExt)
-    {
-      poly qq=(poly)nn;
-      res->data = (char *)(long)currRing->cf->extRing->pFDeg(qq,
-        currRing->cf->extRing);
-    }
-    if(getCoeffType(currRing->cf)==n_transExt)
-    {
-      /* from transext.h:*/
-      struct fractionObject
-      {
-        poly numerator;
-        poly denominator;
-        int complexity;
-      };
-      typedef struct fractionObject * fraction;
-      #define NUM(f) (((fraction)f)->numerator)
-
-      fraction qq=(fraction)nn;
-      res->data = (char *)(long)currRing->cf->extRing->pFDeg(NUM(qq),
-        currRing->cf->extRing);
-    }
-  }
+  res->data = (char *)(long)n_ParDeg(nn,currRing->cf);
   return FALSE;
 }

libpolys/coeffs/coeffs.h

@@ -183 +183 @@
    /// returns X with X mod q[i]=x[i], i=0..rl-1
    number  (*cfChineseRemainder)(number *x, number *q,int rl, const coeffs);
+
+   /// degree for coeffcients: -1 for 0, 0 for "constants", ...
+   int (*cfParDeg)(number x,const coeffs r);
 
 #ifdef HAVE_FACTORY
@@ -610 +613 @@
 }
 
+static inline int n_ParDeg(number n, const coeffs r)
+{ 
+  assume(r != NULL);
+  return r->cfParDeg(n,r); 
+}
+
 static inline number  n_Init_bigint(number i, const coeffs dummy,
                 const coeffs dst)

libpolys/coeffs/numbers.cc

@@ -85 +85 @@
   Werror("ChineseRemainder not implemented for (c=%d)",getCoeffType(r));
   return n_Init(0,r); 
+}
+
+int ndParDeg(number n, const coeffs r)
+{
+  return (-n_IsZero(n,r));
 }
 
@@ -252 +257 @@
     n->cfChineseRemainder = ndChineseRemainder;
     n->cfFarey = ndFarey;
+    n->cfParDeg = ndParDeg;
 
 #ifdef HAVE_RINGS

libpolys/polys/ext_fields/algext.cc

@@ -737 +737 @@
   
   return NULL;                                           /// default
+}
+
+int naParDeg(number a, const coeffs cf)
+{
+  if (a == NULL) return -1;
+  poly aa=(poly)a;
+  return cf->extRing->pFDeg(aa,cf->extRing);
 }
 
@@ -810 +817 @@
   cf->convSingNFactoryN=naConvSingNFactoryN;
 #endif
+  cf->cfParDeg = naParDeg;
   
   return FALSE;

libpolys/polys/ext_fields/transext.cc

@@ -1281 +1281 @@
 #endif
 
+int ntParDeg(number a, const coeffs cf)
+{
+  if (IS0(a)) return -1;
+  fraction fa = (fraction)a;
+  return cf->extRing->pFDeg(NUM(fa),cf->extRing);
+}
+
 BOOLEAN ntInitChar(coeffs cf, void * infoStruct)
 {
@@ -1349 +1356 @@
   cf->convSingNFactoryN =ntConvSingNFactoryN;
 #endif
+  cf->cfParDeg = ntParDeg;
 
   return FALSE;