Changeset 9a6bfda in git

Timestamp:

Jan 16, 2019, 5:57:49 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

4e6488cbb59b112719b2f54d588f978789d5160a

Parents:

7ddda32519be0d8983ac4300f0a8dd9c34204c6b

Message:

removed rHasTDeg

Files:

• Singular/dyn_modules/freegb/freegb.cc (modified) (1 diff)
• libpolys/polys/monomials/ring.cc (modified) (3 diffs)
• libpolys/polys/monomials/ring.h (modified) (1 diff)

Singular/dyn_modules/freegb/freegb.cc

@@ -28 +28 @@
     || (rHasLocalOrMixedOrdering(r)))
     {
-      //WerrorS("only for rings with a global ordering of one block");
-      Werror("only for rings with a global ordering of one block,i=%d, o=%d",i,r->order[i]);
+      WerrorS("only for rings with a global ordering of one block");
+      //Werror("only for rings with a global ordering of one block,i=%d, o=%d",i,r->order[i]);
       return TRUE;
     }

libpolys/polys/monomials/ring.cc

@@ -4468 +4468 @@
 }
 
-BOOLEAN rHasTDeg(ring r)
-{
-  int i;
+ring rAssure_TDeg(ring r, int &pos)
+{
+  if (r->N==1) // special: dp(1)==lp(1)== no entry in typ
+  {
+    pos=r->VarL_LowIndex;
+    return r;
+  }
   if (r->typ!=NULL)
   {
-    for(i=r->OrdSize-1;i>=0;i--)
+    for(int i=r->OrdSize-1;i>=0;i--)
     {
       if ((r->typ[i].ord_typ==ro_dp)
@@ -4479 +4483 @@
       && (r->typ[i].data.dp.end==r->N))
       {
-        return TRUE;
-      }
-    }
-  }
-  return FALSE;
-}
-
-ring rAssure_TDeg(ring r, int &pos)
-{
-  int i;
-  if (r->N==1) // special: dp(1)==lp(1)== no entry in typ
-  {
-    pos=r->VarL_LowIndex;
-    return r;
-  }
-  if (r->typ!=NULL)
-  {
-    for(i=r->OrdSize-1;i>=0;i--)
-    {
-      if ((r->typ[i].ord_typ==ro_dp)
-      && (r->typ[i].data.dp.start==1)
-      && (r->typ[i].data.dp.end==r->N))
-      {
         pos=r->typ[i].data.dp.place;
         //printf("no change, pos=%d\n",pos);
@@ -4519 +4500 @@
   }
 
-  i=rBlocks(r);
+  int i=rBlocks(r);
   int j;
 

libpolys/polys/monomials/ring.h

@@ -737 +737 @@
 ring   rAssure_SyzComp_CompLastBlock(const ring r);
 ring   rAssure_TDeg(const ring r, int &pos);
-BOOLEAN rHasTDeg(const ring r);
 
 /// return the max-comonent wchich has syzIndex i