Changeset ea2946 in git

Timestamp:

Mar 15, 2017, 4:26:25 PM (6 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

d033ef81bb838f48e825a5138c88cbccc64b2976

Parents:

6e2e7521c312ce51f1fdd9a33f2d3230d49a993b

Message:

fix: tr. #785 (setting pFDeg, p_WTotaldegree)

Files:

• Tst/Short/bug_tr785.res.gz.uu (added)
• Tst/Short/bug_tr785.stat (added)
• Tst/Short/bug_tr785.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)
• libpolys/polys/monomials/p_polys.cc (modified) (2 diffs)
• libpolys/polys/monomials/ring.cc (modified) (1 diff)

Tst/Short/ok_s.lst

@@ -69 +69 @@
 bug_tr778
 bug_tr779
+bug_tr785
 bug_genus_etc
 conv_bi

libpolys/polys/monomials/p_polys.cc

@@ -629 +629 @@
         }
         break;
+      case ringorder_a:
+        for (k=b0 /*r->block0[i]*/;k<=b1 /*r->block1[i]*/;k++)
+        { // only one line
+          j+= p_GetExp(p,k,r)*r->wvhdl[i][k - b0 /*r->block0[i]*/];
+        }
+        return j*r->OrdSgn;
       case ringorder_wp:
       case ringorder_ws:
@@ -669 +675 @@
       case ringorder_IS:
         break;
-      case ringorder_a:
-        for (k=b0 /*r->block0[i]*/;k<=b1 /*r->block1[i]*/;k++)
-        { // only one line
-          j+= p_GetExp(p,k, r)*r->wvhdl[i][ k- b0 /*r->block0[i]*/];
-        }
-        //break;
-        return j;
 
 #ifndef SING_NDEBUG

libpolys/polys/monomials/ring.cc

@@ -3158 +3158 @@
       }
       if (r->MixedOrder==0)
-        r->pFDeg = p_WFirstTotalDegree;
+      {
+        if ((block0[0]==1)&&(block1[0]==r->N))
+          r->pFDeg = p_WTotaldegree;
+        else
+          r->pFDeg = p_WFirstTotalDegree;
+      }
       else
         r->pFDeg = p_Totaldegree;