Changeset fc866f6 in git


Ignore:
Timestamp:
May 6, 2016, 1:39:10 PM (7 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
143b1768bbdd2f1e7a969648d2afe2406ed6c991
Parents:
586e009fbfed8451a30a85fe4ca44c6b082c2786
Message:
fix: tr. #760 (conversion must include attribute for resolution)
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed

  • Singular/iparith.cc

    r586e00 rfc866f6  
    45124512static BOOLEAN jjL2R(leftv res, leftv v)
    45134513{
    4514   res->data=(char *)syConvList((lists)v->Data(),FALSE);
     4514  res->data=(char *)syConvList((lists)v->Data());
    45154515  if (res->data != NULL)
    45164516    return FALSE;

  • Singular/ipconv.cc

    r586e00 rfc866f6  
    322322}
    323323
    324 /*
    325 static void * iiR2L(void * data)
    326 {
    327   syStrategy tmp=(syStrategy)data;
    328   return  (void *)syConvRes(tmp,TRUE);
    329 }
    330 */
    331324static void iiR2L_l(leftv out, leftv in)
    332325{
    … …  
    340333}
    341334
    342 static void * iiL2R(void * data)
    343 {
    344   return (void *)syConvList((lists)data,TRUE);
     335static void iiL2R(leftv out, leftv in)
     336{
     337  int add_row_shift = 0;
     338  lists l=(lists)in->Data();
     339  intvec *ww=NULL;
     340  if (l->nr>=0) ww=(intvec *)atGet(&(l->m[0]),"isHomog",INTVEC_CMD);
     341  out->data=(void *)syConvList(l);
     342  if (ww!=NULL)
     343  {
     344    intvec *weights=ivCopy(ww);
     345    atSet(out,"isHomog",weights,INTVEC_CMD);
     346  }
    345347}
    346348

  • Singular/ipshell.cc

    r586e00 rfc866f6  
    31693169* converts a list of modules into a resolution
    31703170*/
    3171 syStrategy syConvList(lists li,BOOLEAN toDel)
     3171syStrategy syConvList(lists li)
    31723172{
    31733173  int typ0;
    … …  
    31923192    result = NULL;
    31933193  }
    3194   if (toDel) li->Clean();
    31953194  return result;
    31963195}

  • Singular/ipshell.h

    r586e00 rfc866f6  
    106106syStrategy syForceMin(lists li);
    107107// converts a list of modules into a resolution
    108 syStrategy syConvList(lists li,BOOLEAN toDel);
     108syStrategy syConvList(lists li);
    109109
    110110BOOLEAN syBetti1(leftv res, leftv u);

  • Singular/table.h

    r586e00 rfc866f6  
    12371237   { STRING_CMD,      LINK_CMD,       D(iiS2Link) , NULL_VAL },
    12381238// resolution -> list
    1239    { RESOLUTION_CMD,  LIST_CMD,       NULL_VAL /*iiR2L*/ , D(iiR2L_l) },
     1239   { RESOLUTION_CMD,  LIST_CMD,       NULL_VAL , D(iiR2L_l) },
    12401240// list -> resolution
    1241    { LIST_CMD,        RESOLUTION_CMD, D(iiL2R) , NULL_VAL},
     1241   { LIST_CMD,        RESOLUTION_CMD, NULL_VAL ,  D(iiL2R) },
    12421242// qring -> ring
    12431243   { QRING_CMD,       RING_CMD,       D(iiDummy), NULL_VAL},

  • Tst/Short/ok_s.lst

    r586e00 rfc866f6  
    6060bug_tr758
    6161bug_tr759
     62bug_tr760
    6263bug_genus_etc
    6364conv_bi
Note: See TracChangeset for help on using the changeset viewer.