Changeset b304ba in git

Timestamp:

Oct 21, 2011, 2:37:32 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

bc4dd17ae0bd4c02957f75f188075907873f7935

Parents:

780e112edff75c0cf87a2cbc679791d1307e3f7e

Message:

fix tr. 380

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

Files:

• Singular/iparith.cc (modified) (3 diffs)
• kernel/ideals.cc (modified) (8 diffs)

Singular/iparith.cc

@@ -1814 +1814 @@
   ideal R; matrix U;
   ideal m = idLift(vi,ui,&R, FALSE,hasFlag(v,FLAG_STD),TRUE,&U);
+  if (m==NULL) return TRUE;
   // now make sure that all matices have the corect size:
   matrix T = idModule2formatedMatrix(m,vl,ul);
@@ -2372 +2373 @@
 static BOOLEAN jjLIFT(leftv res, leftv u, leftv v)
 {
-  ideal m;
   BITSET save_test=test;
   int ul= IDELEMS((ideal)u->Data());
   int vl= IDELEMS((ideal)v->Data());
-  m = idLift((ideal)u->Data(),(ideal)v->Data(),NULL,FALSE,hasFlag(u,FLAG_STD));
+  ideal m = idLift((ideal)u->Data(),(ideal)v->Data(),NULL,FALSE,
+                   hasFlag(u,FLAG_STD));
+  if (m==NULL) return TRUE;
   res->data = (char *)idModule2formatedMatrix(m,ul,vl);
   test=save_test;
@@ -6133 +6135 @@
     = idLift((ideal)u->Data(),(ideal)v->Data(),NULL,FALSE,hasFlag(u,FLAG_STD),
              FALSE, (matrix *)(&(IDMATRIX((idhdl)(w->data)))));
+  if (m==NULL) return TRUE;
   res->data = (char *)idModule2formatedMatrix(m,ul,vl);
   test=save_test;

kernel/ideals.cc

@@ -263 +263 @@
 #else
           if (pComparePolys(id->m[i], id->m[j])) pDelete(&id->m[j]);
-#endif          
+#endif
         }
       }
@@ -365 +365 @@
 #ifdef HAVE_RINGS
           }
-#endif          
+#endif
         }
       }
@@ -443 +443 @@
   if (a==NULL) return -1;
 
-  if (nolex) 
+  if (nolex)
   {
     int r=pLmCmp(a,b);
@@ -1190 +1190 @@
 
   ideal res=idElimination(h,t);
-  // cleanup 
+  // cleanup
   idDelete(&h);
-  res=idrMoveR(res,r,origRing);
+  if (res!=NULL) res=idrMoveR(res,r,origRing);
   rChangeCurrRing(origRing);
   rKill(r);
@@ -1953 +1953 @@
   {
     WerrorS("2nd module does not lie in the first");
-    #if 0
-    if (unit!=NULL)
-    {
-      i=IDELEMS(submod);
-      *unit=mpNew(i,i);
-      for (j=i;j>0;j--)
-      {
-        MATELEM(*unit,j,j)=pOne();
-      }
-    }
-    if (rest!=NULL)
-    {
-      *rest=idCopy(submod);
-    }
-    return idInit(1,mod->rank);
-    #endif
-    return idInit(IDELEMS(submod),submod->rank);
+    return NULL;
   }
   if (unit!=NULL)
@@ -2626 +2610 @@
   {
     WerrorS("cannot eliminate in a qring");
-    return idCopy(h1);
+    return NULL;
   }
   if (idIs0(h1)) return idInit(1,h1->rank);
@@ -2639 +2623 @@
       {
         WerrorS("no elimination is possible: subalgebra is not admissible");
-        return idCopy(h1);
+        return NULL;
       }
     }
@@ -2781 +2765 @@
       if (w!=NULL)
         delete w;
-      return idCopy(h1);
+      return NULL;
     }
   }