Changeset 77f483 in git

Timestamp:

Jun 28, 2005, 4:39:52 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

fea91578e32b53237ec9712c2af66d889a3b6241

Parents:

3781a22b49bf6807b4bfa152e670e186f67e6e1a

Message:

*hannes: fixed rational coeffs in factorize


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

Location:

factory

Files:

• canonicalform.cc (modified) (2 diffs)
• cf_factor.cc (modified) (2 diffs)
• fac_multivar.cc (modified) (3 diffs)

factory/canonicalform.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: canonicalform.cc,v 1.33 2003-10-15 17:19:39 Singular Exp $ */
+/* $Id: canonicalform.cc,v 1.34 2005-06-28 14:39:52 Singular Exp $ */
 
 #include <config.h>
@@ -1545 +1545 @@
     if ( f.isZero() || g.isZero() )
         return CanonicalForm( 0 );
+/*
+    else if (f.isOne())
+        return g;
+    else if (g.isOne())
+        return f;
+*/
     else
         return (f / bgcd( f, g )) * g;

factory/cf_factor.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_factor.cc,v 1.23 2004-01-20 15:39:52 Singular Exp $ */
+/* $Id: cf_factor.cc,v 1.24 2005-06-28 14:39:52 Singular Exp $ */
 
 //{{{ docu
@@ -277 +277 @@
   else
   {
+    bool on_rational = isOn(SW_RATIONAL);
+    On(SW_RATIONAL);
     CanonicalForm cd = bCommonDen( f );
     CanonicalForm fz = f * cd;
-    bool on_rational = isOn(SW_RATIONAL);
     Off(SW_RATIONAL);
     if ( f.isUnivariate() )

factory/fac_multivar.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_multivar.cc,v 1.10 2002-10-24 12:17:49 Singular Exp $ */
+/* $Id: fac_multivar.cc,v 1.11 2005-06-28 14:39:52 Singular Exp $ */
 
 #include <config.h>
@@ -142 +142 @@
 #ifdef HAVE_NTL
 int prime_number=0;
-void find_good_prime(const CanonicalForm &f, const CanonicalForm &r,int &start)
+void find_good_prime(const CanonicalForm &f, int &start)
 {
   if (! f.inBaseDomain() )
   {
     int l = f.level();
-    for ( CFIterator i = f; i.hasTerms(); i++ )
+    CFIterator i = f;
+    for(;;)
     {
-      if((i.exp()!=0) && ((i.exp() % cf_getSmallPrime(start))==0))
+      if  ( i.hasTerms() )
       {
-        start++;
-        CanonicalForm ff=r;
-        find_good_prime(ff,r,start);
-        return;
+        find_good_prime(i.coeff(),start);
+        if((i.exp()!=0) && ((i.exp() % cf_getSmallPrime(start))==0))
+        {
+          start++;
+          i=f;
+        }
+        else  i++;
       }
-      find_good_prime(i.coeff(),r,start);
+      else break;
     }
   }
   else
   {
-    if(mod(f,cf_getSmallPrime(start))==0)
+    if (f.inZ())
     {
-      start++;
-      CanonicalForm ff=r;
-      find_good_prime(ff,r,start);
-    }
+      while((f!=0) && (mod(f,cf_getSmallPrime(start))==0))
+      {
+        start++;
+      }
+    }
+/* should not happen!
+    else if (f.inQ())
+    {
+      while((f.den()!=0) && (mod(f.den(),cf_getSmallPrime(start))==0))
+      {
+        start++;
+      }
+      while((f.num()!=0) && (mod(f.num(),cf_getSmallPrime(start))==0))
+      {
+        start++;
+      }
+    }
+    else
+          cout <<"??"<< f <<"\n";
+*/
   }
 }
@@ -234 +254 @@
         {
           int i=prime_number;
-          CanonicalForm f=arg;
-          find_good_prime(f,arg,i);
-          f=U0;
-          find_good_prime(f,U0,i);
-          f=U;
-          find_good_prime(f,U,i);
+          find_good_prime(arg,i);
+          find_good_prime(U0,i);
+          find_good_prime(U,i);
           int p=cf_getSmallPrime(i);
           //printf("found:p=%d (%d)\n",p,i);