Changeset 67e0dc in git for kernel/combinatorics/hdegree.cc

Timestamp:

Oct 21, 2015, 2:57:17 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5bd9ec36b87fa8f176a21995de2b56724d67be2d

Parents:

a1b6c917a1c8886b1bba1b05680ff06cfd39c82def1a968e317a12b42f88e04cd7f9483e47fba2f7

Message:

Merge pull request #718 from adipopescu/STDChanes2

Std over rings

File:

• kernel/combinatorics/hdegree.cc (modified) (2 diffs)

kernel/combinatorics/hdegree.cc

@@ -1010 +1010 @@
   int  i;
   int  k = ak;
-
   #if HAVE_RINGS
   if (rField_is_Ring(currRing) && (currRing->OrdSgn == -1))
   {
-  //consider just monic generators (over rings with zero-divisors)
-  ideal SS=id_Copy(S,tailRing);
-  for(i=0;i<=idElem(SS);i++)
-        {
-        if(pIsPurePower(SS->m[i])==0)
-                p_Delete(&SS->m[i],tailRing);
+    //consider just monic generators (over rings with zero-divisors)
+    ideal SS=id_Copy(S,tailRing); 
+    for(i=0;i<=idElem(S);i++)
+    {
+        if(p_IsPurePower(SS->m[i],tailRing)==0)
+                {  
+                  p_Delete(&SS->m[i],tailRing);
+                }
         }
         S=id_Copy(SS,tailRing);
-  }
+        idSkipZeroes(S);
+  }
+  #if 0
+  printf("\nThis is HC:\n");
+  for(int ii=0;ii<=idElem(S);ii++)
+  {
+    pWrite(S->m[ii]);
+  }
+  //getchar();
   #endif
-
+  #endif
+  if(idElem(S) == 0)
+    return;
   hNvar = (currRing->N);
   hexist = hInit(S, Q, &hNexist, tailRing); // tailRing?
@@ -1031 +1042 @@
   else
     hNstc = hNexist;
+  assume(hNexist > 0);
   hwork = (scfmon)omAlloc(hNexist * sizeof(scmon));
   hvar = (varset)omAlloc((hNvar + 1) * sizeof(int));