Changeset 2f959e8 in git


Ignore:
Timestamp:
Jan 30, 2008, 7:56:37 PM (15 years ago)
Author:
Oliver Wienand <wienand@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')
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:
2 edited

Legend:

Unmodified
Added
Removed
  • kernel/kutil.cc

    raf378f7 r2f959e8  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: kutil.cc,v 1.74 2008-01-30 18:49:42 wienand Exp $ */
     4/* $Id: kutil.cc,v 1.75 2008-01-30 18:56:36 wienand Exp $ */
    55/*
    66* ABSTRACT: kernel: utils for kStd
     
    12451245* put the  lcm(s[i],p)  into the set B
    12461246*/
    1247 
    1248 #include <NTL/ZZ.h>
    1249 #ifdef NTL_CLIENT
    1250 NTL_CLIENT
    1251 #endif
    12521247
    12531248BOOLEAN enterOneStrongPoly (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)
  • kernel/p_Mult_q.cc

    raf378f7 r2f959e8  
    77 *  Author:  obachman (Olaf Bachmann)
    88 *  Created: 8/00
    9  *  Version: $Id: p_Mult_q.cc,v 1.5 2007-05-10 10:29:28 wienand Exp $
     9 *  Version: $Id: p_Mult_q.cc,v 1.6 2008-01-30 18:56:37 wienand Exp $
    1010 *******************************************************************/
    1111#include "mod2.h"
     
    193193  assume(p != NULL && pNext(p) != NULL && q != NULL && pNext(q) != NULL);
    194194#ifdef HAVE_RINGS
    195   assume(!(rField_is_Ring(r)));
     195  assume(rField_is_Domain(r));
    196196#endif
    197197  pAssume1(! pHaveCommonMonoms(p, q));
     
    285285  if (lq < MIN_LENGTH_BUCKET || TEST_OPT_NOT_BUCKETS)
    286286#ifdef HAVE_RINGS
    287     if (rField_is_Ring(currRing))
     287    if (!rField_is_Domain(currRing))
    288288      return _p_Mult_q_Normal_ZeroDiv(p, q, copy, r);
    289289    else
Note: See TracChangeset for help on using the changeset viewer.