Changeset 7b6acd in git


Ignore:
Timestamp:
May 10, 2018, 4:58:13 PM (6 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
70a107c15f8ca7618e92170aa90769f963bcec8f
Parents:
cb5657e3f5e6e0c2a24a7210e521c46e65d4a9b2
Message:
add: rIsNCRing: LetterplaceRing or PluralRing, p1
Location:
libpolys/polys
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • libpolys/polys/monomials/p_polys.cc

    rcb5657 r7b6acd  
    21832183        {
    21842184#ifdef HAVE_PLURAL
    2185           if (rIsPluralRing(r)) /* in the NC case nothing helps :-( */
     2185          if (rIsNCRing(r)) /* in the NC case nothing helps :-( */
    21862186          {
    21872187            int j=i;
  • libpolys/polys/monomials/p_polys.h

    rcb5657 r7b6acd  
    10771077  }
    10781078#ifdef HAVE_PLURAL
    1079   if (rIsPluralRing(r))
     1079  if (rIsNCRing(r))
    10801080    return _nc_p_Mult_q(p, q, r);
    10811081  else
  • libpolys/polys/monomials/ring.h

    rcb5657 r7b6acd  
    407407#ifdef HAVE_PLURAL
    408408  nc_struct *n;
    409   return (r != NULL) && ((n=r->GetNC()) != NULL) /*&& (n->type != nc_error)*/;
     409  return ((n=r->GetNC()) != NULL) /*&& (n->type != nc_error)*/;
     410#else
     411  return FALSE;
     412#endif
     413}
     414
     415static inline BOOLEAN rIsNCRing(const ring r)
     416{
     417  assume(r != NULL); assume(r->cf != NULL);
     418#ifdef HAVE_PLURAL
     419  return (r->isLPring!=0) || rIsPluralRing(r);
    410420#else
    411421  return FALSE;
  • libpolys/polys/nc/nc.h

    rcb5657 r7b6acd  
    224224static inline poly nc_mm_Mult_pp(const poly m, const poly p, const ring r)
    225225{
    226   assume(rIsPluralRing(r));
     226  assume(rIsNCRing(r));
    227227  assume(r->p_Procs->pp_mm_Mult!=NULL);
    228228  return r->p_Procs->pp_mm_Mult(p, m, r);
    229 //  return pp_Mult_mm( p, m, r);
    230229}
    231230
  • libpolys/polys/nc/old.gring.cc

    rcb5657 r7b6acd  
    215215poly _nc_p_Mult_q(poly pPolyP, poly pPolyQ, const ring rRing)
    216216{
    217   assume( rIsPluralRing(rRing) );
     217  assume( rIsNCRing(rRing) );
    218218#ifdef PDEBUG
    219219  p_Test(pPolyP, rRing);
Note: See TracChangeset for help on using the changeset viewer.