Changeset 4fc9cc in git


Ignore:
Timestamp:
May 10, 2018, 11:36:17 AM (6 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
63f34fe09a338d03af216f46cb07a18b8f64033e
Parents:
a9277b66b88bb8d43115ce64c6e4958268c12236
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-05-10 11:36:17+02:00
git-committer:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2018-05-10 11:38:44+02:00
Message:
chg: move pp_mm_Mult to pProcs out of plural stuff
Location:
libpolys/polys
Files:
7 edited

Legend:

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

    ra9277b r4fc9cc  
    10911091  if (pNext(p) == NULL)
    10921092  {
    1093 #ifdef HAVE_PLURAL
    1094     if (rIsPluralRing(r))
    1095       return nc_mm_Mult_pp(p, q, r);
    1096 #endif
    1097     return r->p_Procs->pp_Mult_mm(q, p, r);
     1093    return r->p_Procs->pp_mm_Mult_mm(q, p, r);
    10981094  }
    10991095
  • libpolys/polys/nc/nc.h

    ra9277b r4fc9cc  
    4343
    4444// NC pProcs:
    45 typedef poly (*mm_Mult_p_Proc_Ptr)(const poly m, poly p, const ring r);
    46 typedef poly (*mm_Mult_pp_Proc_Ptr)(const poly m, const poly p, const ring r);
    47 
    48 
    49 
    5045typedef poly (*SPoly_Proc_Ptr)(const poly p1, const poly p2, const ring r);
    5146typedef poly (*SPolyReduce_Proc_Ptr)(const poly p1, poly p2, const ring r);
     
    5651{
    5752public:
    58   mm_Mult_pp_Proc_Ptr                   mm_Mult_pp;
    59 
    6053  bucket_Proc_Ptr                       BucketPolyRed;
    6154  bucket_Proc_Ptr                       BucketPolyRed_Z;
     
    232225{
    233226  assume(rIsPluralRing(r));
    234   assume(r->GetNC()->p_Procs.mm_Mult_pp!=NULL);
    235   return r->GetNC()->p_Procs.mm_Mult_pp(m, p, r);
     227  assume(r->p_Procs->pp_mm_Mult!=NULL);
     228  return r->p_Procs->pp_mm_Mult(p, m, r);
    236229//  return pp_Mult_mm( p, m, r);
    237230}
  • libpolys/polys/nc/ncSAMult.cc

    ra9277b r4fc9cc  
    193193}
    194194
    195 static poly ggnc_mm_Mult_pp(const poly m, const poly p, const ring r)
     195static poly ggnc_pp_mm_Mult(const poly p, const poly m, const ring r)
    196196{
    197197  if( (p == NULL) || (m == NULL) )
     
    206206
    207207#if OUTPUT
    208   PrintS("VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ggnc_mm_Mult_pp(m, p) VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ");
     208  PrintS("VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ggnc_pp_mm_Mult(m, p) VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ");
    209209  PrintLn();
    210210  PrintS("m: "); p_Write(m, r);
     
    231231  p_Test(pResult, r);
    232232
    233   PrintS("ggnc_mm_Mult_pp(m, p) => "); p_Write(pResult, r);
     233  PrintS("ggnc_pp_mm_Mult(m, p) => "); p_Write(pResult, r);
    234234  PrintS("p: "); p_Write(p, r);
    235235  PrintS("m: "); p_Write(m, r);
     
    258258  // non-commutaitve multiplication by monomial from the left
    259259  rGR->p_Procs->p_mm_Mult   = ggnc_p_mm_Mult;
    260   rGR->GetNC()->p_Procs.mm_Mult_pp  = ggnc_mm_Mult_pp;
     260  rGR->p_Procs->pp_mm_Mult  = ggnc_pp_mm_Mult;
    261261
    262262}
  • libpolys/polys/nc/old.gring.cc

    ra9277b r4fc9cc  
    110110poly gnc_p_Mult_mm(poly p, const poly m, const ring r);
    111111poly gnc_p_mm_Mult(poly m, const poly p, const ring r);
    112 poly gnc_mm_Mult_pp(const poly m, const poly p, const ring r);
     112poly gnc_pp_mm_Mult(const poly p, const poly m, const ring r);
    113113
    114114
     
    406406}
    407407
    408 poly gnc_mm_Mult_pp(const poly m, const poly p, const ring r)
     408poly gnc_pp_mm_Mult(const poly p, const poly m, const ring r)
    409409{
    410410  return( gnc_p_Mult_mm_Common(p_Copy(p,r), m, 0, r) );
     
    31483148  // non-commutaitve multiplication by monomial from the left
    31493149  p_Procs->p_mm_Mult   = gnc_p_mm_Mult;
    3150   rGR->GetNC()->p_Procs.mm_Mult_pp  = gnc_mm_Mult_pp;
     3150  p_Procs->pp_mm_Mult  = gnc_pp_mm_Mult;
    31513151
    31523152#if 0
  • libpolys/polys/nc/sca.cc

    ra9277b r4fc9cc  
    5959
    6060// return pMonom * pPoly; preserve pPoly and pMonom.
    61 static poly sca_mm_Mult_pp(const poly pMonom, const poly pPoly, const ring rRing);
     61static poly sca_pp_mm_Mult(const poly pPoly, const poly pMonom, const ring rRing);
    6262
    6363// return pPoly * pMonom; preserve pMonom, destroy or reuse pPoly.
     
    565565
    566566// return new poly = pMonom * pPoly; preserve pPoly and pMonom.
    567 static poly sca_mm_Mult_pp(const poly pMonom, const poly pPoly, const ring rRing)
     567static poly sca_pp_mm_Mult(const poly pPoly, const poly pMonom, const ring rRing)
    568568{
    569569  assume( rIsSCA(rRing) );
     
    597597      {
    598598        // REPORT_ERROR
    599         Werror("sca_mm_Mult_pp: exponent mismatch %d and %d\n", iComponent, iComponentMonomM);
     599        Werror("sca_pp_mm_Mult: exponent mismatch %d and %d\n", iComponent, iComponentMonomM);
    600600        // what should we do further?!?
    601601
     
    606606      if(iComponent==0 )
    607607      {
    608         dReportError("sca_mm_Mult_pp: Multiplication in the left module from the right!");
     608        dReportError("sca_pp_mm_Mult: Multiplication in the left module from the right!");
    609609//        PrintS("mm = "); p_Write(pMonom, rRing);
    610610//        PrintS("pp = "); p_Write(pPoly, rRing);
     
    12351235  // non-commutaitve
    12361236  p_Procs->p_mm_Mult          = sca_p_mm_Mult;
    1237   rGR->GetNC()->p_Procs.mm_Mult_pp  = sca_mm_Mult_pp;
     1237  p_Procs->pp_mm_Mult         = sca_pp_mm_Mult;
    12381238
    12391239//   rGR->GetNC()->p_Procs.SPoly         = sca_SPoly;
  • libpolys/polys/templates/p_Procs.h

    ra9277b r4fc9cc  
    4747  pp_Mult_nn_Proc_Ptr                   pp_Mult_nn;
    4848  pp_Mult_mm_Proc_Ptr                   pp_Mult_mm;
     49  pp_Mult_mm_Proc_Ptr                   pp_mm_Mult;
    4950  pp_Mult_mm_Noether_Proc_Ptr           pp_Mult_mm_Noether;
    5051  p_Mult_mm_Proc_Ptr                    p_Mult_mm;
  • libpolys/polys/templates/p_Procs_Set.h

    ra9277b r4fc9cc  
    166166  #endif
    167167  _p_procs->p_mm_Mult=_p_procs->p_Mult_mm;
     168  _p_procs->pp_mm_Mult=_p_procs->pp_Mult_mm;
    168169  CheckProc(p_Copy);
    169170  CheckProc(p_Delete);
Note: See TracChangeset for help on using the changeset viewer.