Changeset b8f199 in git for kernel/ideals.cc

Timestamp:

Mar 16, 2011, 4:42:56 PM (12 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

fddf1c0b111391917a4d5965b7ddf45adb7c05d6

Parents:

ac434faa72fa3537bfa0e82a2b6492249ea618d8

Message:

deny qring with constant generator / disable hilb/degree/std_hilb / cleanup prune

git-svn-id: file:///usr/local/Singular/svn/trunk@13991 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/ideals.cc (modified) (5 diffs)

kernel/ideals.cc

@@ -1201 +1201 @@
   if (w!=NULL) delete w;
   idDelete(&temp);
-
   if(syz_ring!=orig_ring)
     rChangeCurrRing(orig_ring);
@@ -3839 +3838 @@
 
 /*3
-* searches for units in the components of the module arg and
-* returns the first one
-*/
-static int idReadOutUnits(ideal arg,int* comp)
+* searches for the next unit in the components of the module arg and
+* returns the first one;
+*/
+static int idReadOutPivot(ideal arg,int* comp)
 {
   if (idIs0(arg)) return -1;
@@ -3859 +3858 @@
       if (componentIsUsed[j]==0)
       {
+#ifdef HAVE_RINGS
+        if (pLmIsConstantComp(p) && rField_is_Ring(currRing) &&
+            nIsUnit(pGetCoeff(p)))
+        {
+#else
         if (pLmIsConstantComp(p))
         {
+#endif
           generator = i;
           componentIsUsed[j] = 1;
@@ -3950 +3955 @@
   int i,next_gen,next_comp;
   ideal res=arg;
-
   if (!inPlace) res = idCopy(arg);
   res->rank=si_max(res->rank,idRankFreeModule(res));
@@ -3959 +3963 @@
   loop
   {
-    next_gen = idReadOutUnits(res,&next_comp);
+    next_gen = idReadOutPivot(res,&next_comp);
     if (next_gen<0) break;
     del++;