Changeset a6824e in git

Timestamp:

Sep 8, 2017, 5:57:53 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

2757dd2abe803f085a8bdaf5ff997df6453d72d3

Parents:

158aae9f8c838b970751b11eff13ba1bdf5a4379

Message:

fix: tr. #809

File:

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

Singular/ipshell.cc

@@ -2546 +2546 @@
         else
         {
-           int jj=j_in_R-1;
-           while((jj>=0)
-           && ((R->order[jj]== ringorder_a)
-              || (R->order[jj]== ringorder_aa)
-              || (R->order[jj]== ringorder_am)
-              || (R->order[jj]== ringorder_c)
-              || (R->order[jj]== ringorder_C)
-              || (R->order[jj]== ringorder_s)
-              || (R->order[jj]== ringorder_S)
-           ))
-           {
-             //Print("jj=%, skip %s\n",rSimpleOrdStr(R->order[jj]));
-             jj--;
-           }
-           if (jj<0) R->block0[j_in_R]=1;
-           else       R->block0[j_in_R]=R->block1[jj]+1;
+          int jj=j_in_R-1;
+          while((jj>=0)
+          && ((R->order[jj]== ringorder_a)
+             || (R->order[jj]== ringorder_aa)
+             || (R->order[jj]== ringorder_am)
+             || (R->order[jj]== ringorder_c)
+             || (R->order[jj]== ringorder_C)
+             || (R->order[jj]== ringorder_s)
+             || (R->order[jj]== ringorder_S)
+          ))
+          {
+            //Print("jj=%, skip %s\n",rSimpleOrdStr(R->order[jj]));
+            jj--;
+          }
+          if (jj<0) R->block0[j_in_R]=1;
+          else      R->block0[j_in_R]=R->block1[jj]+1;
         }
         intvec *iv;
@@ -2569 +2569 @@
           iv=ivCopy((intvec*)vv->m[1].Data()); //assume INTVEC
         int iv_len=iv->length();
-        if (R->order[j_in_R]!=ringorder_s)
+        if ((R->order[j_in_R]!=ringorder_s)
+        &&(R->order[j_in_R]!=ringorder_c)
+        &&(R->order[j_in_R]!=ringorder_C))
         {
           R->block1[j_in_R]=si_max(R->block0[j_in_R],R->block0[j_in_R]+iv_len-1);
           if (R->block1[j_in_R]>R->N)
           {
+            if (R->block0[j_in_R]>R->N)
+            {
+              Werror("not enough variables for ordering %d (%s)",j_in_R,rSimpleOrdStr(R->order[j_in_R]));
+              return TRUE;
+            }
             R->block1[j_in_R]=R->N;
             iv_len=R->block1[j_in_R]-R->block0[j_in_R]+1;