Changeset cea6f3 in git for kernel/polys1.cc

Timestamp:

Jan 13, 2006, 7:10:06 PM (18 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2e4de3d33d0bea3780e1932fdaf8a41c161f473e

Parents:

4cbb61ba5014a593b9bc6569b497e9a8151bc15f

Message:

RING2TOM Merger


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

File:

• kernel/polys1.cc (modified) (3 diffs)

kernel/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.16 2005-11-27 15:28:46 wienand Exp $ */
+/* $Id: polys1.cc,v 1.17 2006-01-13 18:10:05 wienand Exp $ */
 
 /*
@@ -484 +484 @@
 {
 #ifdef HAVE_RING2TOM
-  if (currRing->cring!=0) return;  //TODO OLIVER
+  if (currRing->cring != 0) {
+    if (ph!=NULL)
+    {
+      number k = nGetUnit(pGetCoeff(ph));
+      poly h;
+      if (!nIsOne(k))
+      {
+        k = nGetUnit(pGetCoeff(ph));
+        pSetCoeff0(ph, nDiv(pGetCoeff(ph), k));
+        h = pNext(ph);
+        while (h != NULL)
+        {
+          pSetCoeff(h, nDiv(pGetCoeff(h), k));
+          pIter(h);
+        }
+        nDelete(&k);
+      }
+     return;
+    }
+    return;  //TODO OLIVER
+  }
 #endif
   number h,d;
@@ -1017 +1037 @@
 #ifdef HAVE_RING2TOM
   if (currRing->cring == 1) {
-    pNorm(ph);
+    pContent(ph);
     return;
   }