Changeset da5d77 in git

Timestamp:

Mar 16, 2012, 9:31:18 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

bbe9548df00466bc1a7e2d22f1e5662d1f4614fa

Parents:

66b9679c3d696e061e7f06abdc3f5ddf7c9f2991

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-16 21:31:18+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-17 18:45:31+01:00

Message:

minor changes to ParDeg

chg: ndParDeg is a static function
add: nfParDef in ffields.cc (GF!)
add: n_ParDeg(ring) wrapper
add: added standard assumes to wrappers for ChineseRemainder, Farey, ParDeg

Files:

• Singular/iparith.cc (modified) (1 diff)
• libpolys/coeffs/coeffs.h (modified) (1 diff)
• libpolys/coeffs/ffields.cc (modified) (3 diffs)
• libpolys/coeffs/numbers.cc (modified) (1 diff)
• libpolys/polys/OBSOLETE_pInitContent.cc (modified) (4 diffs)
• libpolys/polys/coeffrings.h (modified) (1 diff)
• libpolys/polys/ext_fields/algext.cc (modified) (1 diff)
• libpolys/polys/ext_fields/transext.cc (modified) (1 diff)

Singular/iparith.cc

@@ -4446 +4446 @@
 {
   number nn=(number)v->Data();
-  res->data = (char *)(long)n_ParDeg(nn,currRing->cf);
+  res->data = (char *)(long)n_ParDeg(nn, currRing);
   return FALSE;
 }

libpolys/coeffs/coeffs.h

@@ -630 +630 @@
 static inline number n_ChineseRemainder(number *a, number *b, int rl, const coeffs r)
 {
-  assume(r != NULL);
-  return r->cfChineseRemainder(a,b,rl,r);
+  assume(r != NULL); assume(r->cfChineseRemainder != NULL); return r->cfChineseRemainder(a,b,rl,r);
 }
 
 static inline number n_Farey(number a, number b, const coeffs r)
 {
-  assume(r != NULL);
-  return r->cfFarey(a,b,r);
+  assume(r != NULL); assume(r->cfFarey != NULL); return r->cfFarey(a,b,r);
 }
 
 static inline int n_ParDeg(number n, const coeffs r)
 { 
-  assume(r != NULL);
-  return r->cfParDeg(n,r); 
+  assume(r != NULL); assume(r->cfParDeg != NULL); return r->cfParDeg(n,r); 
 }
 

libpolys/coeffs/ffields.cc

@@ -28 +28 @@
 number  nfInit        (long i, const coeffs r);
 number  nfParameter   (int i, const coeffs r);
-int     nfParDeg      (number n, const coeffs r);
 int     nfInt         (number &n, const coeffs r);
 number  nfAdd         (number a, number b, const coeffs r);
@@ -237 +236 @@
 * the degree of the "alg. number"
 */
-int nfParDeg(number n, const coeffs r)
+static int nfParDeg(number n, const coeffs r)
 {
 #ifdef LDEBUG
@@ -884 +883 @@
   // debug stuff
   r->cfCoeffWrite=nfCoeffWrite;
+   
+  r->cfParDeg = nfParDeg;
 
 #ifdef LDEBUG

libpolys/coeffs/numbers.cc

@@ -87 +87 @@
 }
 
-int ndParDeg(number n, const coeffs r)
+static int ndParDeg(number n, const coeffs r)
 {
   return (-n_IsZero(n,r));

libpolys/polys/OBSOLETE_pInitContent.cc

@@ -168 +168 @@
 }
 
-void pSimpleContent(poly ph,int smax)
+void pSimpleContent(poly ph,int smax) // in currRing!
 {
   //if(TEST_OPT_CONTENTSB) return;
@@ -228 +228 @@
 }
 
-number pInitContent(poly ph)
+number pInitContent(poly ph)  // in currRing!
 // only for coefficients in Q
 #if 0
@@ -313 +313 @@
 #endif
 
-number pInitContent_a(poly ph)
+number pInitContent_a(poly ph) // in currRing!
 // only for coefficients in K(a) anf K(a,...)
 {
   number d=pGetCoeff(ph);
-  int s=naParDeg(d);
-  if (s /* naParDeg(d)*/ <=1) return naCopy(d);
+  int s=n_ParDeg(d, currRing);
+  if (s /* n_ParDeg(d, currRing)*/ <=1) return naCopy(d);
   int s2=-1;
   number d2;
@@ -330 +330 @@
       break;
     }
-    if ((ss=naParDeg(pGetCoeff(ph)))<s)
+    if ((ss=n_ParDeg(pGetCoeff(ph), currRing))<s)
     {
       s2=s;

libpolys/polys/coeffrings.h

@@ -47 +47 @@
 #endif
 
-
+static inline int n_ParDeg(number n, const ring r){ assume(r != NULL); assume(r->cf != NULL); return n_ParDeg(n,r->cf); }
 
 #endif /* COEFFRINGS_H */

libpolys/polys/ext_fields/algext.cc

@@ -781 +781 @@
 }
 
-int naParDeg(number a, const coeffs cf)
+static int naParDeg(number a, const coeffs cf)
 {
   if (a == NULL) return -1;

libpolys/polys/ext_fields/transext.cc

@@ -1350 +1350 @@
 #endif
 
-int ntParDeg(number a, const coeffs cf)
+static int ntParDeg(number a, const coeffs cf)
 {
   if (IS0(a)) return -1;