Changeset 5523765 in git


Ignore:
Timestamp:
Feb 21, 2013, 11:23:56 AM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cbf866d4f8c3861325311c042cb2033c053453b2')
Children:
7600fb155db01a25b5e1a80b4394e4ff39585f53
Parents:
507427e9e0bf212d166ab8f3bb970f562784a172
git-author:
Martin Lee <martinlee84@web.de>2013-02-21 11:23:56+01:00
git-committer:
Martin Lee <martinlee84@web.de>2013-02-21 14:38:49+01:00
Message:
chg: extended naCopyTrans2AlgExt
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libpolys/polys/ext_fields/algext.cc

    r507427 r5523765  
    926926  assume (nCoeff_is_algExt (dst));
    927927  fraction fa=(fraction)a;
    928   assume( rSamePolyRep(src->extRing, dst->extRing) );
    929   poly p = p_Copy(NUM(fa),src->extRing);
     928  if (!DENIS1 (fa))
     929    WarnS ("ignoring denominators in naCopyTrans2AlgExt");
     930  poly p;
     931  if (rSamePolyRep(src->extRing, dst->extRing))
     932  {
     933    p = p_Copy(NUM(fa),src->extRing);
     934  }
     935  else
     936  {
     937    assume ((strcmp(rRingVar(0,src->extRing),rRingVar(0,dst->extRing))==0) && (rVar (src->extRing) == rVar (dst->extRing)));
     938
     939    nMapFunc nMap= n_SetMap (src->extRing->cf, dst->extRing->cf);
     940
     941    assume (nMap != NULL);
     942    p= p_PermPoly (NUM (fa), NULL, src->extRing, dst->extRing,nMap, NULL,rVar (src->extRing));
     943  }
    930944  definiteReduce(p, dst->extRing->qideal->m[0], dst);
    931945  assume (p_Test (p, dst->extRing));
     
    10211035         return naCopyTrans2AlgExt;
    10221036    }
    1023     else
    1024       return NULL;                               /// Z/p(b) --> Z/p(a)
     1037    else if ((strcmp(rRingVar(0,src->extRing),rRingVar(0,dst->extRing))==0) && (rVar (src->extRing) == rVar (dst->extRing)))
     1038    {
     1039      if (src->type==n_transExt)
     1040        return naCopyTrans2AlgExt;
     1041    }
    10251042  }
    10261043
Note: See TracChangeset for help on using the changeset viewer.