Changeset 86016d in git for kernel/gr_kstd2.cc

Timestamp:

Feb 1, 2007, 12:51:25 AM (17 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

c591ad0eb4ed9f5be86c0c85d2412be2ad6be556

Parents:

1cc61e18c0d6c70b177099c23a52159afb280bb4

Message:

*motsak:
 !+!: factors of SCA, debug print for SCA, "kill squares" in std.
  * : ncRingType, naming, formatting, unified NC setup.


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

File:

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

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.10 2007-01-11 10:10:37 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.11 2007-01-31 23:51:23 motsak Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -11 +11 @@
 #ifdef HAVE_PLURAL
 
+#define PLURAL_INTERNAL_DECLARATIONS
 
 #include "omalloc.h"
@@ -750 +751 @@
 #endif
 
-void gr_initBba(ideal F, kStrategy strat)
+void nc_gr_initBba(ideal F, kStrategy strat)
 {
   assume(rIsPluralRing(currRing));
@@ -826 +827 @@
   // initHilbCrit(F,Q,&hilb,strat);
   /* in plural we don't need Hilb yet */
-  gr_initBba(F,strat);
+  nc_gr_initBba(F,strat);
   initBuchMoraPos(strat);
   /*set enterS, spSpolyShort, reduce, red, initEcart, initEcartPair*/
@@ -861 +862 @@
       pLmFree(strat->P.p);
       /* the real one */
-      if ((currRing->nc->type==nc_lie) && pHasNotCF(strat->P.p1,strat->P.p2)) /* prod crit */
+      if ((ncRingType(currRing)==nc_lie) && pHasNotCF(strat->P.p1,strat->P.p2)) /* prod crit */
       {
         strat->cp++;
@@ -922 +923 @@
               strat->enterS(strat->P,pos,strat,-1);
             }
-            if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
+//            if (hilb!=NULL) khCheck(Q,w,hilb,hilbeledeg,hilbcount,strat);
           }
           if (strat->P.lcm!=NULL) pLmFree(strat->P.lcm);
@@ -933 +934 @@
   }
   if (TEST_OPT_DEBUG) messageSets(strat);
+
   /* complete reduction of the standard basis--------- */
-  if (TEST_OPT_REDSB) completeReduce(strat);
+  if (TEST_OPT_REDSB){
+     completeReduce(strat); // ???
+
+//    ideal I = strat->Shdl;
+//    ideal erg = kInterRed(I,Q);
+//    assume(I!=erg);
+//    id_Delete(&I, currRing);
+//    strat->Shdl = erg;
+  }
+
   /* release temp data-------------------------------- */
   exitBuchMora(strat);
@@ -949 +960 @@
   if (TEST_OPT_PROT) messageStat(srmax,lrmax,hilbcount,strat);
   if (Q!=NULL) updateResult(strat->Shdl,Q,strat);
+
+
 #ifdef PDEBUG
 /* for counting number of pairs [enterL] in Plural */