Changeset 6af78bb in git
 Timestamp:
 Aug 10, 2012, 11:49:12 AM (12 years ago)
 Branches:
 (u'fiekerDuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b21a664aa22dc6e196223af8a74ad4885e83547c')
 Children:
 8797746f0462992c4a00f27f0837b923a3f847de
 Parents:
 1a2d6611738ea83b676a2b906a53986d841f8957
 gitauthor:
 Martin Lee <martinlee84@web.de>20120810 11:49:12+02:00
 gitcommitter:
 Martin Lee <martinlee84@web.de>20120904 18:01:17+02:00
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

factory/facFactorize.cc
r1a2d66 r6af78bb 920 920 A /= hh; 921 921 922 CFListIterator iter2; 922 923 CFList bufFactors= CFList(); 923 924 if (LucksWangSparseHeuristic (A, biFactors, 2, leadingCoeffs2 [A.level()  3], … … 975 976 CanonicalForm cont; 976 977 CFList contents, LCs; 977 CFListIterator iter2;978 978 int index=1; 979 979 bool foundTrueMultiplier= false; … … 1200 1200 1201 1201 CFList commonDenominators; 1202 for ( CFListIteratoriter=biFactors; iter.hasItem(); iter++)1202 for (iter=biFactors; iter.hasItem(); iter++) 1203 1203 commonDenominators.append (bCommonDen (iter.getItem())); 1204 1204 CanonicalForm tmp1, tmp2, tmp3=1; 1205 CFListIterator iter1, iter2;1206 1205 for (int i= 0; i < A.level()  2; i++) 1207 1206 { 1208 1207 iter2= commonDenominators; 1209 for (iter 1= leadingCoeffs2[i]; iter1.hasItem(); iter1++, iter2++)1210 { 1211 tmp1= bCommonDen (iter 1.getItem());1208 for (iter= leadingCoeffs2[i]; iter.hasItem(); iter++, iter2++) 1209 { 1210 tmp1= bCommonDen (iter.getItem()); 1212 1211 Off (SW_RATIONAL); 1213 1212 iter2.getItem()= lcm (iter2.getItem(), tmp1); … … 1216 1215 } 1217 1216 tmp1= prod (commonDenominators); 1218 for (iter 1= Aeval; iter1.hasItem(); iter1++)1219 { 1220 tmp2= bCommonDen (iter 1.getItem());1217 for (iter= Aeval; iter.hasItem(); iter++) 1218 { 1219 tmp2= bCommonDen (iter.getItem()); 1221 1220 Off (SW_RATIONAL); 1222 1221 tmp3= lcm (tmp2,tmp3); … … 1226 1225 multiplier= tmp3/tmp1; 1227 1226 iter2= commonDenominators; 1228 for (iter 1=biFactors; iter1.hasItem(); iter1++, iter2++)1229 iter 1.getItem() *= iter2.getItem()*multiplier;1230 1231 for (iter 1= Aeval; iter1.hasItem(); iter1++)1232 iter 1.getItem() *= tmp3*power (multiplier, biFactors.length()  1);1227 for (iter=biFactors; iter.hasItem(); iter++, iter2++) 1228 iter.getItem() *= iter2.getItem()*multiplier; 1229 1230 for (iter= Aeval; iter.hasItem(); iter++) 1231 iter.getItem() *= tmp3*power (multiplier, biFactors.length()  1); 1233 1232 1234 1233 for (int i= 0; i < A.level()  2; i++) 1235 1234 { 1236 1235 iter2= commonDenominators; 1237 for (iter 1= leadingCoeffs2[i]; iter1.hasItem(); iter1++, iter2++)1238 iter 1.getItem() *= iter2.getItem()*multiplier;1236 for (iter= leadingCoeffs2[i]; iter.hasItem(); iter++, iter2++) 1237 iter.getItem() *= iter2.getItem()*multiplier; 1239 1238 } 1240 1239
Note: See TracChangeset
for help on using the changeset viewer.