Changeset 7d1c995 in git

Timestamp:

May 31, 2011, 3:48:35 PM (12 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

a8e8b95ce901a8a52041639c48329ebc09efae2b

Parents:

5b274570b3977c8b95131bdda194e0b179f17b8b

Message:

added test to prevent multiple inclusion of headers
moved function declarations from fieldGCD.h to algext.h
deleted broken routine univarQGCD 


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

Location:

factory

Files:

• GNUmakefile.in (modified) (1 diff)
• algext.cc (modified) (1 diff)
• algext.h (modified) (3 diffs)
• cf_gcd.cc (modified) (2 diffs)
• facAlgExt.h (modified) (2 diffs)
• fieldGCD.h (modified) (1 diff)

factory/GNUmakefile.in

@@ -128 +128 @@
 # factory source files
 basefactorysrc := \
+                algext.cc \
                 canonicalform.cc \
                 cf_algorithm.cc \

factory/algext.cc

@@ -145 +145 @@
   return false;
 }
-
-CanonicalForm univarQGCD( const CanonicalForm & F, const CanonicalForm & G )
-{ // F,G in Q(a)[x]
-  CanonicalForm f, g, tmp, M, q, D, Dp, cl, newD, newq;
-  int p, dp_deg, bound, i;
-  bool fail;
-  On(SW_RATIONAL);
-  f = F * bCommonDen(F);
-  g = G * bCommonDen(G);
-  Variable a,b;
-  if( !hasFirstAlgVar( f, a ) && !hasFirstAlgVar( g, b ))
-  {
-    // F and G are in Q[x], call...
-#ifdef HAVE_NTL
-    if ( isOn( SW_USE_NTL_GCD_0 ))
-      return gcd_univar_ntl0( f, g );
-#endif
-    return gcd_poly_univar0( f, g, false );
-  }
-  if( b.level() > a.level() )
-    a = b;
-  // here: a is the biggest alg. var in f and g
-  tmp = getMipo(a);
-  M = tmp * bCommonDen(tmp);
-  Off(SW_RATIONAL);
-  // calculate upper bound for degree of gcd
-  bound = degree(f);
-  i = degree(g);
-  if( i < bound )
-    bound = i;
-
-  cl = lc(M) * lc(f) * lc(g);
-  q = 1;
-  D = 0;
-  for(i=cf_getNumBigPrimes()-1; i>-1; i--)
-  {
-    p = cf_getBigPrime(i);
-    if( mod( cl, p ).isZero() ) // skip lc-bad primes
-      continue;
-
-    fail = false;
-    setCharacteristic(p);
-    tryEuclid( mapinto(f), mapinto(g), mapinto(M), Dp, fail );
-    setCharacteristic(0);
-    if( fail ) // M splits in char p
-      continue;
-
-    dp_deg = degree(Dp);
-
-    if( dp_deg == 0 ) // early termination
-    {
-      CanonicalForm inv;
-      tryInvert(Dp, M, inv, fail);
-      if(fail)
-        continue;
-      return CanonicalForm(1);
-    }
-
-    if( dp_deg > bound ) // current prime unlucky
-      continue;
-
-    if( dp_deg < bound ) // all previous primes unlucky
-    {
-      q = p;
-      D = mapinto(Dp); // shortcut CRA
-      bound = dp_deg; // tighten bound
-      continue;
-    }
-    chineseRemainder( D, q, mapinto(Dp), p, newD, newq );
-    // newD = Dp mod p
-    // newD = D mod q
-    // newq = p*q
-    q = newq;
-    if( D != newD )
-    {
-      D = newD;
-      continue;
-    }
-    On( SW_RATIONAL );
-    tmp = Farey( D, q );
-    if( fdivides( tmp, f ) && fdivides( tmp, g )) // trial division
-    {
-      Off( SW_RATIONAL );
-      return tmp;
-    }
-    Off( SW_RATIONAL );
-  }
-  // hopefully, we never reach this point
-  Off( SW_USE_QGCD );
-  D = gcd( f, g );
-  On( SW_USE_QGCD );
-  return D;
-}
-
-
 
 CanonicalForm QGCD( const CanonicalForm & F, const CanonicalForm & G );

factory/algext.h

@@ +1 @@
+#ifndef ALGEXT_H
+#define ALGEXT_H
+
 #include <config.h>
 
@@ -5 +8 @@
 
 CanonicalForm QGCD( const CanonicalForm &, const CanonicalForm & );
-CanonicalForm univarQGCD( const CanonicalForm & F, const CanonicalForm & G );
-//void tryEuclid( const CanonicalForm &, const CanonicalForm &, const CanonicalForm, CanonicalForm &, bool & );
+void tryEuclid( const CanonicalForm &, const CanonicalForm &, const CanonicalForm &, CanonicalForm &, bool & );
 void tryInvert( const CanonicalForm &, const CanonicalForm &, CanonicalForm &, bool & );
 bool hasFirstAlgVar( const CanonicalForm &, Variable & );
@@ -12 +14 @@
 void tryCRA( const CanonicalForm & x1, const CanonicalForm & q1, const CanonicalForm & x2, const CanonicalForm & q2, CanonicalForm & xnew, CanonicalForm & qnew, bool & fail );
 void tryExtgcd( const CanonicalForm & F, const CanonicalForm & G, CanonicalForm & result, CanonicalForm & s, CanonicalForm & t, bool & fail );
+int * leadDeg(const CanonicalForm & f, int *degs);
+bool isLess(int *a, int *b, int lower, int upper);
+bool isEqual(int *a, int *b, int lower, int upper);
+CanonicalForm firstLC(const CanonicalForm & f);
 
+#endif
 
-

factory/cf_gcd.cc

@@ -834 +834 @@
           (getCharacteristic() == 0) &&
           (hasFirstAlgVar(f,m) || hasFirstAlgVar(g,m))
-          //&& f.isUnivariate()
-          //&& g.isUnivariate()
           )
           {
-            //if ((f.level()==g.level()) && f.isUnivariate() && g.isUnivariate())
-            //  return univarQGCD(f,g);
-            //else
-              //return QGCD(f,g);
             bool on_rational = isOn(SW_RATIONAL);
             CanonicalForm r=QGCD(f,g);
@@ -1238 +1232 @@
 }
 
-#include "algext.cc"
-

factory/facAlgExt.h

@@ -17 +17 @@
 **/
 //*****************************************************************************
+
+#ifndef FAC_ALG_EXT_H
+#define FAC_ALG_EXT_H
 
 #include "assert.h"
@@ -38 +41 @@
                  const Variable& alpha   ///<[in] an algebraic variable
                 );
+
+#endif
+

factory/fieldGCD.h

@@ +1 @@
+#ifndef FIELD_GCD_H
+#define FIELD_GCD_H
+
 CanonicalForm fieldGCD( const CanonicalForm & F, const CanonicalForm & G );
 void CRA(const CanonicalForm & x1, const CanonicalForm & q1, const CanonicalForm & x2, const CanonicalForm & q2, CanonicalForm & xnew, CanonicalForm & qnew);
-int * leadDeg(const CanonicalForm & f, int *degs);
-bool isLess(int *a, int *b, int lower, int upper);
-bool isEqual(int *a, int *b, int lower, int upper);
-CanonicalForm firstLC(const CanonicalForm & f);
 
+#endif
+