Changeset 5a9e7b in git for kernel/gr_kstd2.cc

Timestamp:

Jan 3, 2007, 1:17:12 AM (16 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

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

Children:

3d11074289ae1a5160b095ecdc1e4d8279ffedc5

Parents:

6dbc9674142dc50c311aab80c025def4c3a3bf08

Message:

*motsak: rewritten non-commutative engine + sca support


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

File:

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

kernel/gr_kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: gr_kstd2.cc,v 1.8 2005-07-27 15:48:28 Singular Exp $ */
+/* $Id: gr_kstd2.cc,v 1.9 2007-01-03 00:17:09 motsak Exp $ */
 /*
 *  ABSTRACT -  Kernel: noncomm. alg. of Buchberger
@@ -8 +8 @@
 
 #include "mod2.h"
-#ifdef HAVE_PLURAL
+
+// #ifdef HAVE_PLURAL
+
+
 #include "omalloc.h"
 #include "polys.h"
@@ -22 +25 @@
 #include "structs.h"
 #include "gring.h"
-
-/*2
-* consider the part above syzComp:
-* (assume the polynomial comes from a syz computation)
-* - it is a constant term: return a copy of it
-* - else: return NULL
-*/
-static poly kFromInput(poly p,kStrategy strat)
+#include "sca.h"
+
+#if 0
+/*3
+* reduction of p2 with p1
+* do not destroy p1 and p2
+* p1 divides p2 -> for use in NF algorithm
+*/
+poly gnc_ReduceSpolyNew(const poly p1, poly p2/*,poly spNoether*/, const ring r)
 {
-  poly q=p;
-
-  if (pGetComp(q)>strat->syzComp) return NULL;
-  while ((q!=NULL) && (pGetComp(q)<=strat->syzComp)) pIter(q);
-  if (pIsConstantComp(q))
-    return pHead(q);
-  return NULL;
+  return(nc_ReduceSPoly(p1,p_Copy(p2,r)/*,spNoether*/,r));
 }
+#endif
 
 /*2
@@ -75 +74 @@
         wrp(strat->S[j]);
       }
-      (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p, NULL, currRing);
+      (*h).p = nc_ReduceSPoly(strat->S[j],(*h).p, currRing);
       //spSpolyRed(strat->T[j].p,(*h).p,strat->kNoether);
 
@@ -178 +177 @@
       }
       /*- compute the s-polynomial -*/
-      (*h).p = nc_ReduceSpoly(strat->S[j],(*h).p,strat->kNoether,currRing);
+      (*h).p = nc_ReduceSPoly(strat->S[j],(*h).p/*,strat->kNoether*/,currRing);
       if ((*h).p == NULL)
       {
@@ -211 +210 @@
 }
 
+#if 0
 /*2
 *  reduction procedure for the homogeneous case
@@ -498 +498 @@
       {
         strat->fromT=FALSE;
-        (*h).p = nc_ReduceSpolyNew(pi,(*h).p,strat->kNoether,currRing);
+        (*h).p = gnc_ReduceSpolyNew(pi,(*h).p,strat->kNoether,currRing);
       }
       else
@@ -748 +748 @@
 }
 
-static void gr_initBba(ideal F,kStrategy strat)
+#endif
+
+void gr_initBba(ideal F, kStrategy strat)
 {
+  assume(rIsPluralRing(currRing));
+
   int i;
   idhdl h;
  /* setting global variables ------------------- */
   strat->enterS = enterSBba;
+
+/*
   if ((BTEST1(20)) && (!strat->honey))
     strat->red = nc_redBest;
@@ -764 +770 @@
   else
     strat->red = nc_redHomog;
-  if (rIsPluralRing(currRing))
-  {
+*/
+
+//   if (rIsPluralRing(currRing))
     strat->red = redGrFirst;
-  }
+
   if (pLexOrder && strat->honey)
     strat->initEcart = initEcartNormal;
@@ -805 +812 @@
 }
 
-ideal gr_bba (ideal F, ideal Q, kStrategy strat)
+ideal gnc_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat)
 {
+  assume(pOrdSgn != -1); // no mora!!! it terminates only for global ordering!!! (?)
+
   intvec *w=NULL;
   intvec *hilb=NULL;
@@ -857 +866 @@
         /* prod.crit itself in nc_CreateSpoly */
       }
-      strat->P.p = nc_CreateSpoly(strat->P.p1,strat->P.p2,strat->kNoether,currRing);
+      strat->P.p = nc_SPoly(strat->P.p1,strat->P.p2/*,strat->kNoether*/,currRing);
     }
     if (strat->P.p != NULL)
@@ -947 +956 @@
   return (strat->Shdl);
 }
-#endif
+
+ideal gnc_gr_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy)
+{
+  PrintS("Sorry, non-commutative mora is not yet implemented!");
+  PrintLn();
+
+  // Not yet!
+  return NULL;
+}
+
+// #endif
+
+
+