Changeset baa2c3a in git

Timestamp:

Jun 18, 2014, 10:51:56 PM (10 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

f1e3bf524cf7fab23970bad314cf96ff99fd66f3

Parents:

80b8feeb939020d521e3be5049bc41453bdb2e92

git-author:

Martin Lee <martinlee84@web.de>2014-06-18 22:51:56+02:00

git-committer:

Martin Lee <martinlee84@web.de>2014-06-24 12:06:05+02:00

Message:

chg: moved hasFirstAlgVar from cfGcdAlgExt to cf_ops

Location:

factory

Files:

• canonicalform.h (modified) (1 diff)
• cfGcdAlgExt.cc (modified) (1 diff)
• cfGcdAlgExt.h (modified) (1 diff)
• cfNewtonPolygon.cc (modified) (1 diff)
• cf_factor.cc (modified) (1 diff)
• cf_gcd_smallp.cc (modified) (1 diff)
• cf_ops.cc (modified) (1 diff)
• facAlgFunc.cc (modified) (1 diff)
• facBivar.cc (modified) (1 diff)
• facFqBivar.cc (modified) (1 diff)
• facFqBivarUtil.cc (modified) (1 diff)
• facMul.cc (modified) (1 diff)
• factory.template (modified) (1 diff)

factory/canonicalform.h

@@ -271 +271 @@
 
 CanonicalForm reduce ( const CanonicalForm& f, const CanonicalForm & M);
+
+bool hasFirstAlgVar( const CanonicalForm & f, Variable & a);
 //}}}
 

factory/cfGcdAlgExt.cc

@@ -347 +347 @@
 }
 #endif
-
-bool hasFirstAlgVar( const CanonicalForm & f, Variable & a )
-{
-  if( f.inBaseDomain() ) // f has NO alg. variable
-    return false;
-  if( f.level()<0 ) // f has only alg. vars, so take the first one
-  {
-    a = f.mvar();
-    return true;
-  }
-  for(CFIterator i=f; i.hasTerms(); i++)
-    if( hasFirstAlgVar( i.coeff(), a ))
-      return true; // 'a' is already set
-  return false;
-}
 
 CanonicalForm QGCD( const CanonicalForm & F, const CanonicalForm & G );

factory/cfGcdAlgExt.h

@@ -30 +30 @@
 #endif
 void tryInvert( const CanonicalForm &, const CanonicalForm &, CanonicalForm &, bool & );
-/*BEGINPUBLIC*/
-bool hasFirstAlgVar( const CanonicalForm &, Variable & );
-/*ENDPUBLIC*/
 
 /// modular gcd over F_p[x]/(M) for not necessarily irreducible M.

factory/cfNewtonPolygon.cc

@@ -29 +29 @@
 #include "cfNewtonPolygon.h"
 #include "templates/ftmpl_functions.h"
-#include "cfGcdAlgExt.h"
 
 static

factory/cf_factor.cc

@@ -27 +27 @@
 #include "facFqSquarefree.h"
 #include "cf_map.h"
-#include "cfGcdAlgExt.h"
 #include "facAlgExt.h"
 #include "facFactorize.h"

factory/cf_gcd_smallp.cc

@@ -25 +25 @@
 
 #include "canonicalform.h"
-#include "cfGcdAlgExt.h"
 #include "cf_map.h"
 #include "cf_util.h"

factory/cf_ops.cc

@@ -661 +661 @@
   return result;
 }
+
+/** check if poly f contains an algebraic variable a **/
+bool hasFirstAlgVar( const CanonicalForm & f, Variable & a )
+{
+  if( f.inBaseDomain() ) // f has NO alg. variable
+    return false;
+  if( f.level()<0 ) // f has only alg. vars, so take the first one
+  {
+    a = f.mvar();
+    return true;
+  }
+  for(CFIterator i=f; i.hasTerms(); i++)
+    if( hasFirstAlgVar( i.coeff(), a ))
+      return true; // 'a' is already set
+  return false;
+}

factory/facAlgFunc.cc

@@ -26 +26 @@
 #include "debug.h"
 
-#include "cfGcdAlgExt.h"
 #include "cf_generator.h"
 #include "cf_iter.h"

factory/facBivar.cc

@@ -25 +25 @@
 #include "facMul.h"
 #include "cf_primes.h"
-#include "cfGcdAlgExt.h"
 
 #ifdef HAVE_NTL

factory/facFqBivar.cc

@@ -36 +36 @@
 #include "facFqBivar.h"
 #include "cfNewtonPolygon.h"
-#include "cfGcdAlgExt.h"
 
 #ifdef HAVE_NTL

factory/facFqBivarUtil.cc

@@ -30 +30 @@
 #include "facHensel.h"
 #include "facMul.h"
-#include "cfGcdAlgExt.h"
 
 #ifdef HAVE_FLINT

factory/facMul.cc

@@ -19 +19 @@
 #include "canonicalform.h"
 #include "facMul.h"
-#include "cfGcdAlgExt.h"
 #include "cf_util.h"
 #include "templates/ftmpl_functions.h"

factory/factory.template

@@ -113 +113 @@
 
 /*MAKEHEADER PUBLIC ONLY*/
-#include "cfGcdAlgExt.h"
-
-/*MAKEHEADER PUBLIC ONLY*/
 #include "facAlgFunc.h"