Changeset ece1ce in git

Timestamp:

Mar 2, 2012, 12:13:46 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'fc741b6502fd8a97288eaa3eba6e5220f3c3df87')

Children:

ecf01903b0f6a2aacb4b83bf49802240d6226a9f

Parents:

f93c5e9d617ac7c7445a38a6607c400467d15ef7

Message:

fix: rCompose/NegOffset for ordering am/

Files:

• Singular/ipshell.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (2 diffs)

Singular/ipshell.cc

@@ -2319 +2319 @@
            }
            break;
+         case ringorder_am:
+           R->wvhdl[j] =( int *)omAlloc((iv->length()+1)*sizeof(int));
+           for (i=0; i<iv_len;i++)
+           {
+             R->wvhdl[j][i]=(*iv)[i];
+           }
+           R->wvhdl[j][i]=iv->length() - iv_len;
+           //printf("ivlen:%d,iv->len:%d,mod:%d\n",iv_len,iv->length(),R->wvhdl[j][i]);
+           for (; i<iv->length(); i++)
+           {
+              R->wvhdl[j][i+1]=(*iv)[i];
+           }
+           break;
          case ringorder_M:
            R->wvhdl[j] =( int *)omAlloc((iv->length())*sizeof(int));

libpolys/polys/monomials/ring.cc

@@ -3347 +3347 @@
     for(i=0;i<r->OrdSize;i++)
     {
-      if(r->typ[i].ord_typ==ro_wp_neg) l++;
+      if((r->typ[i].ord_typ==ro_wp_neg)
+      ||(r->typ[i].ord_typ==ro_am))
+        l++;
     }
     if (l>0)
@@ -3359 +3361 @@
         {
           r->NegWeightL_Offset[l]=r->typ[i].data.wp.place;
+          l++;
+        }
+        else if(r->typ[i].ord_typ==ro_am)
+        {
+          r->NegWeightL_Offset[l]=r->typ[i].data.am.place;
           l++;
         }