Changeset bead81 in git

Timestamp:

Apr 20, 2010, 6:11:58 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c11951e6cc1b26a68bd26f0429981f14de14a185

Parents:

0ddbd9dc2626d64cdc92707919db795de0211cab

Message:

track 225: exceptional cases and rank stuff in idLift

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

File:

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

kernel/ideals.cc

@@ -74 +74 @@
 {
   assume( debugPrint >= 0 );
-  
+
   if( id == NULL )
     PrintS("(NULL)");
@@ -1380 +1380 @@
   }
   h2->rank = syzcomp+i+1;
-  
+
   //if (hom==testHomog)
   //{
@@ -1725 +1725 @@
           (*syz)->m[j]=s_h3->m[j];
           s_h3->m[j]=NULL;
-        } 
+        }
         else
           pDelete(&(s_h3->m[j]));
@@ -1846 +1846 @@
     return idInit(1,mod->rank);
   }
-  if (idIs0(mod))
-  {
+  if (idIs0(mod)) /* and not idIs0(submod) */
+  {
+    WerrorS("2nd module does not lie in the first");
+    #if 0
     if (unit!=NULL)
     {
@@ -1862 +1864 @@
     }
     return idInit(1,mod->rank);
+    #endif
+    return idInit(IDELEMS(submod),submod->rank);
   }
   if (unit!=NULL)
@@ -1869 +1873 @@
       comps_to_add--;
   }
-  k=idRankFreeModule(mod);
+  k=si_max(idRankFreeModule(mod),idRankFreeModule(submod));
   if  ((k!=0) && (lsmod==0)) lsmod=1;
   k=si_max(k,(int)mod->rank);
+  if (k<submod->rank) { WarnS("rk(submod) > rk(mod) ?");k=submod->rank; }
 
   ring orig_ring=currRing;
@@ -3143 +3148 @@
   if (pLexOrder && (currRing->order[0]==ringorder_lp))
      d=pTotaldegree;
-  else 
+  else
      d=pFDeg;
   int length=IDELEMS(m);