Changeset 009d80 in git for kernel/polys.cc

Timestamp:

May 10, 2007, 10:12:44 AM (16 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

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

Children:

4cd2f891f36b9e1d58f0aeaa4683254f54088298

Parents:

4bebba7353438f052b4ad581ede34fa6f31e5a71

Message:

new compile switch: HAVE_RINGS
at total there are now: HAVE_RINGS, HAVE_RING2TOM, HAVE_RINGMODN

kspoly.cc, kstd1.cc, kstd2.cc, kutil.cc, kspoly.cc, polys.cc, ring.*:
adaption of new switches and rField_is_Ring method

numbers.*:
introduced new operation:
  nDivBy(a, b) = Is a divisible by b?

pDebig.cc, pInline1.h:
use of new nDivBy method

p_Mult_q:
new routine for rings

p_*, pp_*:
template switch HAVE_ZERODIVISOR

polys1.cc:
poly exponentation, switches

rmodulo*:
nDivBy implementation, DBTest

structs.h:
nDivBy, ringtype, ringflaga, ringflagb


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

File:

• kernel/polys.cc (modified) (6 diffs)

kernel/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.15 2007-05-03 13:50:09 wienand Exp $ */
+/* $Id: polys.cc,v 1.16 2007-05-10 08:12:42 wienand Exp $ */
 
 /*
@@ -141 +141 @@
   poly prev=NULL;
   int i;
-#ifdef HAVE_RINGMODN
-  if (currRing->cring == 2)
-  {
-    WarnS("Not implemenet, 2007-05-03 12:22:46");
-  }   
-#endif
-#ifdef HAVE_RING2TOM
-  bool unit = true;
-  number inv = pGetCoeff(b);
-  if ((currRing->cring == 1) && ((long) pGetCoeff(b) % 2 == 0))
-  {
-    unit = false;
-  }
-  if (unit) inv=nInvers(inv);
+#ifdef HAVE_RINGS
+  number inv=pGetCoeff(b);
 #else
   number inv=nInvers(pGetCoeff(b));
@@ -184 +172 @@
     }
   }
-#ifdef HAVE_RING2TOM
-  if (!unit)
-  {
-    pDiv_nn(result,inv);
-  }
-  else
+#ifdef HAVE_RINGS
+  pDiv_nn(result,inv);
+#else
+  pMult_nn(result,inv);
 #endif
-  pMult_nn(result,inv);
   nDelete(&inv);
   pDelete(&b);
@@ -704 +689 @@
 }
 
-#ifdef HAVE_RING2TOM
+#ifdef HAVE_RINGS  //HACK TODO Oliver
 number nGetUnit(number k) {
-  long test = (long) k;
-  while (test%2 == 0) {
-    test = test / 2;
-  }
-  return (number) test;
+  return (number) nIntDiv(k, nGcd(k, 0, currRing));
 }
 #endif
@@ -721 +702 @@
   poly h;
   number k, c;
-#ifdef HAVE_RINGMODN
-  if (currRing->cring == 2)
-  {
-    WarnS("Not implemenet, 2007-05-03 12:22:46");
-  }   
-#endif
-#ifdef HAVE_RING2TOM
-  if (currRing->cring != 0)
+#ifdef HAVE_RINGS
+  if (rField_is_Ring(currRing))
   {
     if (p1!=NULL)
@@ -735 +710 @@
       if (!nIsOne(k))
       {
-        k = nGetUnit(pGetCoeff(p1));
         c = nDiv(pGetCoeff(p1), k);
         pSetCoeff0(p1, c);