Changeset ebc602 in git

Timestamp:

May 16, 2006, 3:43:19 PM (17 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

dbcf42a937f51948f4de74902429b68c1b54592b

Parents:

b8b01af0e7839f5203fa9378d74dad8732160032

Message:

*hannes: gcc 4.1 fix: divies ->fdivides


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

Location:

factory

Files:

• cf_algorithm.cc (modified) (4 diffs)
• cf_algorithm.h (modified) (2 diffs)
• cf_gcd.cc (modified) (5 diffs)
• fac_distrib.cc (modified) (3 diffs)
• fac_ezgcd.cc (modified) (3 diffs)
• sm_sparsemod.cc (modified) (4 diffs)

factory/cf_algorithm.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_algorithm.cc,v 1.10 2005-12-09 08:35:37 Singular Exp $ */
+/* $Id: cf_algorithm.cc,v 1.11 2006-05-16 13:43:18 Singular Exp $ */
 
 //{{{ docu
@@ -293 +293 @@
 //}}}
 
-//{{{ bool divides ( const CanonicalForm & f, const CanonicalForm & g )
-//{{{ docu
-//
-// divides() - check whether `f' divides `g'.
+//{{{ bool fdivides ( const CanonicalForm & f, const CanonicalForm & g )
+//{{{ docu
+//
+// fdivides() - check whether `f' divides `g'.
 //
 // Returns true iff `f' divides `g'.  Uses some extra heuristic
@@ -315 +315 @@
 // Developers note:
 // ----------------
-// One may consider the the test `divides( f.LC(), g.LC() )' in
+// One may consider the the test `fdivides( f.LC(), g.LC() )' in
 // the main `if'-test superfluous since `divremt()' in the
 // `if'-body repeats the test.  However, `divremt()' does not use
 // any heuristic to do so.
 //
-// It seems not reasonable to call `divides()' from `divremt()'
-// to check divisibility of leading coefficients.  `divides()' is
+// It seems not reasonable to call `fdivides()' from `divremt()'
+// to check divisibility of leading coefficients.  `fdivides()' is
 // on a relatively high level compared to `divremt()'.
 //
 //}}}
 bool
-divides ( const CanonicalForm & f, const CanonicalForm & g )
+fdivides ( const CanonicalForm & f, const CanonicalForm & g )
 {
     // trivial cases
@@ -351 +351 @@
         // f and g are polynomials in the same main variable
         if ( degree( f ) <= degree( g )
-             && divides( f.tailcoeff(), g.tailcoeff() )
-             && divides( f.LC(), g.LC() ) ) {
+             && fdivides( f.tailcoeff(), g.tailcoeff() )
+             && fdivides( f.LC(), g.LC() ) ) {
             CanonicalForm q, r;
             return divremt( g, f, q, r ) && r.isZero();

factory/cf_algorithm.h

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_algorithm.h,v 1.13 2006-05-15 08:17:36 Singular Exp $ */
+/* $Id: cf_algorithm.h,v 1.14 2006-05-16 13:43:18 Singular Exp $ */
 
 #ifndef INCL_CF_ALGORITHM_H
@@ -40 +40 @@
 CanonicalForm bCommonDen ( const CanonicalForm & f );
 
-bool divides ( const CanonicalForm & f, const CanonicalForm & g );
+bool fdivides ( const CanonicalForm & f, const CanonicalForm & g );
 
 CanonicalForm maxNorm ( const CanonicalForm & f );

factory/cf_gcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: cf_gcd.cc,v 1.46 2006-05-08 12:24:04 pohl Exp $ */
+/* $Id: cf_gcd.cc,v 1.47 2006-05-16 13:43:18 Singular Exp $ */
 
 #include <config.h>
@@ -270 +270 @@
       // now balance D mod q
       D = pp( balance( D, q ) );
-      if ( divides( D, f ) && divides( D, g ) )
+      if ( fdivides( D, f ) && fdivides( D, g ) )
         return D * c;
       else
@@ -620 +620 @@
         else
         {
-            if ( divides( f, g ) )
+            if ( fdivides( f, g ) )
                 return abs( f );
-            else  if ( divides( g, f ) )
+            else  if ( fdivides( g, f ) )
                 return abs( g );
             if ( !( getCharacteristic() == 0 && isOn( SW_RATIONAL ) ) )
@@ -628 +628 @@
                 CanonicalForm d;
                 do{ d = gcd_poly( f, g ); }
-                while ((!divides(d,f)) || (!divides(d,g)));
+                while ((!fdivides(d,f)) || (!fdivides(d,g)));
                 return abs( d );
             }
@@ -641 +641 @@
                 Off( SW_RATIONAL );
                 do { l = gcd_poly( F, G ); }
-                while ((!divides(l,F)) || (!divides(l,G)));
+                while ((!fdivides(l,F)) || (!fdivides(l,G)));
                 On( SW_RATIONAL );
                 return abs( l );

factory/fac_distrib.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_distrib.cc,v 1.7 2002-10-10 17:43:40 Singular Exp $ */
+/* $Id: fac_distrib.cc,v 1.8 2006-05-16 13:43:18 Singular Exp $ */
 
 #include <config.h>
@@ -79 +79 @@
             ut = lc( G[j] );
             DEBOUTLN( cerr, "checking with " << ut );
-            while ( m > 0 && divides( D[i], ut ) ) {
+            while ( m > 0 && fdivides( D[i], ut ) ) {
                 DEBOUTLN( cerr, "match found" );
                 m--; ut /= D[i];
@@ -129 +129 @@
             continue;
         }
-        while ( divides( h, f ) )
+        while ( fdivides( h, f ) )
             f /= h;
         CFList D( h );

factory/fac_ezgcd.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: fac_ezgcd.cc,v 1.26 2006-01-30 09:06:18 pohl Exp $ */
+/* $Id: fac_ezgcd.cc,v 1.27 2006-05-16 13:43:18 Singular Exp $ */
 
 #include <config.h>
@@ -110 +110 @@
         DEBOUTLN( cerr, "now after A4, delta = " << delta );
         /// ---> A5
-        if ( degF <= degG && delta == degF && divides( F, G ) )
+        if ( degF <= degG && delta == degF && fdivides( F, G ) )
         {
             DEBDECLEVEL( cerr, "ezgcd" );
             return d*F;
         }
-        if ( degG < degF && delta == degG && divides( G, F ) )
+        if ( degG < degF && delta == degG && fdivides( G, F ) )
         {
             DEBDECLEVEL( cerr, "ezgcd" );
@@ -183 +183 @@
               CanonicalForm cand=DD[2] / xxx; //content(DD[2],Variable(1));
 #if 0
-              gcdfound= divides(cand,G) &&  divides(cand,F);
+              gcdfound= fdivides(cand,G) &&  fdivides(cand,F);
 #else
               if (B_is_F /*B==F*lcF*/)
               {
                 DEBOUTLN( cerr, "(test) G: "<<G<<" % gcd:"<<cand<<" -> " << G%cand );
-                gcdfound= divides(cand,G);
+                gcdfound= fdivides(cand,G);
               }
               else
               {
                 DEBOUTLN( cerr, "(test) F: "<<F<<" % gcd:"<<cand<<" -> " << F%cand);
-                gcdfound= divides(cand,F);
+                gcdfound= fdivides(cand,F);
               }
 #endif

factory/sm_sparsemod.cc

@@ -1 +1 @@
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: sm_sparsemod.cc,v 1.8 2000-04-05 10:03:09 Singular Exp $ */
+/* $Id: sm_sparsemod.cc,v 1.9 2006-05-16 13:43:19 Singular Exp $ */
 
 //{{{ docu
@@ -454 +454 @@
       //cout << " lcggt = " << lcggt << endl;
       //bool ja;
-      //ja = divides( lcggt, lc( G[levU] ) );
+      //ja = fdivides( lcggt, lc( G[levU] ) );
       //cout << " ja = " << ja << endl;
       //cout << " vor Verlassen " << endl;
@@ -537 +537 @@
         res = result;
 
-      if ( divides( res, primif ) && divides( res, primig ) )
+      if ( fdivides( res, primif ) && fdivides( res, primig ) )
         return  N(NN(res))*N(ggt) ;     /// compress rueckgaengig machen!
       else
@@ -587 +587 @@
           res = result;
 
-        if ( ( divides( res, primif )) && ( divides ( res, primig ) ))
+        if ( ( fdivides( res, primif )) && ( fdivides ( res, primig ) ))
         {
           // make monic ////