Changeset 40b65a3 in git

Timestamp:

Aug 15, 2019, 2:42:44 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'd1ba061a762c62d3a25159d8da8b6e17332291fa')

Children:

61805653a98bcb59b2ce76a4d538b2fb05459e28a631cdc0aa559cc581e085981696acaa3b7216c1

Parents:

43d23c46c518748a9f4fa43d4d8d51ff7fe69354

Message:

fix: rComposeOrder for M

File:

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

Singular/ipshell.cc

@@ -2634 +2634 @@
              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()-1)));
+             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)
              {
-               WerrorS("ordering matrix too big");
-               return TRUE;
+               R->block1[j_in_R]=R->N;
              }
              break;
@@ -2650 +2649 @@
            case ringorder_Dp:
            case ringorder_rp:
-             #if 0
+             #if 0
              for (i=0; i<iv_len;i++)
              {
@@ -2661 +2660 @@
                }
              }
-             #endif // break absfact.tst
+             #endif // break absfact.tst
              break;
            case ringorder_S: