Changeset 5a9e7b in git for kernel/gr_kstd2.cc
 Timestamp:
 Jan 3, 2007, 1:17:12 AM (16 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
 Children:
 3d11074289ae1a5160b095ecdc1e4d8279ffedc5
 Parents:
 6dbc9674142dc50c311aab80c025def4c3a3bf08
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

kernel/gr_kstd2.cc
r6dbc96 r5a9e7b 2 2 * Computer Algebra System SINGULAR * 3 3 ****************************************/ 4 /* $Id: gr_kstd2.cc,v 1. 8 20050727 15:48:28 SingularExp $ */4 /* $Id: gr_kstd2.cc,v 1.9 20070103 00:17:09 motsak Exp $ */ 5 5 /* 6 6 * ABSTRACT  Kernel: noncomm. alg. of Buchberger … … 8 8 9 9 #include "mod2.h" 10 #ifdef HAVE_PLURAL 10 11 // #ifdef HAVE_PLURAL 12 13 11 14 #include "omalloc.h" 12 15 #include "polys.h" … … 22 25 #include "structs.h" 23 26 #include "gring.h" 24 25 /*2 26 * consider the part above syzComp: 27 * (assume the polynomial comes from a syz computation) 28 *  it is a constant term: return a copy of it 29 *  else: return NULL 30 */ 31 static poly kFromInput(poly p,kStrategy strat) 27 #include "sca.h" 28 29 #if 0 30 /*3 31 * reduction of p2 with p1 32 * do not destroy p1 and p2 33 * p1 divides p2 > for use in NF algorithm 34 */ 35 poly gnc_ReduceSpolyNew(const poly p1, poly p2/*,poly spNoether*/, const ring r) 32 36 { 33 poly q=p; 34 35 if (pGetComp(q)>strat>syzComp) return NULL; 36 while ((q!=NULL) && (pGetComp(q)<=strat>syzComp)) pIter(q); 37 if (pIsConstantComp(q)) 38 return pHead(q); 39 return NULL; 37 return(nc_ReduceSPoly(p1,p_Copy(p2,r)/*,spNoether*/,r)); 40 38 } 39 #endif 41 40 42 41 /*2 … … 75 74 wrp(strat>S[j]); 76 75 } 77 (*h).p = nc_ReduceS poly(strat>S[j],(*h).p, NULL, currRing);76 (*h).p = nc_ReduceSPoly(strat>S[j],(*h).p, currRing); 78 77 //spSpolyRed(strat>T[j].p,(*h).p,strat>kNoether); 79 78 … … 178 177 } 179 178 /* compute the spolynomial */ 180 (*h).p = nc_ReduceS poly(strat>S[j],(*h).p,strat>kNoether,currRing);179 (*h).p = nc_ReduceSPoly(strat>S[j],(*h).p/*,strat>kNoether*/,currRing); 181 180 if ((*h).p == NULL) 182 181 { … … 211 210 } 212 211 212 #if 0 213 213 /*2 214 214 * reduction procedure for the homogeneous case … … 498 498 { 499 499 strat>fromT=FALSE; 500 (*h).p = nc_ReduceSpolyNew(pi,(*h).p,strat>kNoether,currRing);500 (*h).p = gnc_ReduceSpolyNew(pi,(*h).p,strat>kNoether,currRing); 501 501 } 502 502 else … … 748 748 } 749 749 750 static void gr_initBba(ideal F,kStrategy strat) 750 #endif 751 752 void gr_initBba(ideal F, kStrategy strat) 751 753 { 754 assume(rIsPluralRing(currRing)); 755 752 756 int i; 753 757 idhdl h; 754 758 /* setting global variables  */ 755 759 strat>enterS = enterSBba; 760 761 /* 756 762 if ((BTEST1(20)) && (!strat>honey)) 757 763 strat>red = nc_redBest; … … 764 770 else 765 771 strat>red = nc_redHomog; 766 if (rIsPluralRing(currRing)) 767 { 772 */ 773 774 // if (rIsPluralRing(currRing)) 768 775 strat>red = redGrFirst; 769 } 776 770 777 if (pLexOrder && strat>honey) 771 778 strat>initEcart = initEcartNormal; … … 805 812 } 806 813 807 ideal g r_bba (ideal F, ideal Q, kStrategy strat)814 ideal gnc_gr_bba(const ideal F, const ideal Q, const intvec *, const intvec *, kStrategy strat) 808 815 { 816 assume(pOrdSgn != 1); // no mora!!! it terminates only for global ordering!!! (?) 817 809 818 intvec *w=NULL; 810 819 intvec *hilb=NULL; … … 857 866 /* prod.crit itself in nc_CreateSpoly */ 858 867 } 859 strat>P.p = nc_ CreateSpoly(strat>P.p1,strat>P.p2,strat>kNoether,currRing);868 strat>P.p = nc_SPoly(strat>P.p1,strat>P.p2/*,strat>kNoether*/,currRing); 860 869 } 861 870 if (strat>P.p != NULL) … … 947 956 return (strat>Shdl); 948 957 } 949 #endif 958 959 ideal gnc_gr_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy) 960 { 961 PrintS("Sorry, noncommutative mora is not yet implemented!"); 962 PrintLn(); 963 964 // Not yet! 965 return NULL; 966 } 967 968 // #endif 969 970 971
Note: See TracChangeset
for help on using the changeset viewer.