Changeset 1bc7201 in git for kernel/ideals.cc

Timestamp:

Oct 19, 2012, 6:38:35 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

c879eea1669e963fb4c7287a3963abb287d00a49

Parents:

b37b3984a12e1552c7bafc9fd5a7849240ea79806bbe944402dfca102dcc3e036c4f2f119be41e44

Message:

Merge pull request #192 from mmklee/algExtGCD_sw

Alg ext gcd sw

File:

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

kernel/ideals.cc

@@ -130 +130 @@
 }
 
-
-/*3
-*multiplies p with t (!cas) or  (t-1)
-*the index of t is:1, so we have to shift all variables
-*p is NOT in the actual ring, it has no t
-*/
-static poly pMultWithT (poly p,BOOLEAN cas)
-{
-  /*qp is the working pointer in p*/
-  /*result is the result, qresult is the working pointer*/
-  /*pp is p in the actual ring(shifted), qpp the working pointer*/
-  poly result,qp,pp;
-  poly qresult=NULL;
-  poly qpp=NULL;
-  int  i,j,lex;
-  number n;
-
-  pp = NULL;
-  result = NULL;
-  qp = p;
-  while (qp != NULL)
-  {
-    i = 0;
-    if (result == NULL)
-    {/*first monomial*/
-      result = pInit();
-      qresult = result;
-    }
-    else
-    {
-      qresult->next = pInit();
-      pIter(qresult);
-    }
-    for (j=(currRing->N)-1; j>0; j--)
-    {
-      lex = pGetExp(qp,j);
-      pSetExp(qresult,j+1,lex);/*copy all variables*/
-    }
-    lex = pGetComp(qp);
-    pSetComp(qresult,lex);
-    n=nCopy(pGetCoeff(qp));
-    pSetCoeff0(qresult,n);
-    qresult->next = NULL;
-    pSetm(qresult);
-    /*qresult is now qp brought into the actual ring*/
-    if (cas)
-    { /*case: mult with t-1*/
-      pSetExp(qresult,1,0);
-      pSetm(qresult);
-      if (pp == NULL)
-      { /*first monomial*/
-        pp = pCopy(qresult);
-        qpp = pp;
-      }
-      else
-      {
-        qpp->next = pCopy(qresult);
-        pIter(qpp);
-      }
-      pGetCoeff(qpp)=nNeg(pGetCoeff(qpp));
-      /*now qpp contains -1*qp*/
-    }
-    pSetExp(qresult,1,1);/*this is mult. by t*/
-    pSetm(qresult);
-    pIter(qp);
-  }
-  /*
-  *now p is processed:
-  *result contains t*p
-  * if cas: pp contains -1*p (in the new ring)
-  */
-  if (cas)  qresult->next = pp;
-  /*  else      qresult->next = NULL;*/
-  return result;
-}
 
 /*2
@@ -850 +775 @@
   }
 
-  BITSET save_verbose=verbose;
+  BITSET save2;
+  SI_SAVE_OPT2(save2);
 
   k=si_max(1,(int)id_RankFreeModule(h1,currRing));
 
-  if ((k==1) && (!lift3)) verbose |=Sy_bit(V_IDLIFT);
+  if ((k==1) && (!lift3)) si_opt_2 |=Sy_bit(V_IDLIFT);
 
   ring orig_ring = currRing;
@@ -974 +900 @@
 
   if (syz_ring!=orig_ring) rDelete(syz_ring);
-  verbose = save_verbose;
+  SI_RESTORE_OPT2(save2);
   return s_h3;
 }
@@ -1374 +1300 @@
     }
     h4->m[IDELEMS(h4)-1] = p;
-    test |= Sy_bit(OPT_SB_1);
+    si_opt_1 |= Sy_bit(OPT_SB_1);
   }
   idDelete(&temph1);
@@ -1397 +1323 @@
     return res;
   }
-  BITSET old_test=test;
+  BITSET old_test1;
+  SI_SAVE_OPT1(old_test1);
   int i, kmax;
   BOOLEAN  addOnlyOne=TRUE;
@@ -1431 +1358 @@
     s_h3 = kStd(s_h4,currQuotient,hom,&weights1,NULL,kmax-1);
   }
-  test = old_test;
+  SI_RESTORE_OPT1(old_test1);
   #if 0
   // only together with the above debug stuff
@@ -1672 +1599 @@
 #if 1
   //rWrite(tmpR);PrintLn();
-  BITSET save=test;
-  //test |=1;
+  //BITSET save1;
+  //SI_SAVE_OPT1(save1);
+  //si_opt_1 |=1;
   //Print("h: %d gen, rk=%d\n",IDELEMS(h),h->rank);
   //extern char * showOption();
   //Print("%s\n",showOption());
   hh = kStd(h,NULL,hom,&w,hilb);
-  test=save;
+  //SI_RESTORE_OPT1(save1);
   idDelete(&h);
 #else
@@ -2194 +2122 @@
   {
     if ((s_temp1->m[i]!=NULL)
-    && (pGetComp(s_temp1->m[i])<=length))
+    && (((int)pGetComp(s_temp1->m[i]))<=length))
     {
       p_Delete(&(s_temp1->m[i]),currRing);