Changeset 963057 in git

Timestamp:

Jun 22, 2010, 6:19:09 PM (13 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

fb82895d37892dd665aea24b2fab1bc9e875e30b

Parents:

53f7163fe201cc7e502b3ed7c9ca438af57b001a

Message:

more syntax fixes and bug fix in uni gcd 


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

Location:

factory

Files:

• ExtensionInfo.cc (modified) (6 diffs)
• cf_gcd.cc (modified) (2 diffs)
• cf_map_ext.cc (modified) (1 diff)
• cf_map_ext.h (modified) (1 diff)
• facFqBivar.h (modified) (1 diff)
• facFqSquarefree.cc (modified) (1 diff)

factory/ExtensionInfo.cc

@@ -17 +17 @@
 #include "ExtensionInfo.h"
 
-inline
 ExtensionInfo::ExtensionInfo (const bool extension)
 {
@@ -29 +28 @@
 }
 
-inline
 ExtensionInfo::ExtensionInfo (const Variable& alpha, const Variable& beta, 
                               const CanonicalForm& gamma, const CanonicalForm& 
@@ -44 +42 @@
 }
 
-inline
 ExtensionInfo::ExtensionInfo (const Variable& alpha, const Variable& beta, 
                               const CanonicalForm& gamma, const CanonicalForm& 
@@ -58 +55 @@
 }
 
-inline
 ExtensionInfo::ExtensionInfo (const Variable& alpha, const bool extension)
 {
@@ -70 +66 @@
 }
 
-inline
 ExtensionInfo::ExtensionInfo (const Variable& alpha)
 {
@@ -82 +77 @@
 }
 
-inline
 ExtensionInfo::ExtensionInfo (const int nGFDegree, const char cGFName, const
                               bool extension)

factory/cf_gcd.cc

@@ -144 +144 @@
 {
 #ifdef HAVE_NTL
-  if (isOn(SW_USE_NTL_GCD_P) && ( getCharacteristic() > 0 )
+  if (isOn(SW_USE_NTL_GCD_P) && ( getCharacteristic() > 0 ) && (CFFactory::gettype() != GaloisFieldDomain)
   &&  (f.level()==g.level()) && isPurePoly(f) && isPurePoly(g))
   {
@@ -406 +406 @@
         bpure = isPurePoly(pi) && isPurePoly(pi1);
 #ifdef HAVE_NTL
-        if ( isOn(SW_USE_NTL_GCD_P) && bpure )
+        if ( isOn(SW_USE_NTL_GCD_P) && bpure && (CFFactory::gettype() != GaloisFieldDomain))
             return gcd_univar_ntlp(pi, pi1 ) * C;
 #endif

factory/cf_map_ext.cc

@@ -32 +32 @@
 // cyclotomoic polys:
 #include "cf_cyclo.h"
+
+#include "cf_map_ext.h"
 
 #ifdef HAVE_NTL 

factory/cf_map_ext.h

@@ -18 +18 @@
 **/
 //*****************************************************************************
+
+#include <config.h>
 
 CanonicalForm GFMapUp (const CanonicalForm & F, int k);

factory/facFqBivar.h

@@ -28 +28 @@
 #include "DegreePattern.h"
 #include "ExtensionInfo.h"
-#include "ExtensionInfo.cc"
 #include "cf_util.h"
 #include "facFqSquarefree.h"

factory/facFqSquarefree.cc

@@ -14 +14 @@
  **/
 /*****************************************************************************/
+
+#include <config.h>
 
 #include "canonicalform.h"