Changeset 613174 in git


Ignore:
Timestamp:
Feb 4, 2011, 3:19:22 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
ea11dcde9c525e14e42ef49423d3913e03d714de
Parents:
9c83f2d5961f53cfc901a6f7d33a1e2f1b32e707
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-02-04 15:19:22+01:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:59:28+01:00
Message:
rInternalChar removed, n_SetMap
File:
1 edited

Legend:

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

    r9c83f2 r613174  
    793793  && (rInternalChar(r1)==rInternalChar(r2)))
    794794  {
    795     tmpR.ch=rInternalChar(r1);
     795    tmpR.ch=r1->ch;
    796796    if (rField_is_Q(r1)||rField_is_Zp(r1)||rField_is_GF(r1)) /*Q, Z/p, GF(p,n)*/
    797797    {
     
    946946          || (r2->ch==-r1->ch)) /* Z/p */
    947947      {
    948         tmpR.ch=rInternalChar(r1);
     948        tmpR.ch=r1->ch;
    949949        tmpR.P=rPar(r1);
    950950        tmpR.parameter=(char **)omAlloc(rPar(r1)*sizeof(char *));
     
    10071007      if (r2->ch==0) /* Q */
    10081008      {
    1009         tmpR.ch=rInternalChar(r1);
     1009        tmpR.ch=r1->ch;
    10101010        tmpR.P=rPar(r1);
    10111011        tmpR.parameter=(char **)omAlloc(rPar(r1)*sizeof(char *));
     
    13911391      idTest((ideal)C);
    13921392
    1393       nMapFunc nMap1 = n_SetMap(R1,sum); /* can change something global: not usable
    1394                                             after the next nSetMap call :( */
     1393      nMapFunc nMap1 = n_SetMap(R1->cf,sum->cf); /* can change something global: not usable
     1394                                                    after the next nSetMap call :( */
    13951395      // Create blocked C and D matrices:
    13961396      for (i=1; i<= rVar(R1); i++)
     
    14081408
    14091409
    1410       nMapFunc nMap2 = n_SetMap(R2,sum); /* can change something global: not usable
    1411                                             after the next nSetMap call :( */
     1410      nMapFunc nMap2 = n_SetMap(R2->cf,sum->cf); /* can change something global: not usable
     1411                                                    after the next nSetMap call :( */
    14121412      for (i=1; i<= rVar(R2); i++)
    14131413        for (j=i+1; j<=rVar(R2); j++)
     
    14751475               sum->names, rVar(sum), sum->parameter, rPar(sum),
    14761476               perm1, par_perm1, sum->ch);
    1477     nMapFunc nMap1 = n_SetMap(r1,sum);
     1477    nMapFunc nMap1 = n_SetMap(r1->cf,sum->cf);
    14781478    Q1 = idInit(IDELEMS(r1->qideal),1);
    14791479    for (int for_i=0;for_i<IDELEMS(r1->qideal);for_i++)
     
    14921492               sum->names, rVar(sum), sum->parameter, rPar(sum),
    14931493               perm2, par_perm2, sum->ch);
    1494     nMapFunc nMap2 = n_SetMap(r2,sum);
     1494    nMapFunc nMap2 = n_SetMap(r2->cf,sum->cf);
    14951495    Q2 = idInit(IDELEMS(r2->qideal),1);
    14961496    for (int for_i=0;for_i<IDELEMS(r2->qideal);for_i++)
     
    54195419    int *perm       = (int *)omAlloc0((rVar(r)+1)*sizeof(int));
    54205420    int *par_perm   = NULL;
    5421     nMapFunc nMap   = n_SetMap(src,r);
     5421    nMapFunc nMap   = n_SetMap(src->cf,r->cf);
    54225422    int ni,nj;
    54235423    for(i=1; i<=r->N; i++)
     
    55365536  const ring srcBase = src;
    55375537
    5538   assume( n_SetMap(srcBase,dest) == n_SetMap(dest,dest) ); // currRing is important here!
     5538  assume( n_SetMap(srcBase->cf,dest->cf) == n_SetMap(dest->cf,dest->cf) ); // currRing is important here!
    55395539
    55405540  matrix C = mpNew(N,N); // ring independent
Note: See TracChangeset for help on using the changeset viewer.