Changeset 7a4a43 in git
- Timestamp:
- Dec 3, 2009, 3:57:26 PM (14 years ago)
- Branches:
- (u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
- Children:
- 01d4d39094f7bf55ce654ac27f6e5147abd7ef80
- Parents:
- 8d679fdeafced3beb421a86604256b3d93d27a06
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/kutil.cc
r8d679fd r7a4a43 1312 1312 1313 1313 k_GetStrongLeadTerms(p, strat->S[i], currRing, m1, m2, gcd, strat->tailRing); 1314 //p_Test(m1,strat->tailRing); 1315 //p_Test(m2,strat->tailRing); 1314 1316 while (! kCheckStrongCreation(atR, m1, i, m2, strat) ) 1315 1317 { … … 1325 1327 pSetCoeff0(m2, t); 1326 1328 pSetCoeff0(gcd, d); 1329 p_Test(m1,strat->tailRing); 1330 p_Test(m2,strat->tailRing); 1327 1331 1328 1332 #ifdef KDEBUG … … 2961 2965 nDelete(&tmp); 2962 2966 } 2967 p_Test(p,strat->tailRing); 2963 2968 p = pp_Mult_nn(p, gcd, strat->tailRing); 2964 2969 nDelete(&gcd); … … 2974 2979 { 2975 2980 PrintS("--- create zero spoly: "); 2976 wrp(h);2981 p_wrp(h,currRing,strat->tailRing); 2977 2982 PrintS(" ---> "); 2978 2983 } … … 2980 2985 poly tmp = pInit(); 2981 2986 pSetCoeff0(tmp, pGetCoeff(p)); 2982 for (int i = 1; i <= currRing->N; i++)2987 for (int i = 1; i <= rVar(currRing); i++) 2983 2988 { 2984 2989 pSetExp(tmp, i, p_GetExp(p, i, strat->tailRing)); 2985 2990 } 2986 if (rRing_has_Comp(currRing)) 2991 if (rRing_has_Comp(currRing) && rRing_has_Comp(strat->tailRing)) 2992 { 2987 2993 p_SetComp(tmp, p_GetComp(p, strat->tailRing), currRing); 2994 } 2988 2995 p_Setm(tmp, currRing); 2989 2996 p = p_LmFreeAndNext(p, strat->tailRing); 2990 2997 pNext(tmp) = p; 2991 2998 LObject h; 2999 h.Init(); 2992 3000 h.p = tmp; 2993 3001 h.tailRing = strat->tailRing; … … 3011 3019 h.sev = pGetShortExpVector(h.p); 3012 3020 if (strat->tailRing != currRing) 3021 { 3013 3022 h.t_p = k_LmInit_currRing_2_tailRing(h.p, strat->tailRing); 3014 if (pNext(p) != NULL)3015 {3016 // What does this? (Oliver)3017 // pShallowCopyDeleteProc p_shallow_copy_delete3018 // = pGetShallowCopyDeleteProc(strat->tailRing, new_tailRing);3019 // pNext(p) = p_shallow_copy_delete(pNext(p),3020 // currRing, strat->tailRing, strat->tailRing->PolyBin);3021 3023 } 3022 3024 #ifdef KDEBUG 3023 3025 if (TEST_OPT_DEBUG) 3024 3026 { 3025 wrp(tmp);3027 p_wrp(tmp,currRing,strat->tailRing); 3026 3028 PrintLn(); 3027 3029 } … … 4664 4666 if (Ln.bucket!=NULL) 4665 4667 { 4666 4668 int dummy=1; 4667 4669 kBucket_Add_q(Ln.bucket,mm,&dummy); 4668 4670 }
Note: See TracChangeset
for help on using the changeset viewer.