Changeset 9f5fca in git

Timestamp:

Dec 10, 2008, 8:48:51 PM (15 years ago)

Author:

Viktor Levandovskyy <levandov@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

18c24555fbf92664b228c6d8d5ea653490aef960

Parents:

1dfd7613337c8c2ac8c4636dda564d8899289dbd

Message:

*levandov: shrinking in nonhomog letterplace


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

Location:

kernel

Files:

• kspoly.cc (modified) (4 diffs)
• kstd2.cc (modified) (4 diffs)

kernel/kspoly.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kspoly.cc,v 1.15 2008-06-25 11:27:31 Singular Exp $ */
+/* $Id: kspoly.cc,v 1.16 2008-12-10 19:48:51 levandov Exp $ */
 /*
 *  ABSTRACT -  Routines for Spoly creation and reductions
@@ -138 +138 @@
   assume(PW->GetpLength() == pLength(PW->p != NULL ? PW->p : PW->t_p));
   PR->LmDeleteAndIter();
+
+  // the following is commented out: shrinking
+#ifdef HAVE_SHIFTBBA_NONEXISTENT
+  if ( (currRing->isLPring) && (!strat->homog) )
+  {
+    // assume? h->p in currRing
+    PR->GetP();
+    poly qq = p_Shrink(PR->p, currRing->isLPring, currRing);
+    PR->Clear(); // does the right things
+    PR->p = qq; 
+    PR->t_p = NULL;
+    PR->SetShortExpVector();
+  }
+#endif
+  
 #if defined(KDEBUG) && defined(TEST_OPT_DEBUG_RED)
   if (TEST_OPT_DEBUG)
@@ -251 +266 @@
     }
   }
+
+  // the following is commented out: shrinking
+#ifdef HAVE_SHIFTBBA_NONEXISTENT
+  if (currRing->isLPring)
+  {
+    // assume? h->p in currRing
+    Pair->GetP();
+    poly qq = p_Shrink(Pair->p, currRing->isLPring, currRing);
+    Pair->Clear(); // does the right things
+    Pair->p = qq; 
+    Pair->t_p = NULL;
+    Pair->SetShortExpVector();
+  }
+#endif
+
 }
 
@@ -291 +321 @@
   if (Lp == Save)
     With.Delete();
+
+  // the following is commented out: shrinking
+#ifdef HAVE_SHIFTBBA_NONEXISTENT
+  if (currRing->isLPring)
+  {
+    // assume? h->p in currRing
+    PR->GetP();
+    poly qq = p_Shrink(PR->p, currRing->isLPring, currRing);
+    PR->Clear(); // does the right things
+    PR->p = qq; 
+    PR->t_p = NULL;
+    PR->SetShortExpVector();
+  }
+#endif
+
   return ret;
 }

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.77 2008-11-12 16:07:45 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.78 2008-12-10 19:48:51 levandov Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -1420 +1420 @@
     {
       strat->P.GetP(strat->lmBin); // because shifts are counted with .p structure
-      /* assume strat->P.t_p != NULL */
       /* in the nonhomog case we have to shrink the polynomial */
       assume(strat->P.t_p!=NULL);
@@ -1660 +1659 @@
 
   /* check whether the ideal is in V */
-  if (! ideal_isInV(I,lVblock) )
-  {
-    PrintS("ERROR: The input ideal contains incorrectly encoded elements! ");
+
+  if (0)
+  //  if (! ideal_isInV(I,lVblock) )
+  {
+    WerrorS("The input ideal contains incorrectly encoded elements! ");
     return(NULL);
   }
@@ -1719 +1720 @@
 #endif
     ksReducePoly(h, &(strat->T[j]), strat->kNoetherTail(), NULL, strat);
+
 #ifdef KDEBUG
     if (TEST_OPT_DEBUG)