Changeset 585bbcb in git for kernel/polys.cc

Timestamp:

Nov 27, 2005, 4:28:46 PM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

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

Children:

6a972af1108afd9ad6a0a74a519e0b3107421d16

Parents:

f498f1081627c853c4d77077fcaa2ea32d82a711

Message:

Makefile.in:
--> rmodulo2m.[h/cc] in HEADERS / CXXSOURCES eingetragen

kspoly.cc:
--> ksReducePoly beachtet Nullteiler
--> ksRingReducePoly (neu)
--> ksCreateSpoly beachtet Nullteiler

kstd1.cc:
--> use strat->red = redRing2toM if currRing->cring == 1

kstd2.cc:
--> kRingFindDivisibleByInT (neu)
--> kRingFindDivisibleByInS (neu)
--> redRing2toM (neu)

kutil.cc:
--> kRingFindDivisibleByInS (neu)
--> redTailBba beachtet Nullteiler und andere Strategien (zum Teil)

kutil.h:
--> int redRing2toM (LObject* h,kStrategy strat); (neu)
--> Dekl. von kRingFind* und ksRingReducePoly

numbers.cc:
--> Unterstützung für Z/2^m

pDebug.cc:
--> p_DebugLmDivisibleByNoComp beachtet coeff für Ringe

pInline1.h:
--> *LmRing* Teilbarkeit mit Beachtung des Koeff

p_Minus_mm_Mult_qq__T.cc:
--> Term*Term = 0 möglich

polys.cc:
--> nGetUnit (neu)
--> pNorm beachtet Nullteiler

polys.h:
--> nGetUnit (neu)

polys1.cc:
--> pCleardenom: in case of ring, just do a pNorm
--> pContent: in case of ring do nothing

pp_Mult_mm__T.cc:
--> Term*Term = 0 möglich bei KoeffRing

ring.cc:
--> rSetOption: setze intStrategy

ring.h:
--> rField_is_Ring_2toM (neu)
--> alle anderen Fkt. angepasst

ringgb.cc, ringgb.h: test container in Zshg. mit extra.cc

structs.h:
--> ring->cring property (neu) cring = 0 bei Körpern, cring = 1 bei Z/2^m


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

File:

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

kernel/polys.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys.cc,v 1.6 2005-04-21 17:15:49 Singular Exp $ */
+/* $Id: polys.cc,v 1.7 2005-11-27 15:28:45 wienand Exp $ */
 
 /*
@@ -651 +651 @@
 }
 
+#ifdef HAVE_RING2TOM
+number nGetUnit(number k) {
+  long test = (long) k;
+  while (test%2 == 0) {
+    test = test / 2;
+  }
+  return (number) test;
+}
+#endif
 
 /*2
@@ -659 +668 @@
   poly h;
   number k, c;
-
+#ifdef HAVE_RING2TOM
+  if (currRing->cring != 0)
+  {
+    if (p1!=NULL)
+    {
+      k = nGetUnit(pGetCoeff(p1));
+      if (!nIsOne(k))
+      {
+        k = nGetUnit(pGetCoeff(p1));
+        c = nDiv(pGetCoeff(p1), k);
+        pSetCoeff0(p1, c);
+        h = pNext(p1);
+        while (h != NULL)
+        {
+          c = nDiv(pGetCoeff(h), k);
+          pSetCoeff(h, c);
+          pIter(h);
+        }
+        nDelete(&k);
+      }
+     return;
+    }
+  }
+#endif  
   if (p1!=NULL)
   {
@@ -670 +702 @@
     {
       nNormalize(pGetCoeff(p1));
-      k=pGetCoeff(p1);
+      k = pGetCoeff(p1);
       c = nInit(1);
       pSetCoeff0(p1,c);
@@ -701 +733 @@
 *normalize all coefficients
 */
-void p_Normalize(poly p, ring r) 
+void p_Normalize(poly p, ring r)
 {
   if (rField_has_simple_inverse(r)) return; /* Z/p, GF(p,n), R, long R/C */