Changeset de71f84 in git

Timestamp:

Oct 14, 2011, 4:24:56 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a657104b677b4c461d018cbf3204d72d34ad66a9')

Children:

a24e0a1011bb50b7d89a3db0abc1e1b1df81f141

Parents:

5e600bf8be6b726a72f343024cd7f273e718f71a

Message:

fix tr. 359

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

Files:

• Singular/iparith.cc (modified) (2 diffs)
• Tst/Short/bug_tr359.res.gz.uu (added)
• Tst/Short/bug_tr359.stat (added)
• Tst/Short/bug_tr359.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)

Singular/iparith.cc

@@ -6064 +6064 @@
 static BOOLEAN jjMATRIX_Id(leftv res, leftv u, leftv v,leftv w)
 {
-  matrix m=mpNew((int)(long)v->Data(),(int)(long)w->Data());
+  int mi=(int)(long)v->Data();
+  int ni=(int)(long)w->Data();
+  if ((mi<1)||(ni<1))
+  {
+    WerrorS("matrix dimensions must be positive");
+    return TRUE;
+  }
+  matrix m=mpNew(mi,ni);
   ideal I=(ideal)u->CopyD(IDEAL_CMD);
-  int i=si_min(IDELEMS(I),(int)(long)v->Data()*(int)(long)w->Data());
+  int i=si_min(IDELEMS(I),mi*ni);
   //for(i=i-1;i>=0;i--)
   //{
@@ -6080 +6087 @@
 static BOOLEAN jjMATRIX_Mo(leftv res, leftv u, leftv v,leftv w)
 {
+  int mi=(int)(long)v->Data();
+  int ni=(int)(long)w->Data();
+  if ((mi<1)||(ni<1))
+  {
+    WerrorS("matrix dimensions must be positive");
+    return TRUE;
+  }
   res->data = (char *)idModule2formatedMatrix((ideal)u->CopyD(MODUL_CMD),
-           (int)(long)v->Data(),(int)(long)w->Data());
+           mi,ni);
   return FALSE;
 }
 static BOOLEAN jjMATRIX_Ma(leftv res, leftv u, leftv v,leftv w)
 {
-  matrix m=mpNew((int)(long)v->Data(),(int)(long)w->Data());
+  int mi=(int)(long)v->Data();
+  int ni=(int)(long)w->Data();
+  if ((mi<1)||(ni<1))
+  {
+    WerrorS("matrix dimensions must be positive");
+    return TRUE;
+  }
+  matrix m=mpNew(mi,ni);
   matrix I=(matrix)u->CopyD(MATRIX_CMD);
-  int r=si_min(MATROWS(I),(int)(long)v->Data());
-  int c=si_min(MATCOLS(I),(int)(long)w->Data());
+  int r=si_min(MATROWS(I),mi);
+  int c=si_min(MATCOLS(I),ni);
   int i,j;
   for(i=r;i>0;i--)

Tst/Short/ok_s.lst

@@ -104 +104 @@
 bug_tr346
 bug_tr357
+bug_tr359
 bug_tr376
 brnoeth_s