Changeset 6c55ae in git

Timestamp:

Feb 22, 2009, 6:38:18 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d8be851dd8f2cf657611debe1b34b05aedcdf65d

Parents:

9efc0ed3b1b416b47dc688365553407a6550f518

Message:

*hannes: chainCrit ->strat


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

Location:

kernel

Files:

• kstdfac.cc (modified) (2 diffs)
• kutil.cc (modified) (9 diffs)
• kutil.h (modified) (3 diffs)

kernel/kstdfac.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstdfac.cc,v 1.15 2009-02-22 17:37:55 Singular Exp $ */
+/* $Id: kstdfac.cc,v 1.16 2009-02-22 17:38:18 Singular Exp $ */
 /*
 *  ABSTRACT -  Kernel: factorizing alg. of Buchberger
@@ -173 +173 @@
   s->posInLOld=o->posInLOld;
   s->enterOnePair=o->enterOnePair;
+  s->chainCrit=o->chainCrit;
   s->Shdl=idCopy(o->Shdl);
   s->S=s->Shdl->m;

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.120 2009-02-22 10:39:42 Singular Exp $ */
+/* $Id: kutil.cc,v 1.121 2009-02-22 17:37:55 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1367 +1367 @@
 
 
-void enterOnePair (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)
+void enterOnePairNormal (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR = -1)
 {
   assume(i<=strat->sl);
@@ -1745 +1745 @@
 *using the chain-criterion in B and L and enters B to L
 */
-void chainCrit (poly p,int ecart,kStrategy strat)
+void chainCritNormal (poly p,int ecart,kStrategy strat)
 {
   int i,j,l;
@@ -2265 +2265 @@
           {
             new_pair=TRUE;
-            enterOnePair(j,h,ecart,isFromQ,strat, atR);
+            strat->enterOnePair(j,h,ecart,isFromQ,strat, atR);
           //Print("j:%d, Ll:%d\n",j,strat->Ll);
           }
@@ -2275 +2275 @@
         for (j=0; j<=k; j++)
         {
-          enterOnePair(j,h,ecart,isFromQ,strat, atR);
+          strat->enterOnePair(j,h,ecart,isFromQ,strat, atR);
           //Print("j:%d, Ll:%d\n",j,strat->Ll);
         }
@@ -2288 +2288 @@
         {
           new_pair=TRUE;
-          enterOnePair(j,h,ecart,isFromQ,strat, atR);
+          strat->enterOnePair(j,h,ecart,isFromQ,strat, atR);
         //Print("j:%d, Ll:%d\n",j,strat->Ll);
         }
@@ -2301 +2301 @@
       else
 #endif
-      chainCrit(h,ecart,strat);
+      strat->chainCrit(h,ecart,strat);
     }
   }
@@ -5599 +5599 @@
 void initBuchMoraCrit(kStrategy strat)
 {
+  strat->enterOnePair=enterOnePairNormal;
+  strat->chainCrit=chainCritNormal;
+
   strat->sugarCrit =        TEST_OPT_SUGARCRIT;
   // obachman: Hmm.. I need BTEST1(2) for notBuckets ..
@@ -7247 +7250 @@
       else
 #endif
-      chainCrit(h,ecart,strat);
+      strat->chainCrit(h,ecart,strat);
     }
 

kernel/kutil.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.h,v 1.40 2009-02-22 10:39:42 Singular Exp $ */
+/* $Id: kutil.h,v 1.41 2009-02-22 17:37:55 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -255 +255 @@
   int (*posInLOld)(const LSet Ls,const int Ll,
                    LObject* Lo,const kStrategy strat);
+  void (*enterOnePair) (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR /*= -1*/);
+  void (*chainCrit) (poly p,int ecart,kStrategy strat);
   pFDegProc pOrigFDeg;
   pLDegProc pOrigLDeg;
@@ -449 +451 @@
 void completeReduce (kStrategy strat, BOOLEAN withT=FALSE);
 void kFreeStrat(kStrategy strat);
+void enterOnePairNormal (int i,poly p,int ecart, int isFromQ,kStrategy strat, int atR);
+void chainCritNormal (poly p,int ecart,kStrategy strat);
 BOOLEAN homogTest(polyset F, int Fmax);
 BOOLEAN newHEdge(polyset S, kStrategy strat);