Changeset e9989f in git

Timestamp:

Aug 12, 2015, 2:13:42 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9a124249fa498488e7fe6c086eea551c001e016f

Parents:

7507543ae55ceb8b299a44ac7f671d67fa837d45

Message:

fix tr. #732

Files:

• Singular/iparith.cc (modified) (4 diffs)
• libpolys/polys/simpleideals.cc (modified) (1 diff)

Singular/iparith.cc

@@ -1828 +1828 @@
   else
   {
-    xx=(number *)omAlloc(rl*sizeof(number));
     if (nMap==NULL)
     {
@@ -1834 +1833 @@
       return TRUE;
     }
+    xx=(number *)omAlloc(rl*sizeof(number));
     for(i=rl-1;i>=0;i--)
     {
@@ -1898 +1898 @@
     // deletes also x
     c->Clean();
-    if (return_type==POLY_CMD)
+    if ((return_type==POLY_CMD) &&(result!=NULL))
     {
       res->data=(char *)result->m[0];
@@ -1913 +1913 @@
   omFree(q);
   res->rtyp=return_type;
-  return FALSE;
+  return result==NULL;
 }
 static BOOLEAN jjCOEF(leftv res, leftv u, leftv v)

libpolys/polys/simpleideals.cc

@@ -1721 +1721 @@
 ideal id_ChineseRemainder(ideal *xx, number *q, int rl, const ring r)
 {
-  int cnt=IDELEMS(xx[0])*xx[0]->nrows;
+  int cnt=0;int rw=0; int cl=0;
+  int i,j;
+  // find max. size of xx[.]:
+  for(j=rl-1;j>=0;j--)
+  {
+    i=IDELEMS(xx[j])*xx[j]->nrows;
+    if (i>cnt) cnt=i;
+    if (xx[j]->nrows >rw) rw=xx[j]->nrows; // for lifting matrices
+    if (xx[j]->ncols >cl) cl=xx[j]->ncols; // for lifting matrices
+  }
+  if (rw*cl !=cnt)
+  {
+    WerrorS("format mismatch in CRT");
+    return NULL;
+  }
   ideal result=idInit(cnt,xx[0]->rank);
-  result->nrows=xx[0]->nrows; // for lifting matrices
-  result->ncols=xx[0]->ncols; // for lifting matrices
-  int i,j;
+  result->nrows=rw; // for lifting matrices
+  result->ncols=cl; // for lifting matrices
   number *x=(number *)omAlloc(rl*sizeof(number));
   poly *p=(poly *)omAlloc(rl*sizeof(poly));
-  CFArray inv_cache(rl);;
+  CFArray inv_cache(rl);
   for(i=cnt-1;i>=0;i--)
   {
     for(j=rl-1;j>=0;j--)
     {
-      p[j]=xx[j]->m[i];
+      if(i>=IDELEMS(xx[j])*xx[j]->nrows) // out of range of this ideal
+        p[j]=NULL;
+      else
+        p[j]=xx[j]->m[i];
     }
     result->m[i]=p_ChineseRemainder(p,x,q,rl,inv_cache,r);
     for(j=rl-1;j>=0;j--)
     {
-      xx[j]->m[i]=p[j];
+      if(i<IDELEMS(xx[j])*xx[j]->nrows) xx[j]->m[i]=p[j];
     }
   }