Changeset 441a2e in git for kernel

Timestamp:

Jul 26, 2011, 4:40:43 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bf6a4d5920ef44ffb48d0fc83b4d53589111d60c

Parents:

b28bafedafd8d93bd2ff41d9466d46678bec1341

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-26 16:40:43+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:53:35+01:00

Message:

restore: mp_RecMin, mp_detBareiss -> matpol.cc

File:

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

kernel/ideals.cc

@@ -543 +543 @@
         p = pCopy(tempstd->m[j]);
       else
-        p = prCopyR(tempstd->m[j], syz_ring);
+        p = prCopyR(tempstd->m[j], syz_ring,currRing);
       p_Shift(&p,-syzComp-isIdeal,currRing);
       result->m[k] = p;
@@ -694 +694 @@
   assume(currRing != NULL);
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring.TRUE);
+  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);
   rChangeCurrRing(syz_ring);
 
@@ -702 +702 @@
   if (orig_ring != syz_ring)
   {
-    s_h1=idrCopyR_NoSort(h1,orig_ring);
+    s_h1=idrCopyR_NoSort(h1,orig_ring,syz_ring);
   }
   else
@@ -774 +774 @@
   )
   {
-    ring dp_C_ring = rCurrRingAssure_dp_C();
+    ring dp_C_ring = rAssure_dp_C(syz_ring);
     if (dp_C_ring != syz_ring)
+    {
+      rChangeCurrRing(dp_C_ring);
       e = idrMoveR_NoSort(e, syz_ring, dp_C_ring);
+    }
     resolvente res = sySchreyerResolvente(e,-1,&length,TRUE, TRUE);
     intvec * dummy = syBetti(res,length,&reg, *w);
@@ -824 +827 @@
   if (orig_ring != syz_ring)
   {
-    s_h1=idrCopyR_NoSort(h1,orig_ring);
+    s_h1=idrCopyR_NoSort(h1,orig_ring, syz_ring);
   }
   else
@@ -898 +901 @@
 
   if (orig_ring != syz_ring)
-    s_h1 = idrCopyR_NoSort(h1,orig_ring);
+    s_h1 = idrCopyR_NoSort(h1,orig_ring,syz_ring);
   else
     s_h1 = h1;
@@ -1106 +1109 @@
   if (orig_ring != syz_ring)
   {
-    s_mod = idrCopyR_NoSort(mod,orig_ring);
-    s_temp = idrCopyR_NoSort(submod,orig_ring);
+    s_mod = idrCopyR_NoSort(mod,orig_ring,syz_ring);
+    s_temp = idrCopyR_NoSort(submod,orig_ring,syz_ring);
   }
   else
@@ -1288 +1291 @@
       if(pDivisibleBy(Q->m[j],p))
       {
-        poly p0=pDivideM(pHead(p),pHead(Q->m[j]));
+        poly p0=p_DivideM(pHead(p),pHead(Q->m[j]),currRing);
         if(w==NULL)
           p=pJet(pSub(p,ppMult_mm(Q->m[j],p0)),N);
@@ -1460 +1463 @@
 
   ring orig_ring=currRing;
-  ring syz_ring=rAssure_SyzComp(orig_ring.TRUE);
+  ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);
   rChangeCurrRing(syz_ring);
   rSetSyzComp(kmax-1,syz_ring);
@@ -1806 +1809 @@
           }
         }
-        p = mpDetBareiss(tmp);
+        p = mp_DetBareiss(tmp,currRing);
         if (p!=NULL)
         {
@@ -1870 +1873 @@
         }
       }
-      p = mpDetBareiss(tmp);
+      p = mp_DetBareiss(tmp,vcurrRing);
       if (p!=NULL)
       {
@@ -1933 +1936 @@
     return NULL;
   }
-  h = idMatrix2Module(mpCopy(a));
-  bound = smExpBound(h,c,r,ar);
+  h = idMatrix2Module(mp_Copy(a,currRing));
+  bound = sm_ExpBound(h,c,r,ar,currRing);
   idDelete(&h);
-  tmpR=smRingChange(&origR,bound);
+  tmpR=sm_RingChange(origR,bound);
   b = mpNew(r,c);
   for (i=r*c-1;i>=0;i--)
   {
     if (a->m[i])
-      b->m[i] = prCopyR(a->m[i],origR);
+      b->m[i] = prCopyR(a->m[i],origR,currRing);
   }
   if (R!=NULL)
   {
-    R = idrCopyR(R,origR);
+    R = idrCopyR(R,origR,currRing);
     //if (ar>1) // otherwise done in mpMinorToResult
     //{
@@ -1960 +1963 @@
   idSkipZeroes(result);
   rChangeCurrRing(origR);
-  result = idrMoveR(result,tmpR);
+  result = idrMoveR(result,tmpR,origR);
   smKillModifiedRing(tmpR);
   idTest(result);