Changeset a5d181c in git

Timestamp:

Oct 25, 2011, 11:26:50 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

0033111f9b9caf502a298c422c3cbea31cee1927

Parents:

a82001e491202d6564ebdf4f187241737b315ec6

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-10-25 11:26:50+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:14:09+01:00

Message:

fix to tr. 379 (weight.cc::iv2array)
fix to tr. 380 (ideals.cc::idLift)

File:

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

kernel/ideals.cc

@@ -277 +277 @@
 
   ideal res=idElimination(h,t);
-  // cleanup 
+  // cleanup
   idDelete(&h);
-  res=idrMoveR(res,r,origRing);
+  if (res!=NULL) res=idrMoveR(res,r,origRing);
   rChangeCurrRing(origRing);
   rDelete(r);
@@ -1043 +1043 @@
   {
     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)
@@ -1518 +1502 @@
   {
     WerrorS("cannot eliminate in a qring");
-    return idCopy(h1);
+    return NULL;
   }
   if (idIs0(h1)) return idInit(1,h1->rank);
@@ -1531 +1515 @@
       {
         WerrorS("no elimination is possible: subalgebra is not admissible");
-        return idCopy(h1);
+        return NULL;
       }
     }
@@ -1673 +1657 @@
       if (w!=NULL)
         delete w;
-      return idCopy(h1);
+      return NULL;
     }
   }
@@ -2484 +2468 @@
   intvec *w = NULL;
 
-  ring save_r = currRing; rChangeCurrRing(r); ideal S=idSyzygies(I,testHomog,&w); rChangeCurrRing(save_r);   
-   
+  ring save_r = currRing; rChangeCurrRing(r); ideal S=idSyzygies(I,testHomog,&w); rChangeCurrRing(save_r);
+
   if (w!=NULL) delete w;
   poly gg=p_TakeOutComp(&(S->m[0]), 2, r);
@@ -2491 +2475 @@
   poly gcd_p=singclap_pdivide(f,gg, r);
   p_Delete(&gg, r);
-   
+
   return gcd_p;
 }
@@ -2608 +2592 @@
           x[j]=n_Init(0, R->cf); // is R->cf really n_Q???, yes!
       }
-       
+
       number n=nChineseRemainder(x,q,rl, R->cf);