Changeset 313806 in git

Timestamp:

Feb 21, 2024, 2:40:39 PM (2 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

12d338b9360721f933ace848728103c748c7cf45

Parents:

2d5d7e969be169286decf139f1ba0d2d47c38dba

Message:

fix: ring from list with ordering M

Files:

• Singular/ipshell.cc (modified) (3 diffs)
• Tst/Short/bug_ringlist_M.res.gz.uu (added)
• Tst/Short/bug_ringlist_M.stat (added)
• Tst/Short/bug_ringlist_M.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)

Singular/ipshell.cc

@@ -2605 +2605 @@
         &&(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->order[j_in_R]==ringorder_M)
+          {
+            int sq=(int)sqrt((double)(iv_len));
+            R->block1[j_in_R]=si_max(R->block0[j_in_R],R->block0[j_in_R]+sq-1);
+          }
+          else
+            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)
             {
+            Print("R->block0[j_in_R]=%d,N=%d\n",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;
@@ -2616 +2623 @@
             iv_len=R->block1[j_in_R]-R->block0[j_in_R]+1;
           }
-          //Print("block %d from %d to %d\n",j,R->block0[j], R->block1[j]);
+          //Print("block %d(%s) from %d to %d\n",j_in_R,
+          //  rSimpleOrdStr(R->order[j_in_R]),R->block0[j_in_R], R->block1[j_in_R]);
         }
         int i;
@@ -2650 +2658 @@
              R->wvhdl[j_in_R] =( int *)omAlloc((iv->length())*sizeof(int));
              for (i=0; i<iv->length();i++) R->wvhdl[j_in_R][i]=(*iv)[i];
-             R->block1[j_in_R]=si_max(R->block0[j_in_R],R->block0[j_in_R]+(int)sqrt((double)(iv->length())));
              if (R->block1[j_in_R]>R->N)
              {

Tst/Short/ok_s.lst

@@ -37 +37 @@
 bug_ring_red
 bug_ringlist
+bug_ringlist_M
 bug_sca
 bug_sheafcoh