Changeset 750069 in git for kernel/combinatorics/hilb.cc

Timestamp:

Sep 22, 2016, 3:41:32 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

4ef909357cd2764e39044e78dc5f8f271de19c21

Parents:

c4ea0bb97e0fcd6d7e4ea58106ce9935683b32de6c086a438d710cf8f1f5eac494377370eacf969c

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-09-22 15:41:32+02:00

git-committer:

GitHub <noreply@github.com>2016-09-22 15:41:32+02:00

Message:

Merge pull request #789 from adipopescu/Reduce_Bound

Reduce bound

File:

• kernel/combinatorics/hilb.cc (modified) (17 diffs)

kernel/combinatorics/hilb.cc

@@ -229 +229 @@
 //!!!!!!!!!!!!!!!!!!!!! Just for Monomial Ideals !!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-//returns the degree of the monomial
-static int DegMon(poly p)
-{
-    #if 1
-    int i,deg;
-    deg = 0;
-    for(i=1;i<=currRing->N;i++)
-    {
-        deg = deg + p_GetExp(p, i, currRing);
-    }
-    return(deg);
-    #else
-    return(p_Deg(p, currRing));
-    #endif
-}
-
 //Tests if the ideal is sorted by degree
 static bool idDegSortTest(ideal I)
@@ -254 +238 @@
     for(int i = 0; i<IDELEMS(I)-1; i++)
     {
-        if(DegMon(I->m[i])>DegMon(I->m[i+1]))
+        if(p_Totaldegree(I->m[i],currRing)>p_Totaldegree(I->m[i+1],currRing))
         {
             idPrint(I);
@@ -277 +261 @@
     idSkipZeroes(I);
     #if 1
-    for(i = 0; (i<IDELEMS(I)) && (DegMon(I->m[i])<=DegMon(p)); i++)
+    for(i = 0; (i<IDELEMS(I)) && (p_Totaldegree(I->m[i],currRing)<=p_Totaldegree(p,currRing)); i++)
     {
         if(p_DivisibleBy( I->m[i],p, currRing))
@@ -284 +268 @@
         }
     }
-    for(i = IDELEMS(I)-1; (i>=0) && (DegMon(I->m[i])>=DegMon(p)); i--)
+    for(i = IDELEMS(I)-1; (i>=0) && (p_Totaldegree(I->m[i],currRing)>=p_Totaldegree(p,currRing)); i--)
     {
         if(p_DivisibleBy(p,I->m[i], currRing))
@@ -300 +284 @@
     idSkipZeroes(I);
     //First I take the case when all generators have the same degree
-    if(DegMon(I->m[0]) == DegMon(I->m[IDELEMS(I)-1]))
-    {
-        if(DegMon(p)<DegMon(I->m[0]))
+    if(p_Totaldegree(I->m[0],currRing) == p_Totaldegree(I->m[IDELEMS(I)-1],currRing))
+    {
+        if(p_Totaldegree(p,currRing)<p_Totaldegree(I->m[0],currRing))
         {
             idInsertPoly(I,p);
@@ -313 +297 @@
             return(I);
         }
-        if(DegMon(p)>=DegMon(I->m[IDELEMS(I)-1]))
+        if(p_Totaldegree(p,currRing)>=p_Totaldegree(I->m[IDELEMS(I)-1],currRing))
         {
             idInsertPoly(I,p);
@@ -320 +304 @@
         }
     }
-    if(DegMon(p)<=DegMon(I->m[0]))
+    if(p_Totaldegree(p,currRing)<=p_Totaldegree(I->m[0],currRing))
     {
         idInsertPoly(I,p);
@@ -331 +315 @@
         return(I);
     }
-    if(DegMon(p)>=DegMon(I->m[IDELEMS(I)-1]))
+    if(p_Totaldegree(p,currRing)>=p_Totaldegree(I->m[IDELEMS(I)-1],currRing))
     {
         idInsertPoly(I,p);
@@ -339 +323 @@
     for(i = IDELEMS(I)-2; ;)
     {
-        if(DegMon(p)==DegMon(I->m[i]))
+        if(p_Totaldegree(p,currRing)==p_Totaldegree(I->m[i],currRing))
         {
             idInsertPoly(I,p);
@@ -350 +334 @@
             return(I);
         }
-        if(DegMon(p)>DegMon(I->m[i]))
+        if(p_Totaldegree(p,currRing)>p_Totaldegree(I->m[i],currRing))
         {
             idInsertPoly(I,p);
@@ -424 +408 @@
         }
         p_Setm(res->m[i], currRing);
-        if(DegMon(res->m[i]) == DegMon(I->m[i]))
+        if(p_Totaldegree(res->m[i],currRing) == p_Totaldegree(I->m[i],currRing))
         {
             res->m[i] = NULL; // pDelete
@@ -749 +733 @@
     int i,j,exp;
     poly res;
-    if(DegMon(I->m[IDELEMS(I)-1])<=1)
+    if(p_Totaldegree(I->m[IDELEMS(I)-1],currRing)<=1)
     {
         res = ChoosePVar(I);
@@ -793 +777 @@
     return(TRUE);
     #else
-    if(DegMon(I->m[IDELEMS(I)-1])>1)
+    if(p_Totaldegree(I->m[IDELEMS(I)-1],currRing)>1)
     {
         return(FALSE);
@@ -849 +833 @@
     bool flag=TRUE;
     poly notsqrfree = NULL;
-    if(DegMon(I->m[IDELEMS(I)-1])<=1)
+    if(p_Totaldegree(I->m[IDELEMS(I)-1],currRing)<=1)
     {
         return(notsqrfree);
@@ -1043 +1027 @@
                 mpz_set(  &hilbertcoef[NNN], ec);
                 mpz_clear(ec);
-                hilbpower[NNN] = DegMon(q);
+                hilbpower[NNN] = p_Totaldegree(q,currRing);
                 NNN++;
             }
@@ -1049 +1033 @@
         {
             //I look if the power appears already
-            for(i = 0;(i<NNN)&&(flag == FALSE)&&(DegMon(q)>=hilbpower[i]);i++)
-            {
-                if((hilbpower[i]) == (DegMon(q)))
+            for(i = 0;(i<NNN)&&(flag == FALSE)&&(p_Totaldegree(q,currRing)>=hilbpower[i]);i++)
+            {
+                if((hilbpower[i]) == (p_Totaldegree(q,currRing)))
                 {
                     flag = TRUE;
@@ -1069 +1053 @@
                 mpz_set(  &hilbertcoef[i], ec);
                 mpz_clear(ec);
-                hilbpower[i] = DegMon(q);
+                hilbpower[i] = p_Totaldegree(q,currRing);
                 NNN++;
             }