Changeset b7cfaf in git for kernel/ideals.cc

Timestamp:

Jul 26, 2011, 11:34:05 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

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

Children:

86152998894ac968561dfca4ba268464c73e7b74

Parents:

1558d57b639351ad0ad10d1e5e337419bfcf21fb

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-26 11:34:05+02:00

git-committer:

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

Message:

fix: pSeries
moved pShift to p_polys::p_Shift

File:

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

kernel/ideals.cc

@@ -69 +69 @@
 
   homog = idHomModule(h1,currQuotient,&wth);
-  if (rHasGlobalOrdering_currRing())
+  if (rHasGlobalOrdering(currRing))
   {
     if(!homog)
@@ -92 +92 @@
   IDELEMS(e) = 16;
   h2 = kStd(h1,currQuotient,isNotHomog,NULL);
-  h3 = idMaxIdeal();
+  h3 = idMaxIdeal(1);
   h4=idMult(h2,h3);
   idDelete(&h3);
@@ -235 +235 @@
   /*  else      qresult->next = NULL;*/
   return result;
-}
-
-/*2
-* verschiebt die Indizees der Modulerzeugenden um i
-*/
-void pShift (poly * p,int i)
-{
-  poly qp1 = *p,qp2 = *p;/*working pointers*/
-  int     j = pMaxComp(*p),k = pMinComp(*p);
-
-  if (j+i < 0) return ;
-  while (qp1 != NULL)
-  {
-    if ((pGetComp(qp1)+i > 0) || ((j == -i) && (j == k)))
-    {
-      pAddComp(qp1,i);
-      pSetmComp(qp1);
-      qp2 = qp1;
-      pIter(qp1);
-    }
-    else
-    {
-      if (qp2 == *p)
-      {
-        pIter(*p);
-        pLmDelete(&qp2);
-        qp2 = *p;
-        qp1 = *p;
-      }
-      else
-      {
-        qp2->next = qp1->next;
-        if (qp1!=NULL) pLmDelete(&qp1);
-        qp1 = qp2->next;
-      }
-    }
-  }
 }
 
@@ -385 +348 @@
   ring orig_ring=currRing;
   ring syz_ring=rCurrRingAssure_SyzComp();
-  rSetSyzComp(length);
+  rSetSyzComp(length, syz_ring);
 
   while ((j>0) && (first->m[j-1]==NULL)) j--;
@@ -440 +403 @@
       else
       {
-        p = prMoveR(temp1->m[i], syz_ring);
+        p = prMoveR(temp1->m[i], syz_ring,orig_ring);
       }
       temp1->m[i]=NULL;
@@ -524 +487 @@
   ring orig_ring=currRing;
   ring syz_ring=rCurrRingAssure_SyzComp();
-  rSetSyzComp(syzComp);
+  rSetSyzComp(syzComp, syz_ring);
 
   bigmat = idInit(j,(k+1)*maxrk);
@@ -622 +585 @@
     Warn("syzcomp too low, should be %d instead of %d",k,syzcomp);
     syzcomp = k;
-    rSetSyzComp(k);
+    rSetSyzComp(k,currRing);
   }
   h2->rank = syzcomp+i+1;
@@ -732 +695 @@
 
   if (setSyzComp)
-    rSetSyzComp(k);
+    rSetSyzComp(k,syz_ring);
 
   if (orig_ring != syz_ring)
@@ -768 +731 @@
     s_h3->rank -= k;
     rChangeCurrRing(orig_ring);
-    s_h3 = idrMoveR_NoSort(s_h3, syz_ring);
+    s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
     rKill(syz_ring);
     #ifdef HAVE_PLURAL
@@ -810 +773 @@
     ring dp_C_ring = rCurrRingAssure_dp_C();
     if (dp_C_ring != syz_ring)
-      e = idrMoveR_NoSort(e, syz_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);
@@ -853 +816 @@
   ring syz_ring=rCurrRingAssure_SyzComp();
 
-  rSetSyzComp(k);
+  rSetSyzComp(k,syz_ring);
 
   if (orig_ring != syz_ring)
@@ -876 +839 @@
     idSkipZeroes(s_h3);
     rChangeCurrRing(orig_ring);
-    s_h3 = idrMoveR_NoSort(s_h3, syz_ring);
+    s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
     rKill(syz_ring);
     idTest(s_h3);
@@ -925 +888 @@
   ring orig_ring = currRing;
   ring syz_ring = rCurrRingAssure_SyzComp();
-  rSetSyzComp(k);
+  rSetSyzComp(k,syz_ring);
 
   ideal s_h1=h1;
@@ -1010 +973 @@
     if (s_h2->m[j] != NULL)
     {
-      q = prMoveR( s_h2->m[j], syz_ring);
+      q = prMoveR( s_h2->m[j], syz_ring,orig_ring);
       s_h2->m[j] = NULL;
 
@@ -1030 +993 @@
   for (i=0; i<IDELEMS(s_h3); i++)
   {
-    s_h3->m[i] = prMoveR_NoSort(s_h3->m[i], syz_ring);
+    s_h3->m[i] = prMoveR_NoSort(s_h3->m[i], syz_ring,orig_ring);
   }
   if (lift3)
@@ -1036 +999 @@
     for (i=0; i<IDELEMS(*syz); i++)
     {
-      (*syz)->m[i] = prMoveR_NoSort((*syz)->m[i], syz_ring);
+      (*syz)->m[i] = prMoveR_NoSort((*syz)->m[i], syz_ring,orig_ring);
     }
   }
@@ -1132 +1095 @@
   ring orig_ring=currRing;
   ring syz_ring=rCurrRingAssure_SyzComp();
-  rSetSyzComp(k);
+  rSetSyzComp(k,syz_ring);
 
   ideal s_mod, s_temp;
@@ -1241 +1204 @@
     idDelete(&s_mod);
     rChangeCurrRing(orig_ring);
-    s_result = idrMoveR_NoSort(s_result, syz_ring);
-    s_rest = idrMoveR_NoSort(s_rest, syz_ring);
+    s_result = idrMoveR_NoSort(s_result, syz_ring, orig_ring);
+    s_rest = idrMoveR_NoSort(s_rest, syz_ring, orig_ring);
     rKill(syz_ring);
   }
@@ -1492 +1455 @@
   ring orig_ring=currRing;
   ring syz_ring=rCurrRingAssure_SyzComp();
-  rSetSyzComp(kmax-1);
+  rSetSyzComp(kmax-1,syz_ring);
   if (orig_ring!=syz_ring)
-  //  s_h4 = idrMoveR_NoSort(s_h4,orig_ring);
-    s_h4 = idrMoveR(s_h4,orig_ring);
+  //  s_h4 = idrMoveR_NoSort(s_h4,orig_ring, syz_ring);
+    s_h4 = idrMoveR(s_h4,orig_ring, syz_ring);
   idTest(s_h4);
   #if 0
@@ -1546 +1509 @@
   {
     rChangeCurrRing(orig_ring);
-    s_h3 = idrMoveR_NoSort(s_h3, syz_ring);
+    s_h3 = idrMoveR_NoSort(s_h3, syz_ring, orig_ring);
     rKill(syz_ring);
   }
@@ -1785 +1748 @@
         IDELEMS(h3) += 16;
       }
-      h3->m[j] = prMoveR( hh->m[k], tmpR);
+      h3->m[j] = prMoveR( hh->m[k], tmpR,origR);
       hh->m[k] = NULL;
     }
@@ -2052 +2015 @@
     if (p!=NULL)
     {
-      int d=pFDeg(p,currRing);
+      int d=currRing->pFDeg(p,currRing);
       loop
       {
         pIter(p);
         if (p==NULL) break;
-        if (d!=pFDeg(p,currRing))
+        if (d!=currRing->pFDeg(p,currRing))
         {
           //pWrite(q); wrp(p); Print(" -> %d - %d\n",d,pFDeg(p,currRing));
@@ -2138 +2101 @@
   ring orig_ring=currRing;
   ring syz_ring=rCurrRingAssure_SyzComp();
-  rSetSyzComp(length);
+  rSetSyzComp(length,syz_ring);
 
   ideal s_temp;
   if (orig_ring!=syz_ring)
-    s_temp=idrMoveR_NoSort(arg,orig_ring);
+    s_temp=idrMoveR_NoSort(arg,orig_ring, syz_ring);
   else
     s_temp=arg;
@@ -2262 +2225 @@
   ring orig_ring=currRing;
   ring syz_ring=rCurrRingAssure_SyzComp();
-  rSetSyzComp(length);
+  rSetSyzComp(length, syz_ring);
   ideal s_temp;
 
   if (syz_ring != orig_ring)
   {
-    s_temp = idrMoveR_NoSort(temp, orig_ring);
+    s_temp = idrMoveR_NoSort(temp, orig_ring, syz_ring);
   }
   else
@@ -2305 +2268 @@
   {
     rChangeCurrRing(orig_ring);
-    s_temp1 = idrMoveR_NoSort(s_temp1, syz_ring);
+    s_temp1 = idrMoveR_NoSort(s_temp1, syz_ring, orig_ring);
     rKill(syz_ring);
     // Hmm ... here seems to be a memory leak
@@ -2342 +2305 @@
   while (i>0)
   {
-    (*result)[i]=pFDeg(mod->m[i],currRing)+(*weights)[pGetComp(mod->m[i])];
+    (*result)[i]=currRing->pFDeg(mod->m[i],currRing)+(*weights)[pGetComp(mod->m[i])];
   }
   return result;
@@ -2554 +2517 @@
   poly gg=pTakeOutComp(&(S->m[0]),2);
   idDelete(&S);
-  poly gcd_p=singclap_pdivide(f,gg);
+  poly gcd_p=singclap_pdivide(f,gg,r);
   pDelete(&gg);
   rChangeCurrRing(save_r);