Changeset cad11a in git


Ignore:
Timestamp:
Sep 12, 2007, 11:53:01 AM (17 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
b98aeaacf1a8c51ec84da1f8c340380f3a348f6b
Parents:
47cbe51f7a7b4778b784defe59954887bbc0cbb7
Message:
*hannes: more normlize calls


git-svn-id: file:///usr/local/Singular/svn/trunk@10301 2c84dea3-7e68-4137-9b89-c4e89433aadc
Location:
Singular
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Singular/iparith.cc

    r47cbe51 rcad11a  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: iparith.cc,v 1.454 2007-08-09 14:31:16 Singular Exp $ */
     4/* $Id: iparith.cc,v 1.455 2007-09-12 09:53:00 Singular Exp $ */
    55
    66/*
    … …  
    992992{
    993993  res->data = (char *)(nMult( (number)u->Data(), (number)v->Data()));
     994  nNormalize((number)res->data);
    994995  if ((v->next!=NULL) || (u->next!=NULL))
    995996    return jjOP_REST(res,u,v);
    … …  
    10071008      b=(poly)v->CopyD(POLY_CMD); // works also for VECTOR_CMD
    10081009      res->data = (char *)(pMult( a, b));
     1010      pNormalize((poly)res->data);
    10091011      return FALSE;
    10101012    }
    … …  
    10121014    b=pCopy((poly)v->Data());
    10131015    res->data = (char *)(pMult( a, b));
     1016    pNormalize((poly)res->data);
    10141017    return jjOP_REST(res,u,v);
    10151018  }
    … …  
    10181021  b=(poly)v->CopyD(POLY_CMD); // works also for VECTOR_CMD
    10191022  res->data = (char *)(pMult( a, b));
     1023  pNormalize((poly)res->data);
    10201024  return jjOP_REST(res,u,v);
    10211025}
    … …  
    10231027{
    10241028  res->data = (char *)idMult((ideal)u->Data(),(ideal)v->Data());
     1029  idNormalize((ideal)res->data);
    10251030  if ((v->next!=NULL) || (u->next!=NULL))
    10261031    return jjOP_REST(res,u,v);
    … …  
    10451050  ideal I= (ideal)mpMultP((matrix)u->CopyD(MATRIX_CMD),p);
    10461051  if (r>0) I->rank=r;
     1052  idNormalize(I);
    10471053  res->data = (char *)I;
    10481054  return FALSE;
    … …  
    10581064  pSetCoeff(p,n);
    10591065  res->data = (char *)mpMultP((matrix)u->CopyD(MATRIX_CMD),p);
     1066  idNormalize((ideal)res->data);
    10601067  return FALSE;
    10611068}
    … …  
    10671074{
    10681075  res->data = (char *)mpMultI((matrix)u->CopyD(MATRIX_CMD),(int)(long)v->Data());
     1076  idNormalize((ideal)res->data);
    10691077  return FALSE;
    10701078}
    … …  
    10811089     return TRUE;
    10821090  }
     1091  idNormalize((ideal)res->data);
    10831092  if ((v->next!=NULL) || (u->next!=NULL))
    10841093    return jjOP_REST(res,u,v);
    … …  
    12651274    res->data = (char *)pDivideM(pCopy(p),pHead(q));
    12661275  }
     1276  pNormalize((poly)res->data);
    12671277  return FALSE;
    12681278}
    … …  
    12981308    }
    12991309  }
     1310  idNormalize((ideal)mm);
    13001311  res->data=(char *)mm;
    13011312  return FALSE;

  • Singular/ipassign.cc

    r47cbe51 rcad11a  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: ipassign.cc,v 1.90 2007-04-04 12:38:07 Singular Exp $ */
     4/* $Id: ipassign.cc,v 1.91 2007-09-12 09:53:01 Singular Exp $ */
    55
    66/*
    … …  
    434434  if (res->data!=NULL) idDelete((ideal*)&res->data);
    435435  res->data=(void *)a->CopyD(MATRIX_CMD);
    436   idNormalize((ideal)res->data);
     436  if (a->rtyp==IDHDL) idNormalize((ideal)a->Data());
     437  else                idNormalize((ideal)res->data);
    437438  jiAssignAttr(res,a);
    438439  if (((res->rtyp==IDEAL_CMD)||(res->rtyp==MODUL_CMD))
Note: See TracChangeset for help on using the changeset viewer.