Changeset 206e158 in git for kernel/kutil.cc

Timestamp:

May 11, 2007, 12:48:05 PM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d15996cd44ce997d3360fac629f4062adb1c4836

Parents:

3fd4df896525da08d34f33e88e6239994fa4d0e6

Message:

structs.h, numbers.*, rmodulo*:
new method nComp
nIntDiv(0, a) = module / a in rmodulo

ringgb.*:
adapted for more generic rings

ring.h:
rField_is_Domain new

k*:
adapted for gbs over Z/m


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

File:

• kernel/kutil.cc (modified) (17 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.52 2007-05-10 08:12:41 wienand Exp $ */
+/* $Id: kutil.cc,v 1.53 2007-05-11 10:48:04 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -104 +104 @@
 static poly redBba (poly h,int maxIndex,kStrategy strat);
 
-#ifdef HAVE_RING2TOM
+#ifdef HAVE_RINGS
 #define pDivComp_EQUAL 2
 #define pDivComp_LESS 1
@@ -130 +130 @@
         if (la < lb)
         {
-          if (b) return 0;
+          if (b) return pDivComp_INCOMP;
           if (((la & divmask) ^ (lb & divmask)) != ((lb - la) & divmask))
-            return 0;
+            return pDivComp_INCOMP;
           a = TRUE;
         }
         else
         {
-          if (a) return 0;
+          if (a) return pDivComp_INCOMP;
           if (((la & divmask) ^ (lb & divmask)) != ((la - lb) & divmask))
-            return 0;
+            return pDivComp_INCOMP;
           b = TRUE;
         }
       }
     }
-    if (a) return 1;
-    if (b) return -1;
+    if (a) return pDivComp_LESS;
+    if (b) return pDivComp_GREATER;
     if (!a & !b) return pDivComp_EQUAL;
   }
@@ -492 +492 @@
 }
 
-#ifdef HAVE_RING2TOM
-//void initLMtest(kStrategy strat)
-//{
-//  strat->lmtest = (unsigned int *)omAlloc0((strat->sl*strat->sl/2+2)*sizeof(BOOLEAN));
-//}
-#endif
-
 /*2
 *test whether (p1,p2) or (p2,p1) is in L up position length
@@ -1022 +1015 @@
 }
 
-#ifdef HAVE_RING2TOM
-/* TODO move to numbers.cc
- */
-inline int nComp(NATNUMBER a, NATNUMBER b)
-{
-  assume(a != 0 && b != 0);
-  while (a % 2 == 0 && b % 2 == 0)
-  {
-    a = a / 2;
-    b = b / 2;
-  }
-  if (a % 2 == 0)
-  {
-    return -1;
-  }
-  else
-  {
-    if (b % 2 == 1)
-    {
-      return 0;
-    }
-    else
-    {
-      return 1;
-    }
-  }
-}
-
+#ifdef HAVE_RINGS
 /*2
 * put the pair (s[i],p)  into the set B, ecart=ecart(p) (ring case)
@@ -1088 +1054 @@
   {
     compare=pDivCompRing(strat->B[j].lcm,Lp.lcm);
-    compareCoeff = nComp((long) pGetCoeff(strat->B[j].lcm), (long) pGetCoeff(Lp.lcm));
+    compareCoeff = nComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm));
     if (compareCoeff == 0 || compare == compareCoeff)
     {
@@ -1111 +1077 @@
     {
       // Add hint for same LM and direction of LC (later) (TODO Oliver)
-      if (compareCoeff == 1)
+      if (compareCoeff == pDivComp_LESS)
       {
         strat->c3++;
@@ -1122 +1088 @@
       }
       else
-      if (compareCoeff == -1)
+      if (compareCoeff == pDivComp_GREATER)
       {
         deleteInL(strat->B,&strat->Bl,j,strat);
@@ -1808 +1774 @@
 }
 
-#ifdef HAVE_RING2TOM
+#ifdef HAVE_RINGS
 /*2
 *the pairset B of pairs of type (s[i],p) is complete now. It will be updated
@@ -1936 +1902 @@
   }
 }
-
+#endif
+
+#ifdef HAVE_RING2TOM
 long twoPow(long arg)
 {
@@ -1996 +1964 @@
   {
     compare=pDivCompRing(strat->B[j].lcm,Lp.lcm);
-    compareCoeff = nComp((long) pGetCoeff(strat->B[j].lcm), (long) pGetCoeff(Lp.lcm));
+    compareCoeff = nComp(pGetCoeff(strat->B[j].lcm), pGetCoeff(Lp.lcm));
     if (compareCoeff == 0 || compare == compareCoeff)
     {
@@ -2343 +2311 @@
   idSkipZeroes(G0);
   return G0;
-}
-
+}   
+#endif
+
+#ifdef HAVE_RINGS
 /*2
 *(s[0],h),...,(s[k],h) will be put to the pairset L
@@ -2413 +2383 @@
 void enterExtendedSpoly(poly h,kStrategy strat)
 {
-  if (((long) ((h)->coef)) % 2 == 0)
-  {
-    long a = ((long) ((h)->coef)) / 2;
+  number gcd = nGcd((number) 0, pGetCoeff(h), strat->tailRing);
+  if ((NATNUMBER) gcd > 1)
+  {
+    poly p = p_Copy(h->next, strat->tailRing);
+/*    long a = ((long) ((h)->coef)) / 2;
     long b = currRing->ch - 1;
-    poly p = p_Copy(h->next, strat->tailRing);
     while (a % 2 == 0)
     {
@@ -2423 +2394 @@
       b--;
     }
-    p = p_Mult_nn(p, (number) twoPow(b), strat->tailRing);
+    p = p_Mult_nn(p, (number) twoPow(b), strat->tailRing); */
+    p = p_Mult_nn(p, nIntDiv(0, gcd), strat->tailRing);
 
     if (p != NULL)
@@ -2665 +2637 @@
   else
   {
-#ifdef HAVE_RING2TOM
-    if (rField_is_Ring_2toM(currRing))
+#ifdef HAVE_RINGS
+    if (rField_is_Ring(currRing))
     {
       if (pLmCmp(set[length],p)== -cmp_int)
@@ -5166 +5138 @@
   else if (BTEST1(12) || BTEST1(14) || BTEST1(16) || BTEST1(18))
     strat->posInT = posInT1;
-#ifdef HAVE_RING2TOM
+#ifdef HAVE_RINGS
   if (rField_is_Ring(currRing))
   {
@@ -5496 +5468 @@
                                   // might be too strong
 #ifdef HAVE_RINGS
-                                  (strat->homog && pFDeg == pDeg && rField_is_Ring(currRing)), // TODO Oliver
+                                  (strat->homog && pFDeg == pDeg && !(rField_is_Ring(currRing))), // TODO Oliver
 #else
                                   (strat->homog && pFDeg == pDeg),