Changeset 4fc9cc in git
- Timestamp:
- May 10, 2018, 11:36:17 AM (6 years ago)
- 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
- Location:
- libpolys/polys
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
libpolys/polys/monomials/p_polys.h
ra9277b r4fc9cc 1091 1091 if (pNext(p) == NULL) 1092 1092 { 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); 1098 1094 } 1099 1095 -
libpolys/polys/nc/nc.h
ra9277b r4fc9cc 43 43 44 44 // 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 50 45 typedef poly (*SPoly_Proc_Ptr)(const poly p1, const poly p2, const ring r); 51 46 typedef poly (*SPolyReduce_Proc_Ptr)(const poly p1, poly p2, const ring r); … … 56 51 { 57 52 public: 58 mm_Mult_pp_Proc_Ptr mm_Mult_pp;59 60 53 bucket_Proc_Ptr BucketPolyRed; 61 54 bucket_Proc_Ptr BucketPolyRed_Z; … … 232 225 { 233 226 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); 236 229 // return pp_Mult_mm( p, m, r); 237 230 } -
libpolys/polys/nc/ncSAMult.cc
ra9277b r4fc9cc 193 193 } 194 194 195 static poly ggnc_ mm_Mult_pp(const poly m, const poly p, const ring r)195 static poly ggnc_pp_mm_Mult(const poly p, const poly m, const ring r) 196 196 { 197 197 if( (p == NULL) || (m == NULL) ) … … 206 206 207 207 #if OUTPUT 208 PrintS("VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ggnc_ mm_Mult_pp(m, p) VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ");208 PrintS("VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV ggnc_pp_mm_Mult(m, p) VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV "); 209 209 PrintLn(); 210 210 PrintS("m: "); p_Write(m, r); … … 231 231 p_Test(pResult, r); 232 232 233 PrintS("ggnc_ mm_Mult_pp(m, p) => "); p_Write(pResult, r);233 PrintS("ggnc_pp_mm_Mult(m, p) => "); p_Write(pResult, r); 234 234 PrintS("p: "); p_Write(p, r); 235 235 PrintS("m: "); p_Write(m, r); … … 258 258 // non-commutaitve multiplication by monomial from the left 259 259 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; 261 261 262 262 } -
libpolys/polys/nc/old.gring.cc
ra9277b r4fc9cc 110 110 poly gnc_p_Mult_mm(poly p, const poly m, const ring r); 111 111 poly 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);112 poly gnc_pp_mm_Mult(const poly p, const poly m, const ring r); 113 113 114 114 … … 406 406 } 407 407 408 poly gnc_ mm_Mult_pp(const poly m, const poly p, const ring r)408 poly gnc_pp_mm_Mult(const poly p, const poly m, const ring r) 409 409 { 410 410 return( gnc_p_Mult_mm_Common(p_Copy(p,r), m, 0, r) ); … … 3148 3148 // non-commutaitve multiplication by monomial from the left 3149 3149 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; 3151 3151 3152 3152 #if 0 -
libpolys/polys/nc/sca.cc
ra9277b r4fc9cc 59 59 60 60 // return pMonom * pPoly; preserve pPoly and pMonom. 61 static poly sca_ mm_Mult_pp(const poly pMonom, const poly pPoly, const ring rRing);61 static poly sca_pp_mm_Mult(const poly pPoly, const poly pMonom, const ring rRing); 62 62 63 63 // return pPoly * pMonom; preserve pMonom, destroy or reuse pPoly. … … 565 565 566 566 // 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)567 static poly sca_pp_mm_Mult(const poly pPoly, const poly pMonom, const ring rRing) 568 568 { 569 569 assume( rIsSCA(rRing) ); … … 597 597 { 598 598 // 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); 600 600 // what should we do further?!? 601 601 … … 606 606 if(iComponent==0 ) 607 607 { 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!"); 609 609 // PrintS("mm = "); p_Write(pMonom, rRing); 610 610 // PrintS("pp = "); p_Write(pPoly, rRing); … … 1235 1235 // non-commutaitve 1236 1236 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; 1238 1238 1239 1239 // rGR->GetNC()->p_Procs.SPoly = sca_SPoly; -
libpolys/polys/templates/p_Procs.h
ra9277b r4fc9cc 47 47 pp_Mult_nn_Proc_Ptr pp_Mult_nn; 48 48 pp_Mult_mm_Proc_Ptr pp_Mult_mm; 49 pp_Mult_mm_Proc_Ptr pp_mm_Mult; 49 50 pp_Mult_mm_Noether_Proc_Ptr pp_Mult_mm_Noether; 50 51 p_Mult_mm_Proc_Ptr p_Mult_mm; -
libpolys/polys/templates/p_Procs_Set.h
ra9277b r4fc9cc 166 166 #endif 167 167 _p_procs->p_mm_Mult=_p_procs->p_Mult_mm; 168 _p_procs->pp_mm_Mult=_p_procs->pp_Mult_mm; 168 169 CheckProc(p_Copy); 169 170 CheckProc(p_Delete);
Note: See TracChangeset
for help on using the changeset viewer.