Changeset 1a5daea in git

Timestamp:

Sep 18, 1997, 4:08:22 PM (27 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

ca53ce549faa21140de4aa45f553d081e6888163

Parents:

5dc4ea4d2e5e725fea3a3273f88c1e2d6ac1b22a

Message:

* hannes: bug fixes to naNormalize/pContent/pCleardenom
  (clapconv.cc clapsing.cc clapsing.h longalg.cc longrat.cc polys1.cc)


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

Location:

Singular

Files:

• clapconv.cc (modified) (7 diffs)
• clapsing.cc (modified) (2 diffs)
• clapsing.h (modified) (2 diffs)
• longalg.cc (modified) (4 diffs)
• longrat.cc (modified) (5 diffs)
• polys1.cc (modified) (2 diffs)

Singular/clapconv.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapconv.cc,v 1.7 1997-09-16 13:45:28 Singular Exp $
+// $Id: clapconv.cc,v 1.8 1997-09-18 14:08:17 Singular Exp $
 /*
 * ABSTRACT: convert data between Singular and factory
@@ -191 +191 @@
           MP_INT num, den;
           On(SW_RATIONAL);
-          Print("switch to rational\n");
+          #ifdef LDEBUG
+            PrintS("switch to rational\n");
+          #endif
           mpz_init_set( &num, &(napGetCoeff( p )->z) );
           mpz_init_set( &den, &(napGetCoeff( p )->n) );
@@ -200 +202 @@
           MP_INT num, den;
           On(SW_RATIONAL);
-          Print("switch to rational ?1\n");
+          #ifdef LDEBUG
+            PrintS("switch to rational ?1\n");
+          #endif
           mpz_init_set( &num, &(napGetCoeff( p )->z) );
           mpz_init_set( &den, &(napGetCoeff( p )->n) );
@@ -394 +398 @@
           MP_INT num, den;
           On(SW_RATIONAL);
-          Print("switch to rational\n");
+          #ifdef LDEBUG
+            PrintS("switch to rational\n");
+          #endif  
           mpz_init_set( &num, &(napGetCoeff( p )->z) );
           mpz_init_set( &den, &(napGetCoeff( p )->n) );
@@ -403 +409 @@
           MP_INT num, den;
           On(SW_RATIONAL);
-          Print("switch to rational ?2\n");
+          #ifdef LDEBUG
+            PrintS("switch to rational ?2\n");
+          #endif  
           mpz_init_set( &num, &(napGetCoeff( p )->z) );
           mpz_init_set( &den, &(napGetCoeff( p )->n) );
@@ -433 +441 @@
       z->s = 0;
     }
+    #ifdef LDEBUG
+    z->debug=123456;
+    nlDBTest(z,__FILE__,__LINE__);
+    #endif
     return z;
   }
@@ -467 +479 @@
   while ( p!=NULL )
   {
-    nNormalize(&pGetCoeff(p));
+    nNormalize(pGetCoeff(p));
     CanonicalForm term=convSingTrClapP(((lnumber)pGetCoeff(p))->z);
     for ( int i = 1; i <= n; i++ )

Singular/clapsing.cc

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.cc,v 1.13 1997-09-16 13:45:29 Singular Exp $
+// $Id: clapsing.cc,v 1.14 1997-09-18 14:08:18 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -857 +857 @@
  return res;
 }
+
+void singclap_algdividecontent ( alg f, alg g, alg &ff, alg &gg )
+{
+  // over Q(a) / Fp(a)
+ if (nGetChar()==1) setCharacteristic( 0 );
+ else               setCharacteristic( -nGetChar() );
+ ff=gg=NULL;
+ if (currRing->minpoly!=NULL)
+ {
+   CanonicalForm mipo=convSingTrClapP(((lnumber)currRing->minpoly)->z);
+   Variable a=rootOf(mipo);
+   CanonicalForm F( convSingAClapA( f,a ) ), G( convSingAClapA( g,a ) );
+   CanonicalForm GCD=gcd( F, G );
+   if (GCD!=1)
+   {
+     ff= convClapASingA( F/ GCD );
+     gg= convClapASingA( G/ GCD );
+   }  
+ }
+ else
+ {
+   CanonicalForm F( convSingTrClapP( f ) ), G( convSingTrClapP( g ) );
+   CanonicalForm GCD=gcd( F, G );
+   if (GCD!=1)
+   {
+     ff= convClapPSingTr( F/ GCD );
+     gg= convClapPSingTr( G/ GCD );
+   }  
+ }
+ Off(SW_RATIONAL);
+}
 #endif

Singular/clapsing.h

@@ -3 +3 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-// $Id: clapsing.h,v 1.3 1997-09-16 13:45:30 Singular Exp $
+// $Id: clapsing.h,v 1.4 1997-09-18 14:08:19 Singular Exp $
 /*
 * ABSTRACT: interface between Singular and factory
@@ -22 +22 @@
 poly singclap_gcd ( poly f, poly g );
 alg singclap_alglcm ( alg f, alg g );
+void singclap_algdividecontent ( alg f, alg g, alg &ff, alg &gg );
 
 poly singclap_resultant ( poly f, poly g , poly x);

Singular/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.12 1997-09-18 09:58:20 Singular Exp $ */
+/* $Id: longalg.cc,v 1.13 1997-09-18 14:08:19 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -335 +335 @@
       a = a->ne = a1;
       a1 = a1->ne;
-      if (!a1)
+      if (a1==NULL)
       {
         a->ne= a2;
@@ -346 +346 @@
       a = a->ne = a2;
       a2 = a2->ne;
-      if (!a2)
+      if (a2==NULL)
       {
         a->ne = a1;
@@ -2003 +2003 @@
   else
   {
-    alg l=singclap_alglcm(x,y);
-    if (napDeg(l)>0)
-    {
-      alg h,r;
-      napDivMod(x,l,&h,&r);
-      if (r!=NULL)
-      {
-        WerrorS("internal error (1) while normalizing");
-        p->z=h;
-      }
-      napDivMod(y,l,&h,&r);
-      if (r!=NULL)
-      {
-        WerrorS("internal error (2) while normalizing");
-        p->n=h;
-      }
-    }
-    napDelete(&l);
+    alg xx,yy;
+    singclap_algdividecontent(x,y,xx,yy);
+    if (xx!=NULL)
+    {
+      p->z=xx;
+      p->n=yy;
+      napDelete(&x);
+      napDelete(&y);
+    }  
   }
 #endif

Singular/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.12 1997-08-14 13:10:45 Singular Exp $ */
+/* $Id: longrat.cc,v 1.13 1997-09-18 14:08:20 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -145 +145 @@
 #ifdef MDEBUG
   mmDBTestBlock(a,sizeof(*a),f,l);
-#else
+#endif
   if (a->debug!=123456)
   {
@@ -152 +152 @@
     return FALSE;
   }
-#endif
   if ((a->s<0)||(a->s>4))
   {
-    Print(" !!longrat:s=%d in %s:%d\n",a->s,f,l);
+    Print("!!longrat:s=%d in %s:%d\n",a->s,f,l);
     return FALSE;
   }
@@ -161 +160 @@
 #ifdef HAVE_LIBGMP2
   mmDBTestBlock(a->z._mp_d,a->z._mp_alloc*BYTES_PER_MP_LIMB,f,l);
+  if (a->z._mp_alloc==0)
 #else
   mmDBTestBlock(a->z.d,a->z.alloc*BYTES_PER_MP_LIMB,f,l);
-#endif
+  if(a->z.alloc==0)
+#endif
+    Print("!!longrat:z->alloc=0 in %s:%l\n",f,l);
 #endif
   if (a->s<2)
@@ -170 +172 @@
 #ifdef HAVE_LIBGMP2
     mmDBTestBlock(a->n._mp_d,a->n._mp_alloc*BYTES_PER_MP_LIMB,f,-l);
+    if (a->z._mp_alloc==0)
 #else
     mmDBTestBlock(a->n.d,a->n.alloc*BYTES_PER_MP_LIMB,f,-l);
-#endif
+    if(a->z.alloc==0)
+#endif
+      Print("!!longrat:n->alloc=0 in %s:%l\n",f,l);
 #endif
     if (mpz_cmp_si(&a->n,(long)1)==0)

Singular/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.5 1997-04-25 15:04:07 obachman Exp $ */
+/* $Id: polys1.cc,v 1.6 1997-09-18 14:08:22 Singular Exp $ */
 
 /*
@@ -906 +906 @@
       }
       nDelete(&h);
+      if (nGetChar()==1)
+      {
+        h = nInit(1);
+        p=ph;
+        while (p!=NULL)
+        {
+          d=nLcm(h,pGetCoeff(p));
+          nDelete(&h);
+          h=d;
+          pIter(p);
+        }
+        /* contains the 1/lcm of all denominators */
+        if(!nIsOne(h))
+        {
+          p = ph;
+          while (p!=NULL)
+          {
+            /* should be:
+            * number hh;
+            * nGetDenom(p->coef,&hh);
+            * nMult(&h,&hh,&d);
+            * nNormalize(d);
+            * nDelete(&hh);
+            * nMult(d,p->coef,&hh);
+            * nDelete(&d);
+            * nDelete(&(p->coef));
+            * p->coef =hh;
+            */
+            d=nMult(h,pGetCoeff(p));
+            nNormalize(d);
+            pSetCoeff(p,d);
+            pIter(p);
+          }
+          nDelete(&h);
+        }
+      }
     }
     pContent(ph);