Changeset 091b0e8 in git

Timestamp:

Jun 10, 2011, 9:38:12 AM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ae7cad0b174b23760efd41f0bf7c461c5e33e96a

Parents:

b9a4477dffa95152122f8354bb7633b5a708918e

Message:

fix tr.344

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

File:

• Singular/ipshell.cc (modified) (4 diffs)

Singular/ipshell.cc

@@ -2147 +2147 @@
       else
         iv=ivCopy((intvec*)vv->m[1].Data()); //assume INTVEC
-      R->block1[j]=si_max(R->block0[j],R->block0[j]+iv->length()-1);
+      int iv_len=iv->length();
+      R->block1[j]=si_max(R->block0[j],R->block0[j]+iv_len-1);
+      if (R->block1[j]>R->N)
+      {
+        R->block1[j]=R->N;
+        iv_len=R->block1[j]-R->block0[j]+1;
+      }
       //Print("block %d from %d to %d\n",j,R->block0[j], R->block1[j]);
       int i;
@@ -2159 +2165 @@
          case ringorder_wp:
          case ringorder_Wp:
-           R->wvhdl[j] =( int *)omAlloc((iv->length())*sizeof(int));
-           for (i=0; i<iv->length();i++)
+           R->wvhdl[j] =( int *)omAlloc(iv_len*sizeof(int));
+           for (i=0; i<iv_len;i++)
            {
              R->wvhdl[j][i]=(*iv)[i];
@@ -2169 +2175 @@
            for (i=0; i<iv->length();i++) R->wvhdl[j][i]=(*iv)[i];
            R->block1[j]=si_max(R->block0[j],R->block0[j]+(int)sqrt((double)(iv->length()-1)));
+           if (R->block1[j]>R->N)
+           {
+             WerrorS("ordering matrix too big");
+             goto rCompose_err;
+           }
            break;
          case ringorder_ls:
@@ -2188 +2199 @@
 
          case ringorder_s:
-         {
            break;
-         }
 
          case ringorder_IS: