Changeset f92547 in git for kernel/kspoly.cc

Timestamp:

Mar 20, 2006, 9:33:57 PM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

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

Children:

9a7b03d261325d1fc155f5625fe1867b6ef6432c

Parents:

f7cbb7696d6c24ac0b31ebc09c768d0a3df1a7a9

Message:

*oliver

kspoly.cc:
--> kscheckcoef
      * modified for zero divisors
--> ksCreateShortSPoly
      * create correct short s poly for rings
      * in case of rings, also calculate coeff

kstd2.cc:
--> bba
      * use different enterpairs method in case of rings
      * small changes (replaced p_ISet by p_NSet)

kutil.cc, kutil.h:
--> new enterpairs derivate, also downstreams are
     new derivates of functions
--> function to create extended s poly for rings
--> nComp fct, will be nGreater later, maybe
--> stub for chainCritRing

polys.cc:
--> chainCrit correct for rings, but not optimized

numbers.cc, rmodulo2m.cc, rmodulo2m.h:
--> gcd, ncd for zero divisor (att, not really a gcd or ncd)
--> IntDiv (att, just takes a machine div, allows to divide by zero div)
--> Greater (att, compares zero divisor exponent)


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

File:

• kernel/kspoly.cc (modified) (8 diffs)

kernel/kspoly.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kspoly.cc,v 1.3 2006-01-13 18:10:04 wienand Exp $ */
+/* $Id: kspoly.cc,v 1.4 2006-03-20 20:33:56 wienand Exp $ */
 /*
 *  ABSTRACT -  Routines for Spoly creation and reductions
@@ -14 +14 @@
 #include "p_Procs.h"
 #include "gring.h"
+#ifdef HAVE_RING2TOM
+#include "polys.h"
+#endif
 
 #ifdef KDEBUG
@@ -312 +315 @@
     bn = nIntDiv(bn, cn);
   }
-#ifdef HAVE_RING2TOM
-  if (currRing->cring == 1) {
-    while (((long) an)%2 == 0 && ((long) bn)%2 == 0) {
-      an = (number) (((long) an) / 2);
-      bn = (number) (((long) bn) / 2);
-    }
-  }
-#endif
   nDelete(&cn);
   if (nIsOne(an))
@@ -339 +334 @@
 * remarks:
 *   1. the coefficient is 0 (nNew)
+*   1. a) in the case of coefficient ring, the coefficient is calculated
 *   2. pNext is undefined
 */
@@ -352 +348 @@
   BOOLEAN equal;
 
+#ifdef HAVE_RING2TOM
+  number lc1 = pGetCoeff(p1), lc2 = pGetCoeff(p2);
+  int ct = ksCheckCoeff(&lc1, &lc2); // gcd and zero divisors
+  if (currRing->cring == 1)
+  {
+    if (a1 != NULL) t2 = nMult(pGetCoeff(a1),lc2);
+    if (a2 != NULL) t1 = nMult(pGetCoeff(a2),lc1);
+    while (a1 != NULL && nIsZero(t2))
+    {
+      pIter(a1);
+      if (a1 != NULL) t2 = nMult(pGetCoeff(a1),lc2);
+    }
+    while (a2 != NULL && nIsZero(t1))
+    {
+      pIter(a2);
+      if (a2 != NULL) t1 = nMult(pGetCoeff(a2),lc1);
+    }
+  }
+#endif
+
   if (a1==NULL)
   {
@@ -379 +395 @@
       }
       p_Setm(m2, currRing);
-      nNew(&(pGetCoeff(m2)));
+#ifdef HAVE_RING2TOM
+      if (currRing->cring == 1)
+          pSetCoeff(m2, t1);
+      else
+#endif
+        nNew(&(pGetCoeff(m2)));
       return m2;
     }
@@ -410 +431 @@
     }
     p_Setm(m1, currRing);
-    nNew(&(pGetCoeff(m1)));
+#ifdef HAVE_RING2TOM
+    if (currRing->cring == 1)
+        pSetCoeff(m1, t2);
+    else
+#endif
+      nNew(&(pGetCoeff(m1)));
     return m1;
   }
@@ -467 +493 @@
       }
     }
-    t1 = nMult(pGetCoeff(a2),pGetCoeff(p1));
-    t2 = nMult(pGetCoeff(a1),pGetCoeff(p2));
-    equal = nEqual(t1,t2);
-    nDelete(&t2);
-    nDelete(&t1);
+#ifdef HAVE_RING2TOM
+    if (currRing->cring == 1)
+    {
+      t1 = nAdd(t1, t2);
+      equal = nIsZero(t1);
+      nDelete(&t2);
+    }
+    else
+#endif
+    {
+      t1 = nMult(pGetCoeff(a2),pGetCoeff(p1));
+      t2 = nMult(pGetCoeff(a1),pGetCoeff(p2));
+      equal = nEqual(t1,t2);
+      nDelete(&t2);
+      nDelete(&t1);
+    }
     if (!equal)
     {
       p_LmFree(m2,currRing);
-      nNew(&(pGetCoeff(m1)));
+#ifdef HAVE_RING2TOM
+      if (currRing->cring == 1)
+          pSetCoeff(m1, t1);
+      else
+#endif
+        nNew(&(pGetCoeff(m1)));
       return m1;
     }
     pIter(a1);
     pIter(a2);
+#ifdef HAVE_RING2TOM
+    if (currRing->cring == 1)
+    {
+      nDelete(&t1);
+      if (a2 != NULL) t1 = nMult(pGetCoeff(a2),lc1);
+      if (a1 != NULL) t2 = nMult(pGetCoeff(a1),lc2);
+      while (a1 != NULL && nIsZero(t2))
+      {
+        pIter(a1);
+        if (a1 != NULL) t2 = nMult(pGetCoeff(a1),lc2);
+      }
+      while (a2 != NULL && nIsZero(t1))
+      {
+        pIter(a2);
+        if (a2 != NULL) t1 = nMult(pGetCoeff(a2),lc1);
+      }
+    }
+#endif
     if (a2==NULL)
     {