Changeset 2f959e8 in git

Timestamp:

Jan 30, 2008, 7:56:37 PM (16 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

37f8ce7136314ebb3b8fac5587f2c2d01b0fd2d9

Parents:

af378f726d1e5204f8934b4281bd84a2d50ab8ed

Message:

p_Mult_q: select by domain property
kutil.cc: no ntl needed anymore


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

Location:

kernel

Files:

• kutil.cc (modified) (2 diffs)
• p_Mult_q.cc (modified) (3 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.74 2008-01-30 18:49:42 wienand Exp $ */
+/* $Id: kutil.cc,v 1.75 2008-01-30 18:56:36 wienand Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1245 +1245 @@
 * put the  lcm(s[i],p)  into the set B
 */
-
-#include <NTL/ZZ.h>
-#ifdef NTL_CLIENT
-NTL_CLIENT
-#endif
 
 BOOLEAN enterOneStrongPoly (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)

kernel/p_Mult_q.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: p_Mult_q.cc,v 1.5 2007-05-10 10:29:28 wienand Exp $
+ *  Version: $Id: p_Mult_q.cc,v 1.6 2008-01-30 18:56:37 wienand Exp $
  *******************************************************************/
 #include "mod2.h"
@@ -193 +193 @@
   assume(p != NULL && pNext(p) != NULL && q != NULL && pNext(q) != NULL);
 #ifdef HAVE_RINGS
-  assume(!(rField_is_Ring(r)));
+  assume(rField_is_Domain(r));
 #endif
   pAssume1(! pHaveCommonMonoms(p, q));
@@ -285 +285 @@
   if (lq < MIN_LENGTH_BUCKET || TEST_OPT_NOT_BUCKETS)
 #ifdef HAVE_RINGS
-    if (rField_is_Ring(currRing))
+    if (!rField_is_Domain(currRing))
       return _p_Mult_q_Normal_ZeroDiv(p, q, copy, r);
     else