Changeset efb096 in git for libpolys

Timestamp:

Mar 18, 2015, 3:36:09 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

c31c5835bece938cfe0770b54facad06a4501985

Parents:

f3f0ada0fecda59e7576f7bbec2608a0729a6aad

Message:

fix tr. #703 (degree/ecart for ws-ord with diff. signs)

Location:

libpolys/polys/monomials

Files:

• ring.cc (modified) (3 diffs)
• ring.h (modified) (1 diff)

libpolys/polys/monomials/ring.cc

@@ -3173 +3173 @@
       r->pFDeg = p_Totaldegree;
     }
-    if ((order[0] == ringorder_a)
+    else if ((order[0] == ringorder_a)
     || (order[0] == ringorder_wp)
-    || (order[0] == ringorder_Wp)
-    || (order[0] == ringorder_ws)
+    || (order[0] == ringorder_Wp))
+    {
+      r->pFDeg = p_WFirstTotalDegree;
+    }
+    else if ((order[0] == ringorder_ws)
     || (order[0] == ringorder_Ws))
-      r->pFDeg = p_WFirstTotalDegree;
+    {
+      for(int ii=block0[0];ii<=block1[0];ii++)
+      {
+        if (wvhdl[0][ii-1]<0) { r->MixedOrder=2;break;}
+      }
+      if (r->MixedOrder==0)
+        r->pFDeg = p_WFirstTotalDegree;
+      else
+        r->pFDeg = p_Totaldegree;
+    }
     r->firstBlockEnds=block1[0];
     r->firstwv = wvhdl[0];
@@ -3206 +3218 @@
     if ((order[1] == ringorder_a)
     || (order[1] == ringorder_wp)
-    || (order[1] == ringorder_Wp)
-    || (order[1] == ringorder_ws)
+    || (order[1] == ringorder_Wp))
+      r->pFDeg = p_WFirstTotalDegree;
+    else if ((order[1] == ringorder_ws)
     || (order[1] == ringorder_Ws))
-      r->pFDeg = p_WFirstTotalDegree;
+    {
+      for(int ii=block0[1];ii<=block1[1];ii++)
+        if (wvhdl[1][ii-1]<0) { r->MixedOrder=2;break;}
+      if (r->MixedOrder==FALSE)
+        r->pFDeg = p_WFirstTotalDegree;
+      else
+        r->pFDeg = p_Totaldegree;
+    }
   }
   /*------- more than one block ----------------------*/
@@ -3246 +3266 @@
 
   if (rOrd_is_Totaldegree_Ordering(r) || rOrd_is_WeightedDegree_Ordering(r))
-    r->pFDeg = p_Deg;
+  {
+    if(r->MixedOrder==FALSE)
+      r->pFDeg = p_Deg;
+    else
+      r->pFDeg = p_Totaldegree;
+  }
 
   if( rGetISPos(0, r) != -1 ) // Are there Schreyer induced blocks?

libpolys/polys/monomials/ring.h

@@ -741 +741 @@
 inline BOOLEAN rHasGlobalOrdering(const ring r){ return (r->OrdSgn==1); }
 inline BOOLEAN rHasLocalOrMixedOrdering(const ring r){ return (r->OrdSgn==-1); }
-inline BOOLEAN rHasMixedOrdering(const ring r) { return (r->MixedOrder==1); }
+inline BOOLEAN rHasMixedOrdering(const ring r) { return (r->MixedOrder); }
 
 // #define rHasGlobalOrdering(R) ((R)->OrdSgn==1)