Changeset ffdd694 in git

Timestamp:

Apr 14, 2005, 10:19:18 AM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b9f50b373314e74e83c7c060a651dd2913e1f033')

Children:

dee0c0bfc5091a87dbbbefd919c1b23da3276c0a

Parents:

6fdd4ac98b7f7b14b745342085283579f7b15c9d

Message:

*hannes: pCleardenom again


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

File:

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

kernel/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.6 2005-04-13 16:38:10 Singular Exp $
+// $Id: clapsing.cc,v 1.7 2005-04-14 08:19:18 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -741 +741 @@
   CFFList L;
   number N=NULL;
+  number NN=NULL;
   CanonicalForm T_F(0);
   number old_lead_coeff=nCopy(pGetCoeff(f));
 
+  if (!rField_is_Zp()) /* Q, Q(a), Zp(a) */
+  {
+    //if (f!=NULL) // already tested at start of routine
+    {
+      number n0=nCopy(pGetCoeff(f));
+      if (with_exps==0)
+        N=nCopy(n0);
+      pCleardenom(f);
+      NN=nDiv(n0,pGetCoeff(f));
+      nDelete(&n0);
+      if (with_exps==0)
+      {
+        nDelete(&N);
+        N=nCopy(NN);
+      }
+    }
+  }
   if (rField_is_Q() || rField_is_Zp())
   {
     setCharacteristic( nGetChar() );
-    if (nGetChar()==0) /* Q */
-    {
-      //if (f!=NULL) // already tested at start of routine
-      {
-        pCleardenom_n(f,N);
-      }
-    }
     CanonicalForm F( convSingPClapP( f ) );
     T_F=F;
@@ -791 +802 @@
     if (rField_is_Q_a()) setCharacteristic( 0 );
     else                 setCharacteristic( -nGetChar() );
-    pCleardenom_n(f,N);
     if (currRing->minpoly!=NULL)
     {
@@ -972 +982 @@
     {
       pMult_nn(res->m[0],N);
+      nDelete(&N);
+      N=NULL;
     }
     // delete constants
@@ -1046 +1058 @@
   if (res==NULL)
     WerrorS( feNotImplemented );
-  if (N!=NULL)
-  {
-    number NN=nInvers(N);
+  if (NN!=NULL)
+  {
     pMult_nn(f,NN);
     nDelete(&NN);
+  }
+  if (N!=NULL)
+  {
     nDelete(&N);
   }