Changeset 90adf83 in git

Timestamp:

Aug 14, 2019, 5:45:22 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

81a41a5469a773c93de24cfa043771eb7c07082b

Parents:

777d4bb19a3e35537640bec3fc2db8899f9ffc8b

Message:

fix: rComposeOrder

File:

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

Singular/ipshell.cc

@@ -1692 +1692 @@
         case ringorder_Ds:
         case ringorder_lp:
+        case ringorder_rp:
+        case ringorder_ls:
           for(;j>=0; j--) (*iv)[j]=1;
           break;
@@ -2205 +2207 @@
         case ringorder_Ds:
         case ringorder_lp:
+        case ringorder_ls:
+        case ringorder_rp:
           for(;j>=0; j--) (*iv)[j]=1;
           break;
@@ -2532 +2536 @@
           continue;
         }
-        if ((vv->m[1].Typ()!=INTVEC_CMD) && (vv->m[1].Typ()!=INT_CMD))
+        if ((vv->m[1].Typ()!=INTVEC_CMD) && (vv->m[1].Typ()!=INT_CMD)
+        && (vv->m[1].Typ()!=INTMAT_CMD))
         {
           PrintS(lString(vv));
@@ -2562 +2567 @@
         intvec *iv;
         if (vv->m[1].Typ()==INT_CMD)
-          iv=new intvec((int)(long)vv->m[1].Data(),(int)(long)vv->m[1].Data());
+        {
+          int l=si_max(1,(int)(long)vv->m[1].Data());
+          iv=new intvec(l);
+          for(int i=0;i<l;i++) (*iv)[i]=1;
+        }
         else
-          iv=ivCopy((intvec*)vv->m[1].Data()); //assume INTVEC
+          iv=ivCopy((intvec*)vv->m[1].Data()); //assume INTVEC/INTMAT
         int iv_len=iv->length();
         if (iv_len==0)
         {
-          Werror("empty intvec for ordering %d (%s)",j_in_R,rSimpleOrdStr(R->order[j_in_R]));
+          Werror("empty intvec for ordering %d (%s)",j_in_R+1,rSimpleOrdStr(R->order[j_in_R]));
           return TRUE;
+        }
+        if (R->order[j_in_R]==ringorder_M)
+        {
+          if (vv->m[1].rtyp==INTMAT_CMD) iv->makeVector();
+          iv_len=iv->length();
         }
         if ((R->order[j_in_R]!=ringorder_s)
@@ -2636 +2650 @@
            case ringorder_Dp:
            case ringorder_rp:
+             #if 0
+             for (i=0; i<iv_len;i++)
+             {
+               if (((*iv)[i]!=1)&&(iv_len!=1))
+               {
+                 iv->show(1);
+                 Warn("ignore weight %d for ord %d (%s) at pos %d\n>>%s<<",
+                   (*iv)[i],j_in_R+1,rSimpleOrdStr(R->order[j_in_R]),i+1,my_yylinebuf);
+                 break;
+               }
+             }
+             #endif // break absfact.tst
              break;
            case ringorder_S: