Changeset 4bbe3b in git for kernel/gr_kstd2.cc

Timestamp:

Dec 8, 2003, 6:31:02 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

76b84f5bfd7c384f5c7a94ccf6a2de3f89981093

Parents:

c14061bb051b9d471f072e6f16e14485a8bd0f5f

Message:

*hannes: missing files


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

File:

• kernel/gr_kstd2.cc (modified) (18 diffs)

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.1.1.1 2003-10-06 12:15:53 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.2 2003-12-08 17:31:01 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -19 +19 @@
 #include "cntrlc.h"
 #include "weight.h"
-#include "ipid.h"
-#include "ipshell.h"
 #include "intvec.h"
-#include "tok.h"
+#include "structs.h"
 #include "gring.h"
 
@@ -77 +75 @@
         wrp(strat->S[j]);
       }
-      (*h).p = nc_spGSpolyRed(strat->S[j],(*h).p, NULL, currRing);
+      (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p, NULL, currRing);
       //spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether);
 
@@ -152 +150 @@
 *  and the case of a degree-ordering
 */
-static int redHomog (LObject* h,kStrategy strat)
+static int nc_redHomog (LObject* h,kStrategy strat)
 {
   if (strat->tl<0)
@@ -179 +177 @@
       }
       /*- compute the s-polynomial -*/
-      (*h).p = nc_spGSpolyRed(strat->S[j],(*h).p,strat->kNoether,currRing);
+      (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p,strat->kNoether,currRing);
       if ((*h).p == NULL)
       {
@@ -216 +214 @@
 *  and the case of a degree-ordering
 */
-static int redHomog0 (LObject* h,kStrategy strat)
+static int nc_redHomog0 (LObject* h,kStrategy strat)
 {
   if (strat->tl<0)
@@ -244 +242 @@
       }
       /*- compute the s-polynomial -*/
-      (*h).p = nc_spGSpolyRed(strat->T[j].p,(*h).p,strat->kNoether,currRing);
+      (*h).p = nc_ReduceSpoly(strat->T[j].p,(*h).p,strat->kNoether,currRing);
       if ((*h).p == NULL)
       {
@@ -289 +287 @@
 *  and not a degree-ordering
 */
-static int redLazy (LObject* h,kStrategy strat)
+static int nc_redLazy (LObject* h,kStrategy strat)
 {
   if (strat->tl<0)
@@ -319 +317 @@
       }
       /*- compute the s-polynomial -*/
-      (*h).p = nc_spGSpolyRed(strat->S[j],(*h).p,strat->kNoether,currRing);
+      (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p,strat->kNoether,currRing);
       if ((*h).p == NULL)
       {
@@ -399 +397 @@
 * element in T with respect to the given ecart
 */
-static int redHoney (LObject*  h,kStrategy strat)
+static int nc_redHoney (LObject*  h,kStrategy strat)
 {
   if (strat->tl<0)
@@ -482 +480 @@
       {
         strat->fromT=FALSE;
-        (*h).p = nc_spGSpolyRedNew(pi,(*h).p,strat->kNoether,currRing);
+        (*h).p = nc_ReduceSpolyNew(pi,(*h).p,strat->kNoether,currRing);
       }
       else
-        (*h).p = nc_spGSpolyRed(pi,(*h).p,strat->kNoether,currRing);
+        (*h).p = nc_ReduceSpoly(pi,(*h).p,strat->kNoether,currRing);
       if (TEST_OPT_DEBUG)
       {
@@ -576 +574 @@
 *  reduces with elements from T and chooses the best possible
 */
-static int redBest (LObject*  h,kStrategy strat)
+static int nc_redBest (LObject*  h,kStrategy strat)
 {
   if (strat->tl<0)
@@ -607 +605 @@
       else
 #endif
-      p = nc_spShort(strat->T[j].p,(*h).p);
+      p = nc_CreateShortSpoly(strat->T[j].p,(*h).p);
       /* computes only the first monomial of the spoly  */
       if (p)
@@ -631 +629 @@
               else
 #endif
-              ph = nc_spShort(strat->T[j].p,(*h).p);
+              ph = nc_CreateShortSpoly(strat->T[j].p,(*h).p);
               if (ph==NULL)
               {
@@ -657 +655 @@
         }
         pLmFree(p);
-        (*h).p = nc_spGSpolyRed(strat->T[jbest].p,(*h).p,strat->kNoether,currRing);
+        (*h).p = nc_ReduceSpoly(strat->T[jbest].p,(*h).p,strat->kNoether,currRing);
       }
       else
@@ -734 +732 @@
   strat->enterS = enterSBba;
   if ((BTEST1(20)) && (!strat->honey))
-    strat->red = redBest;
+    strat->red = nc_redBest;
   else if (strat->honey)
-    strat->red = redHoney;
+    strat->red = nc_redHoney;
   else if (pLexOrder && !strat->homog)
-    strat->red = redLazy;
+    strat->red = nc_redLazy;
   else if (TEST_OPT_INTSTRATEGY && strat->homog)
-    strat->red = redHomog0;
+    strat->red = nc_redHomog0;
   else
-    strat->red = redHomog;
+    strat->red = nc_redHomog;
   if (rIsPluralRing(currRing))
   {
@@ -761 +759 @@
   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
+     //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));
@@ -833 +831 @@
       {
         strat->cp++;
-        /* prod.crit itself in nc_spGSpolyCreate */
-      }
-      strat->P.p = nc_spGSpolyCreate(strat->P.p1,strat->P.p2,strat->kNoether,currRing);
+        /* prod.crit itself in nc_CreateSpoly */
+      }
+      strat->P.p = nc_CreateSpoly(strat->P.p1,strat->P.p2,strat->kNoether,currRing);
     }
     if (strat->P.p != NULL)