Changeset f4b180 in git

Timestamp:

Sep 26, 2007, 5:07:16 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

a094d6f29cc607482d3c6933b8425c059b4136fe

Parents:

08a6ebb93a83d74ddbebc285cfd635bbda6ce13c

Message:

*hanne: fix test for unlucky primes


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

File:

• factory/cf_gcd.cc (modified) (9 diffs)

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.51 2007-09-26 14:31:12 Singular Exp $ */
+/* $Id: cf_gcd.cc,v 1.52 2007-09-26 15:07:16 Singular Exp $ */
 
 #include <config.h>
@@ -33 +33 @@
 CanonicalForm
 chinrem_gcd ( const CanonicalForm & FF, const CanonicalForm & GG );
- 
+
 bool
 gcd_test_one ( const CanonicalForm & f, const CanonicalForm & g, bool swap )
@@ -706 +706 @@
 #else
                 while(1)
-                { 
-                  d = gcd_poly( f, g ); 
+                {
+                  d = gcd_poly( f, g );
                   if ((fdivides(d,f)) && (fdivides(d,g))) break;
                   printf("g"); fflush(stdout);
@@ -930 +930 @@
     for ( i = n-1; i > 0; i-- )
     {
-        if ( degsf[i] == 0 )
+        if ( degsf[i] == 0 )
         {
             if ( degsg[i] != 0 )
@@ -953 +953 @@
     if ( ( pe != 1 ) && ( degsf[1] != 0 ) )
         pe = -pe;
-    
+
     delete [] degsf;
     delete [] degsg;
@@ -976 +976 @@
             result += power( x, i.exp() ) * c;
         }
-        else 
+        else
           result += power( x, i.exp() ) * balance_p(c,q);
     }
@@ -1036 +1036 @@
         D = newD;
       }
-      else if ( dp_deg > d_deg )
+      else if ( dp_deg < d_deg )
       {
         n=GCD_CHINES_MIN_TRIES;
@@ -1044 +1044 @@
         d_deg=dp_deg;
       }
-      //else dp_deg < d_deg: bad prime
+      //else dp_deg > d_deg: bad prime
     }
     if ( i >= 0 )
@@ -1051 +1051 @@
       {
         CanonicalForm Dn= Farey(D,q);
-        int is_rat=isOn(SW_RATIONAL);
-        On(SW_RATIONAL);
+        int is_rat=isOn(SW_RATIONAL);
+        On(SW_RATIONAL);
         CanonicalForm cd = bCommonDen( Dn ); // we need On(SW_RATIONAL)
-        if (!is_rat) Off(SW_RATIONAL);
+        if (!is_rat) Off(SW_RATIONAL);
         Dn *=cd;
         //Dn /=vcontent(Dn,Variable(1));