Changeset 37a4c3 in git for kernel/shiftgb.cc

Timestamp:

Feb 15, 2008, 6:14:23 PM (15 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

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

Children:

7d0cbb00ebc403b3845a38cbf3185e95e99cc015

Parents:

8cf4f3f04ec8ee4482f27f11b0444a3edf84fd3c

Message:

*levandov: major changes in shift free gb


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

File:

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

kernel/shiftgb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: shiftgb.cc,v 1.3 2007-11-06 12:58:35 Singular Exp $ */
+/* $Id: shiftgb.cc,v 1.4 2008-02-15 17:14:23 levandov Exp $ */
 /*
 * ABSTRACT: kernel: utils for shift GB and free GB
@@ -43 +43 @@
   /* assume shift takes place */
   /* shifts the poly p by sh */
+  /* deletes p */
 
   /* assume sh and uptodeg agree */
@@ -49 +50 @@
 
   poly q  = NULL;
-  poly pp = pCopy(p);
+  poly pp = p; // pCopy(p);
   while (pp!=NULL)
   {
@@ -97 +98 @@
   pSetExpV(m,s);
   /*  pSetm(m); */ /* done in the pSetExpV */
+  /* think on the component */
   pSetCoeff0(m,c);
   freeT(e, currRing->N);
@@ -107 +109 @@
   /* returns the number of maximal block */
   /* appearing among the monomials of p */
-  poly q = pCopy(p); /* need it ? */
+  /* the 0th block is the 1st one */
+  poly q = p_Copy(p,currRing); /* need it ? */
   int ans = 0; 
   int ansnew = 0;
@@ -132 +135 @@
   {
 #ifdef PDEBUG
-    Print("pmLastVblock: unexpected zero exponent");
+    Print("pmLastVblock: unexpected zero exponent vector");
+    PrintLn();
 #endif   
     return(j);
@@ -161 +165 @@
   }
   j = b;
-  while ( (!B[j]) && (j>=1)) j--;
+  //  while ( (!B[j]) && (j>=1)) j--;
+  for (j=b; j>=1; j--)
+  {
+    if (B[j]!=0) break;
+  }
+
   if (j==0)
   {
@@ -180 +189 @@
 /* shiftgb stuff */
 
-void initBbaShift(ideal F,kStrategy strat)
-{
-  int i;
-  idhdl h;
- /* setting global variables ------------------- */
-  strat->enterS = enterSBba;
 
-  strat->red = redFirstShift;
+/* remarks: cleanT : just deletion
+enlargeT: just reallocation */
 
-  /* perhaps the following?
-   *    strat->LazyPass *=4;
-   *    strat->red = redHomogShift;
-   */
-
-  /*    strat->red = redHoney;
-   *  if (strat->honey)
-   *    strat->red = redHoney;
-   *  else if (pLexOrder && !strat->homog)
-   *    strat->red = redLazy;
-   *  else
-   *  {
-   *    strat->LazyPass *=4;
-   *    strat->red = redHomog;
-   *  }
-   *#ifdef HAVE_RINGS  //TODO Oliver
-   *  if (rField_is_Ring(currRing)) {
-   *    strat->red = redRing2toM;
-   *  }
-   *#endif
-  */
-
-  if (pLexOrder && strat->honey)
-    strat->initEcart = initEcartNormal;
-  else
-    strat->initEcart = initEcartBBA;
-  if (strat->honey)
-    strat->initEcartPair = initEcartPairMora;
-  else
-    strat->initEcartPair = initEcartPairBba;
-  strat->kIdeal = NULL;
-  //if (strat->ak==0) strat->kIdeal->rtyp=IDEAL_CMD;
-  //else              strat->kIdeal->rtyp=MODUL_CMD;
-  //strat->kIdeal->data=(void *)strat->Shdl;
-  if ((TEST_OPT_WEIGHTM)&&(F!=NULL))
-  {
-    //interred  machen   Aenderung
-    pFDegOld=pFDeg;
-    pLDegOld=pLDeg;
-    //h=ggetid("ecart");
-    //if ((h!=NULL) /*&& (IDTYP(h)==INTVEC_CMD)*/)
-    //{
-    //  ecartWeights=iv2array(IDINTVEC(h));
-    //}
-    //else
-    {
-      ecartWeights=(short *)omAlloc((pVariables+1)*sizeof(short));
-      /*uses automatic computation of the ecartWeights to set them*/
-      kEcartWeights(F->m,IDELEMS(F)-1,ecartWeights);
-    }
-    pRestoreDegProcs(totaldegreeWecart, maxdegreeWecart);
-    if (TEST_OPT_PROT)
-    {
-      for(i=1; i<=pVariables; i++)
-        Print(" %d",ecartWeights[i]);
-      PrintLn();
-      mflush();
-    }
-  }
-}
 #endif