Changeset 8d14d67 in git for factory

Timestamp:

Dec 8, 2008, 9:59:27 AM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

18ef40f42eafb26bcadfdbf8f8f70a8a0de137d6

Parents:

f41347f0d401c803dc2f636974ccdd1d7f48dac6

Message:

*** empty log message ***


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

Location:

factory/winnt

Files:

• factory.h (modified) (9 diffs)
• factoryconf.h (modified) (5 diffs)

factory/winnt/factory.h

@@ -1 +1 @@
 /* winnt/factory.h automatically generated by makeheader from factory.template */
 /* emacs edit mode for this file is -*- C++ -*- */
-/* $Id: factory.h,v 1.6 2007-11-20 10:08:03 Singular Exp $ */
+/* $Id: factory.h,v 1.7 2008-12-08 08:59:27 Singular Exp $ */
 
 #ifndef INCL_FACTORY_H
@@ -106 +106 @@
 const int SW_FAC_QUADRATICLIFT = 5;
 const int SW_USE_EZGCD = 6;
-const int SW_USE_SPARSEMOD = 7;
-const int SW_USE_NTL=8;
-const int SW_USE_NTL_GCD_0=9;
-const int SW_USE_NTL_GCD_P=10;
-const int SW_USE_NTL_SORT=11;
-const int SW_USE_CHINREM_GCD=12;
-const int SW_USE_GCD_P=13;
+const int SW_USE_EZGCD_P = 7;
+const int SW_USE_SPARSEMOD = 8;
+const int SW_USE_NTL=9;
+const int SW_USE_NTL_GCD_0=10;
+const int SW_USE_NTL_GCD_P=11;
+const int SW_USE_NTL_SORT=12;
+const int SW_USE_CHINREM_GCD=13;
+const int SW_USE_GCD_P=14;
+const int SW_USE_QGCD=15;
+const int SW_USE_fieldGCD=16;
 //}}}
 
@@ -178 +181 @@
 
 CanonicalForm getMipo( const Variable & alpha, const Variable & x );
+bool hasMipo( const Variable & alpha );
 
 char getDefaultVarName();
@@ -359 +363 @@
 CanonicalForm gcd ( const CanonicalForm&, const CanonicalForm& );
 
+CanonicalForm gcd_poly ( const CanonicalForm & f, const CanonicalForm & g );
+
 CanonicalForm extgcd ( const CanonicalForm&, const CanonicalForm&, CanonicalForm&, CanonicalForm& );
 
@@ -542 +548 @@
 CFFList factorize ( const CanonicalForm & f, const Variable & alpha );
 
-CFFList sqrFree ( const CanonicalForm & f, bool sort = false );
+CFFList sqrFree ( const CanonicalForm & f );
 
 bool isSqrFree ( const CanonicalForm & f );
@@ -592 +598 @@
     // direct comparison `f < 0', it is faster, too
     if ( sign( f ) < 0 )
-        return -f;
+        return -f;
     else
-        return f;
+        return f;
 }
 //}}}
@@ -781 +787 @@
     int n;
     AlgExtRandomF();
-    AlgExtRandomF( const AlgExtRandomF & );
     AlgExtRandomF( const Variable & v, CFRandom * g, int nn );
     AlgExtRandomF& operator= ( const AlgExtRandomF & );
 public:
+    AlgExtRandomF( const AlgExtRandomF & );
     AlgExtRandomF( const Variable & v );
     AlgExtRandomF( const Variable & v1, const Variable & v2 );
@@ -943 +949 @@
 class REvaluation : public Evaluation
 {
-private:
+protected: // neeeded in FFREvaluation
     CFRandom * gen;
 public:
@@ -953 +959 @@
     void nextpoint();
 };
+
+
+/* stuff included from ./fac_sqrfree.h */
 
 

factory/winnt/factoryconf.h

@@ -1 +1 @@
 /* winnt/factoryconf.h automatically generated by makeheader from factoryconf.template */
 /* emacs edit mode for this file is -*- C -*- */
-/* $Id: factoryconf.h,v 1.6 2007-11-20 10:08:03 Singular Exp $ */
+/* $Id: factoryconf.h,v 1.7 2008-12-08 08:59:27 Singular Exp $ */
 
 #ifndef INCL_FACTORYCONF_H
@@ -23 +23 @@
 
 /* emacs edit mode for this file is -*- C -*- */
-/* $Id: factoryconf.h,v 1.6 2007-11-20 10:08:03 Singular Exp $ */
+/* $Id: factoryconf.h,v 1.7 2008-12-08 08:59:27 Singular Exp $ */
 
 #ifndef INCL_CONFIG_H
@@ -105 +105 @@
 
 /* emacs edit mode for this file is -*- C -*- */
-/* $Id: factoryconf.h,v 1.6 2007-11-20 10:08:03 Singular Exp $ */
+/* $Id: factoryconf.h,v 1.7 2008-12-08 08:59:27 Singular Exp $ */
 
 /* This is for compatibility with standard assert.h */
@@ -134 +134 @@
 /* }}} */
 
+#ifdef HAVE_CSTDIO
+#include <cstdio>
+#else
 #ifdef __cplusplus
 extern "C" {
@@ -143 +146 @@
 #ifdef __cplusplus
 }
+#endif
 #endif