Changeset df497a in git

Timestamp:

Feb 17, 2006, 12:28:43 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

e4e1c2a662f1cc939b50e44a501ff016ef4d1e16

Parents:

ad6ad248b17525d3c24a305a72c5bc48027f3a32

Message:

*hannes: tests restructured


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

File:

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

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.38 2006-02-01 09:37:07 pohl Exp $ */
+/* $Id: cf_gcd.cc,v 1.39 2006-02-17 11:28:43 Singular Exp $ */
 
 #include <config.h>
@@ -44 +44 @@
         lcg = LC( g, Variable(1) );
     }
-    while ( ( e( lcf ).isZero() || e( lcg ).isZero() ) && count < 100 ) {
+    #define TEST_ONE_MAX 50
+    while ( ( e( lcf ).isZero() || e( lcg ).isZero() ) && count < TEST_ONE_MAX )
+    {
         e.nextpoint();
         count++;
     }
-    if ( count == 100 )
+    if ( count == TEST_ONE_MAX )
         return false;
     CanonicalForm F, G;
@@ -357 +359 @@
 gcd_poly1( const CanonicalForm & f, const CanonicalForm & g, bool modularflag )
 {
-    CanonicalForm C, Ci, Ci1, Hi, bi, pi, pi1, pi2;
+    CanonicalForm pi, pi1;
+    Variable v = f.mvar();
+
+    if ( f.degree( v ) >= g.degree( v ) )
+    {
+        pi = f; pi1 = g;
+    }
+    else
+    {
+        pi = g; pi1 = f;
+    }
+    CanonicalForm C, Ci, Ci1, Hi, bi, pi2;
     int delta;
-    Variable v = f.mvar();
-
-    if ( f.degree( v ) >= g.degree( v ) ) {
-        pi = f; pi1 = g;
-    }
-    else {
-        pi = g; pi1 = f;
-    }
     Ci = content( pi ); Ci1 = content( pi1 );
+    pi1 = pi1 / Ci1; pi = pi / Ci;
     C = gcd( Ci, Ci1 );
-    pi1 = pi1 / Ci1; pi = pi / Ci;
     if ( pi.isUnivariate() && pi1.isUnivariate() )
     {
 #ifdef HAVE_NTL
-      if ((isOn(SW_USE_NTL_GCD_P)||isOn(SW_USE_NTL_GCD_0))
-       && isPurePoly(pi) && isPurePoly(pi1))
-         return gcd_poly_univar0(f, g, true);
-#endif
+      if (( modularflag) ||
+      ((isOn(SW_USE_NTL_GCD_P)||isOn(SW_USE_NTL_GCD_0))
+       && isPurePoly(pi) && isPurePoly(pi1)))
+         return gcd_poly_univar0(pi, pi1, true) * C;
+#else
       if ( modularflag)
         return gcd_poly_univar0( pi, pi1, true ) * C;
+#endif
     }
     else if ( gcd_test_one( pi1, pi, true ) )
@@ -403 +410 @@
     if ( degree( pi1, v ) == 0 )
         return C;
-    else {
+    else
         return C * pp( pi );
-    }
 }