Changeset cad11a in git
- Timestamp:
- Sep 12, 2007, 11:53:01 AM (16 years ago)
- Branches:
- (u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
- Children:
- b98aeaacf1a8c51ec84da1f8c340380f3a348f6b
- Parents:
- 47cbe51f7a7b4778b784defe59954887bbc0cbb7
- Location:
- Singular
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
Singular/iparith.cc
r47cbe51 rcad11a 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: iparith.cc,v 1.45 4 2007-08-09 14:31:16Singular Exp $ */4 /* $Id: iparith.cc,v 1.455 2007-09-12 09:53:00 Singular Exp $ */ 5 5 6 6 /* … … 992 992 { 993 993 res->data = (char *)(nMult( (number)u->Data(), (number)v->Data())); 994 nNormalize((number)res->data); 994 995 if ((v->next!=NULL) || (u->next!=NULL)) 995 996 return jjOP_REST(res,u,v); … … 1007 1008 b=(poly)v->CopyD(POLY_CMD); // works also for VECTOR_CMD 1008 1009 res->data = (char *)(pMult( a, b)); 1010 pNormalize((poly)res->data); 1009 1011 return FALSE; 1010 1012 } … … 1012 1014 b=pCopy((poly)v->Data()); 1013 1015 res->data = (char *)(pMult( a, b)); 1016 pNormalize((poly)res->data); 1014 1017 return jjOP_REST(res,u,v); 1015 1018 } … … 1018 1021 b=(poly)v->CopyD(POLY_CMD); // works also for VECTOR_CMD 1019 1022 res->data = (char *)(pMult( a, b)); 1023 pNormalize((poly)res->data); 1020 1024 return jjOP_REST(res,u,v); 1021 1025 } … … 1023 1027 { 1024 1028 res->data = (char *)idMult((ideal)u->Data(),(ideal)v->Data()); 1029 idNormalize((ideal)res->data); 1025 1030 if ((v->next!=NULL) || (u->next!=NULL)) 1026 1031 return jjOP_REST(res,u,v); … … 1045 1050 ideal I= (ideal)mpMultP((matrix)u->CopyD(MATRIX_CMD),p); 1046 1051 if (r>0) I->rank=r; 1052 idNormalize(I); 1047 1053 res->data = (char *)I; 1048 1054 return FALSE; … … 1058 1064 pSetCoeff(p,n); 1059 1065 res->data = (char *)mpMultP((matrix)u->CopyD(MATRIX_CMD),p); 1066 idNormalize((ideal)res->data); 1060 1067 return FALSE; 1061 1068 } … … 1067 1074 { 1068 1075 res->data = (char *)mpMultI((matrix)u->CopyD(MATRIX_CMD),(int)(long)v->Data()); 1076 idNormalize((ideal)res->data); 1069 1077 return FALSE; 1070 1078 } … … 1081 1089 return TRUE; 1082 1090 } 1091 idNormalize((ideal)res->data); 1083 1092 if ((v->next!=NULL) || (u->next!=NULL)) 1084 1093 return jjOP_REST(res,u,v); … … 1265 1274 res->data = (char *)pDivideM(pCopy(p),pHead(q)); 1266 1275 } 1276 pNormalize((poly)res->data); 1267 1277 return FALSE; 1268 1278 } … … 1298 1308 } 1299 1309 } 1310 idNormalize((ideal)mm); 1300 1311 res->data=(char *)mm; 1301 1312 return FALSE; -
Singular/ipassign.cc
r47cbe51 rcad11a 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: ipassign.cc,v 1.9 0 2007-04-04 12:38:07Singular Exp $ */4 /* $Id: ipassign.cc,v 1.91 2007-09-12 09:53:01 Singular Exp $ */ 5 5 6 6 /* … … 434 434 if (res->data!=NULL) idDelete((ideal*)&res->data); 435 435 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); 437 438 jiAssignAttr(res,a); 438 439 if (((res->rtyp==IDEAL_CMD)||(res->rtyp==MODUL_CMD))
Note: See TracChangeset
for help on using the changeset viewer.