- Timestamp:
- Aug 12, 2016, 3:59:29 PM (8 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- e009effbfaa9d4f42b1ec6659250bc3481449fb5
- Parents:
- 0c669f797f1425a0c889419c6dcb158f6278afa1
- Location:
- kernel/GBEngine
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/GBEngine/kstd1.cc
r0c669f rc6a876 1765 1765 printf("\nBefore Ll = %i\n", strat->Ll); 1766 1766 #endif 1767 if(!rField_is_Ring(strat->tailRing) || rHasLocalOrMixedOrdering(currRing)) 1768 red_result = strat->red(&strat->P,strat); 1767 red_result = strat->red(&strat->P,strat); 1769 1768 #ifdef ADIDEBUG 1770 1769 printf("\nThis is P nach red:\n");p_Write(strat->P.p,strat->tailRing);p_Write(strat->P.p1,strat->tailRing);p_Write(strat->P.p2,strat->tailRing); … … 1841 1840 if (strat->P.lcm!=NULL) 1842 1841 { 1843 if (rField_is_Ring(currRing)) 1842 if (rField_is_Ring(currRing)) 1844 1843 pLmDelete(strat->P.lcm); 1845 1844 else … … 2561 2560 //This is how we set the SBA algorithm; 2562 2561 int totalsbaruns = 1,blockedreductions = 20,blockred = 0,loops = 0; 2563 while(sigdrop && (loops < totalsbaruns || totalsbaruns == -1) 2562 while(sigdrop && (loops < totalsbaruns || totalsbaruns == -1) 2564 2563 && (blockred <= blockedreductions)) 2565 2564 { … … 2679 2678 r=sba(r,Q,*w,hilb,strat); 2680 2679 else 2681 { 2680 { 2682 2681 r=sba(r,Q,NULL,hilb,strat); 2683 2682 } -
kernel/GBEngine/kutil.cc
r0c669f rc6a876 13 13 14 14 //#define ADIDEBUG 1 15 //All vs Just strategy over rings: 16 // 1 - Just 15 //All vs Just strategy over rings: 16 // 1 - Just 17 17 // 0 - All 18 18 #define ALL_VS_JUST 0 … … 582 582 { 583 583 pDelete(&p); 584 p = NULL;585 584 } 586 585 break; … … 1769 1768 1770 1769 pNext(gcd) = p_Add_q(pp_Mult_mm(pNext(p), m1, strat->tailRing), pp_Mult_mm(pNext(si), m2, strat->tailRing), strat->tailRing); 1771 1770 1772 1771 #ifdef KDEBUG 1773 1772 if (TEST_OPT_DEBUG) … … 1857 1856 h.p = pNeg(h.p); 1858 1857 } 1859 1858 1860 1859 if(rField_is_Ring(currRing) && pLtCmp(h.sig,sig) == -1) 1861 1860 { … … 2768 2767 pWrite(m2); 2769 2768 #endif 2770 2769 2771 2770 // get multiplied signatures for testing 2772 2771 pSigMult = pp_Mult_mm(pSigMult,m1,currRing); … … 2875 2874 Lp.sevSig = p_GetShortExpVector(Lp.sig,currRing); 2876 2875 } 2877 2878 #if 0 2876 2877 #if 0 2879 2878 if(sigCmp==0) 2880 2879 { … … 4831 4830 return; 4832 4831 } 4833 4832 4834 4833 } 4835 4834 #else … … 5227 5226 int o = p_Deg(p,currRing); 5228 5227 int op = p_Deg(set[mon],currRing); 5229 5228 5230 5229 if ((op < o) 5231 5230 || ((op == o) && (pLtCmp(set[mon],p) == -1))) … … 5257 5256 int o = p_Deg(p,currRing); 5258 5257 int op = p_Deg(set[length],currRing); 5259 5258 5260 5259 if ((op < o) 5261 5260 || ((op == o) && (pLtCmp(set[length],p) == -1))) … … 7138 7137 #endif 7139 7138 if (p_LmShortDivisibleBy(strat->syz[k], strat->sevSyz[k], sig, not_sevSig, currRing) 7140 && (!rField_is_Ring(currRing) || 7139 && (!rField_is_Ring(currRing) || 7141 7140 (n_DivBy(pGetCoeff(sig), pGetCoeff(strat->syz[k]),currRing) && pLtCmp(sig,strat->syz[k]) == 1))) 7142 7141 { … … 7195 7194 #endif 7196 7195 if (p_LmShortDivisibleBy(strat->syz[k], strat->sevSyz[k], sig, not_sevSig, currRing) 7197 && (!rField_is_Ring(currRing) || 7196 && (!rField_is_Ring(currRing) || 7198 7197 (n_DivBy(pGetCoeff(sig), pGetCoeff(strat->syz[k]),currRing) && pLtCmp(sig,strat->syz[k]) == 1))) 7199 7198 { … … 9615 9614 strat->L[cc].sig, ~strat->L[cc].sevSig, currRing) 9616 9615 #ifdef HAVE_RINGS 9617 &&((!rField_is_Ring(currRing)) 9616 &&((!rField_is_Ring(currRing)) 9618 9617 || (n_DivBy(pGetCoeff(strat->L[cc].sig),pGetCoeff(strat->syz[atT]),currRing) && (pLtCmp(strat->L[cc].sig,strat->syz[atT])==1))) 9619 9618 #endif … … 11071 11070 if(deleted) 11072 11071 strat->initEcart(h); 11073 11072 11074 11073 } 11075 11074 … … 11887 11886 // clean h.p, get poly from t_p 11888 11887 pNext(h.p)=NULL; 11889 p Delete(&h.p);11888 pLmDelete(&h.p); 11890 11889 p = prMoveR(h.t_p, /* source ring: */ strat->tailRing, 11891 11890 /* dest. ring: */ currRing);
Note: See TracChangeset
for help on using the changeset viewer.