- Timestamp:
- Nov 14, 2022, 10:53:35 AM (17 months ago)
- Branches:
- (u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
- Children:
- 569754d2a9ccf1842ac61e82c0dfb411f5bb9a97
- Parents:
- 317c1453d644836d66288dc2a633068067f64ab7
- Location:
- kernel
- Files:
-
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/GBEngine/GBEngine.dox
r317c14 r4f8fd1d 25 25 26 26 27 Some importa t data structures and classes:27 Some important data structures and classes: 28 28 - \ref skStrategy 29 29 - \ref sLObject -
kernel/GBEngine/f5lists.cc
r317c14 r4f8fd1d 99 99 //pWrite(temp->getPoly()); 100 100 //pWrite(p); 101 //Print("COM APRE: %d\n",pLmEqual(p,temp->getPoly()));101 //Print("COMPARE: %d\n",pLmEqual(p,temp->getPoly())); 102 102 if(1 == pLmEqual(p,temp->getPoly())) { 103 103 //Print("YES!\n"); … … 217 217 return newElement; 218 218 } 219 // insert new eleme ts to the list w.r.t. increasing labels219 // insert new elements to the list w.r.t. increasing labels 220 220 // only used for the S-polys to be reduced (TopReduction building new S-polys with higher label) 221 221 inline LNode* LNode::insertByLabel(poly t, int i, poly p, RuleOld* r) { … … 916 916 ==================================== 917 917 */ 918 // for initialization of CListOlds, last element alwa s has data=NULL and next=NULL918 // for initialization of CListOlds, last element always has data=NULL and next=NULL 919 919 CListOld::CListOld() { 920 920 first = NULL; -
kernel/GBEngine/f5lists.h
r317c14 r4f8fd1d 271 271 CNode* first; 272 272 public: 273 // for initialization of CListOlds, last element alwa s has data=NULL and next=NULL273 // for initialization of CListOlds, last element always has data=NULL and next=NULL 274 274 CListOld(); 275 275 CListOld(CPairOld* c); … … 314 314 private: 315 315 RNode* first; 316 // last alway has data=NULL and next=NULL, for initialization purposes used316 // last always has data=NULL and next=NULL, for initialization purposes used 317 317 RNode* last; 318 318 public: -
kernel/GBEngine/khstd.cc
r317c14 r4f8fd1d 135 135 136 136 /* 137 This will be used for the local orderings in the case of the inhomogen ous ideals.137 This will be used for the local orderings in the case of the inhomogeneous ideals. 138 138 Assume f1,...,fs are already in the standard basis. Test if hilb(LM(f1),...,LM(fs),1) 139 is equal to the input ed one.139 is equal to the inputted one. 140 140 If no, do nothing. 141 141 If Yes, we know that all polys that we need are already in the standard basis -
kernel/GBEngine/kspoly.cc
r317c14 r4f8fd1d 150 150 #endif 151 151 152 // take care of coef bu isness152 // take care of coef business 153 153 if (! n_IsOne(pGetCoeff(p2), tailRing->cf)) 154 154 { … … 284 284 #endif 285 285 286 // take care of coef bu isness286 // take care of coef business 287 287 if (! n_IsOne(pGetCoeff(p2), tailRing->cf)) 288 288 { … … 427 427 428 428 number ct, an, bn; 429 // take care of coef bu isness429 // take care of coef business 430 430 if (! n_IsOne(pGetCoeff(p2), tailRing->cf)) 431 431 { … … 687 687 #endif 688 688 689 // take care of coef bu isness689 // take care of coef business 690 690 if (! n_IsOne(pGetCoeff(p2), tailRing->cf)) 691 691 { … … 901 901 #endif 902 902 903 // take care of coef bu isness903 // take care of coef business 904 904 if (! n_IsOne(pGetCoeff(p2), tailRing->cf)) 905 905 { … … 1148 1148 #endif 1149 1149 1150 // take care of coef bu isness1150 // take care of coef business 1151 1151 if(rField_is_Ring(currRing)) 1152 1152 { -
kernel/GBEngine/kutil.cc
r317c14 r4f8fd1d 2248 2248 *(this canceling should be done here because 2249 2249 *the case lcm(s,p) == lcm(s,r) is not covered in chainCrit) 2250 *the first case is hand eled in chainCrit2250 *the first case is handled in chainCrit 2251 2251 */ 2252 2252 if (Lp.lcm!=NULL) pLmFree(Lp.lcm); … … 2479 2479 *(this canceling should be done here because 2480 2480 *the case lcm(s,p) == lcm(s,r) is not covered in chainCrit) 2481 *the first case is hand eled in chainCrit2481 *the first case is handled in chainCrit 2482 2482 */ 2483 2483 if (Lp.lcm!=NULL) pLmFree(Lp.lcm); … … 2933 2933 if(pSigMult != NULL && sSigMult != NULL && p_LmCmp(pSigMult,sSigMult,currRing) == 0) 2934 2934 { 2935 //Same lm, have to sub stract2935 //Same lm, have to subtract 2936 2936 Lp.sig = p_Sub(pCopy(pSigMult),pCopy(sSigMult),currRing); 2937 2937 } … … 4692 4692 else 4693 4693 */ 4694 // #endif // ??? Why was the following cancel ation disabled for non-commutative rings?4694 // #endif // ??? Why was the following cancellation disabled for non-commutative rings? 4695 4695 { 4696 4696 j=pos; … … 6100 6100 * to the ordering-procedure pLmCmp,totaldegree,coefficient 6101 6101 * For the same totaldegree, original pairs (from F) will 6102 * be put at the end and smalles coefficents6102 * be put at the end and smallest coefficients 6103 6103 */ 6104 6104 int posInL11Ring (const LSet set, const int length, … … 9741 9741 9742 9742 //if the ordering is local, then hilb criterion 9743 //can be used also if the ideal is not homogen ous9743 //can be used also if the ideal is not homogeneous 9744 9744 if((rHasLocalOrMixedOrdering(currRing)) && (rHasMixedOrdering(currRing)==FALSE)) 9745 9745 { … … 9785 9785 if (TEST_OPT_NOT_SUGAR) strat->honey = FALSE; 9786 9786 strat->pairtest = NULL; 9787 /* alway use tailreduction, except:9787 /* always use tailreduction, except: 9788 9788 * - in local rings, - in lex order case, -in ring over extensions */ 9789 9789 strat->noTailReduction = !TEST_OPT_REDTAIL; … … 9859 9859 if (TEST_OPT_NOT_SUGAR) strat->honey = FALSE; 9860 9860 strat->pairtest = NULL; 9861 /* alway use tailreduction, except:9861 /* always use tailreduction, except: 9862 9862 * - in local rings, - in lex order case, -in ring over extensions */ 9863 9863 strat->noTailReduction = !TEST_OPT_REDTAIL; … … 12918 12918 *(this canceling should be done here because 12919 12919 *the case lcm(s,p) == lcm(s,r) is not covered in chainCrit) 12920 *the first case is hand eled in chainCrit12920 *the first case is handled in chainCrit 12921 12921 */ 12922 12922 if (Lp.lcm!=NULL) pLmFree(Lp.lcm); … … 13368 13368 || (pGetComp(strat->S[j])==0)) 13369 13369 { 13370 assume(isFromQ == 0); // this case is not hand eled here and should also never happen13370 assume(isFromQ == 0); // this case is not handled here and should also never happen 13371 13371 poly s = strat->S[j]; 13372 13372 if (strat->fromQ != NULL && strat->fromQ[j]) -
kernel/GBEngine/sca.cc
r317c14 r4f8fd1d 458 458 #endif 459 459 460 // redtailBBa against T for inhomogen ous input460 // redtailBBa against T for inhomogeneous input 461 461 if (!TEST_OPT_OLDSTD) 462 462 withT = ! strat->homog; -
kernel/GBEngine/syz.cc
r317c14 r4f8fd1d 295 295 while ((index<length) && (res[index]!=NULL)) 296 296 { 297 /*---we take out dependen delements from syz---------------------*/297 /*---we take out dependent elements from syz---------------------*/ 298 298 if (res[index+1]!=NULL) 299 299 { -
kernel/GBEngine/syz.h
r317c14 r4f8fd1d 22 22 poly lcm; /*- the lcm of p1,p2 -*/ 23 23 poly syz; /*- the syzygy associated to p1,p2 -*/ 24 int ind1,ind2; /*- the ind eces of p1,p2 -*/24 int ind1,ind2; /*- the indices of p1,p2 -*/ 25 25 poly isNotMinimal; 26 26 int syzind; -
kernel/GBEngine/syz1.cc
r317c14 r4f8fd1d 514 514 same_comp = SYZ_SHIFT_BASE; 515 515 516 // test whet er we have enough space for new shifted component516 // test whether we have enough space for new shifted component 517 517 if ((LONG_MAX - same_comp) <= shind[ie-1]) 518 518 { … … 2270 2270 /*2 2271 2271 * re-computes the order of pairs during the algorithm 2272 * this ensures to proce dewith a triangular matrix2272 * this ensures to proceed with a triangular matrix 2273 2273 */ 2274 2274 static intvec * syOrdPairs(SSet sPairs, int length) … … 2380 2380 rChangeCurrRing(origR); 2381 2381 // Thomas: now make sure that all data which you need is pFetchCopied 2382 // maybe inco porate it into syReorder ??2382 // maybe incorporate it into syReorder ?? 2383 2383 } 2384 2384 tres = syReorder(tres,syzstr->length,syzstr,FALSE,syzstr->res); -
kernel/GBEngine/syz3.cc
r317c14 r4f8fd1d 51 51 /*3 52 52 * assumes the ideals old_ideal and new_ideal to be homogeneous 53 * tests w ether the new_ideal is a regular extension of the old_ideal53 * tests whether the new_ideal is a regular extension of the old_ideal 54 54 */ 55 55 static BOOLEAN syIsRegular(ideal old_ideal,ideal new_ideal,int deg) … … 684 684 if (index==0) 685 685 { 686 /*--- tests w ether a generator must be replaced (lt(f1)|lt(f2)!)--*/686 /*--- tests whether a generator must be replaced (lt(f1)|lt(f2)!)--*/ 687 687 if (p_FDeg(tso.p1,currRing)==p_FDeg(tso.lcm,currRing)) 688 688 toReplace = tso.ind1+1; … … 691 691 } 692 692 #ifdef EXPERIMENT3 693 /*--- tests w ether the product criterion applies --------------*/693 /*--- tests whether the product criterion applies --------------*/ 694 694 if ((index==0) && (old_generators->rank==1) && 695 695 (p_FDeg(tso.p1,currRing)+p_FDeg(tso.p2,currRing)==tso.order)) … … 852 852 if (toReplace) 853 853 { 854 /*-- replaces the generator if nec cesary ------------------*/854 /*-- replaces the generator if necessary ------------------*/ 855 855 pDelete(&old_generators->m[toReplace-1]); 856 856 pDelete(&old_repr->m[toReplace-1]); … … 1408 1408 * we proceed the generators of the next module; 1409 1409 * they are stored in add_generators and add_repr; 1410 * if the normal form of a new gen rators w.r.t. add_generators has1410 * if the normal form of a new generators w.r.t. add_generators has 1411 1411 * pGetComp<crit_comp it is skipped from the reduction; 1412 1412 * new_generators and new_repr (which are empty) stores the result of the … … 1523 1523 if ((next_place_add>next_new_el) || (next_deg<0)) //there are new generators or pairs 1524 1524 { 1525 /*-reducing and generating pairs until lthe degree of the next generators-*/1525 /*-reducing and generating pairs until the degree of the next generators-*/ 1526 1526 pairs_left = TRUE; 1527 1527 while (pairs_left && ((next_deg<0) || (red_deg<= next_deg))) … … 1746 1746 PrintS("Add new generators:\n"); 1747 1747 idPrint(new_generators); 1748 PrintS("with representa ions:\n");1748 PrintS("with representations:\n"); 1749 1749 idPrint(new_repr); 1750 1750 #endif -
kernel/GBEngine/tgb.cc
r317c14 r4f8fd1d 1236 1236 } 1237 1237 1238 //can also try dependen dsearch1238 //can also try dependent search 1239 1239 omFree (i_con); 1240 1240 omFree (j_con); … … 1716 1716 shorten_tails (c, c->S->m[c->n - 1]); 1717 1717 } 1718 //you should really update c->lengths, c->strat->lenS, and the o der of polys in strat if you sort after lengths1718 //you should really update c->lengths, c->strat->lenS, and the order of polys in strat if you sort after lengths 1719 1719 1720 1720 //for(i=c->strat->sl; i>0;i--) -
kernel/GBEngine/tgb_internal.h
r317c14 r4f8fd1d 332 332 { 333 333 public: 334 /// we assume hat all occuring red_objects have same lm, and all334 /// we assume that all occurring red_objects have same lm, and all 335 335 /// occ. lm's in r[l...u] are the same, only reductor does not occur 336 336 virtual void reduce(red_object* r, int l, int u); -
kernel/combinatorics/hilb.cc
r317c14 r4f8fd1d 63 63 */ 64 64 65 //adds the new polynomial at the cor esponding position65 //adds the new polynomial at the corresponding position 66 66 //and simplifies the ideal, destroys p 67 67 static void SortByDeg_p(ideal I, poly p) … … 1164 1164 { 1165 1165 /* 1166 * shifts the vari bles of monomial p in the i^th layer,1166 * shifts the variables of monomial p in the i^th layer, 1167 1167 * p remains unchanged, 1168 1168 * creates new poly and returns it for the colon ideal … … 1197 1197 { 1198 1198 /* 1199 * deletes the variables up to i^th layer of monomial w1199 * deletes the variables up to i^th layer of monomial w 1200 1200 * w remains unchanged 1201 1201 * creates new poly and returns it for the colon ideal … … 1829 1829 } 1830 1830 poly hilbert_series(ideal A, const ring src, const intvec* wdegree, const ring Qt) 1831 // acco ding to:1831 // according to: 1832 1832 // Algorithm 2.6 of 1833 1833 // Dave Bayer, Mike Stillman - Computation of Hilbert Function -
kernel/combinatorics/test.cc
r317c14 r4f8fd1d 316 316 poly p1=pISet(1); 317 317 318 // create t the polynomial 2*x^3*z^2318 // create the polynomial 2*x^3*z^2 319 319 poly p2=p_ISet(2,R); 320 320 pSetExp(p2,1,3); … … 352 352 feInitResources(argv[0]); 353 353 354 StringSetS("res sources in use (as reported by feStringAppendResources(0):\n");354 StringSetS("resources in use (as reported by feStringAppendResources(0):\n"); 355 355 feStringAppendResources(0); 356 356 -
kernel/fglm/fglmvec.cc
r317c14 r4f8fd1d 222 222 int vsize = v.size (); 223 223 number term1, term2; 224 fglmASSERT (vsize <= rep->size (), "v has to be smaller o der equal");224 fglmASSERT (vsize <= rep->size (), "v has to be smaller or equal"); 225 225 if(rep->isUnique ()) 226 226 {
Note: See TracChangeset
for help on using the changeset viewer.