Changeset 21b8f4c in git for factory/facFqBivar.cc
- Timestamp:
- Jul 25, 2011, 4:08:17 PM (13 years ago)
- Branches:
- (u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
- Children:
- 3dd0640ba1b8ca0d5fc4aa74c81faaa7eb5129fc
- Parents:
- 64a5014602570d17e143cbe6e31d19fd6a86cfc3
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
factory/facFqBivar.cc
r64a501 r21b8f4c 274 274 275 275 CFList result; 276 CanonicalForm buf, buf2 ;276 CanonicalForm buf, buf2, quot; 277 277 278 278 buf= F; … … 334 334 S.removeFirst(); 335 335 g /= content (g, Variable (1)); 336 if (fdivides (g, buf ))336 if (fdivides (g, buf, quot)) 337 337 { 338 338 buf2= g (y - eval, y); … … 343 343 if (degree (buf2, alpha) < degMipoBeta) 344 344 { 345 buf /= g;345 buf= quot; 346 346 LCBuf= LC (buf, Variable (1)); 347 347 recombination= true; … … 354 354 if (!isInExtension (buf2, gamma, k, delta, source, dest)) 355 355 { 356 buf /= g;356 buf= quot; 357 357 LCBuf= LC (buf, Variable (1)); 358 358 recombination= true; … … 461 461 CFList result; 462 462 CanonicalForm LCBuf= LC (F, Variable (1)); 463 CanonicalForm g, buf= F;463 CanonicalForm g, quot, buf= F; 464 464 int * v= new int [T.length()]; 465 465 for (int i= 0; i < T.length(); i++) … … 512 512 S.removeFirst(); 513 513 g /= content (g, Variable (1)); 514 if (fdivides (g, buf)) 514 515 if (fdivides (g, buf, quot)) 515 516 { 516 517 recombination= true; 517 518 result.append (g); 518 buf /= g;519 buf= quot; 519 520 LCBuf= LC (buf, Variable(1)); 520 521 T= Difference (T, S); … … 628 629 CanonicalForm buf= F; 629 630 CanonicalForm LCBuf= LC (buf, Variable (1)); 630 CanonicalForm g ;631 CanonicalForm g, quot; 631 632 CanonicalForm M= power (F.mvar(), deg); 632 633 adaptedLiftBound= 0; … … 645 646 g= mulMod2 (i.getItem(), LCBuf, M); 646 647 g /= content (g, Variable (1)); 647 if (fdivides (g, buf ))648 if (fdivides (g, buf, quot)) 648 649 { 649 650 result.append (g); 650 buf /= g;651 buf= quot; 651 652 d -= degree (g) + degree (LC (g, Variable (1))); 652 653 LCBuf= LC (buf, Variable (1)); … … 703 704 if (!k && beta.level() != 1) 704 705 degMipoBeta= degree (getMipo (beta)); 706 CanonicalForm quot; 705 707 for (CFListIterator i= factors; i.hasItem(); i++) 706 708 { … … 716 718 g= mulMod2 (i.getItem(), LCBuf, M); 717 719 g /= content (g, Variable (1)); 718 if (fdivides (g, buf ))720 if (fdivides (g, buf, quot)) 719 721 { 720 722 buf2= g (y - eval, y); … … 726 728 { 727 729 appendTestMapDown (result, buf2, info, source, dest); 728 buf /= g;730 buf= quot; 729 731 d -= degree (g) + degree (LC (g, Variable (1))); 730 732 LCBuf= LC (buf, Variable (1)); … … 737 739 { 738 740 appendTestMapDown (result, buf2, info, source, dest); 739 buf /= g;741 buf= quot; 740 742 d -= degree (g) + degree (LC (g, Variable (1))); 741 743 LCBuf= LC (buf, Variable (1)); … … 959 961 Variable x= Variable (1); 960 962 CanonicalForm yToL= power (y, liftBound); 963 CanonicalForm quot; 961 964 for (long i= 1; i <= N.NumCols(); i++) 962 965 { … … 987 990 buf= mod (buf, yToL); 988 991 buf /= content (buf, x); 989 if (fdivides (buf, F ))992 if (fdivides (buf, F, quot)) 990 993 { 991 994 factorsFoundIndex[i - 1]= 1; 992 995 factorsFound++; 993 F /= buf;996 F= quot; 994 997 F /= Lc (F); 995 998 reconstructedFactors.append (buf); … … 1013 1016 Variable y= Variable (2); 1014 1017 Variable x= Variable (1); 1018 CanonicalForm quot; 1015 1019 CanonicalForm yToL= power (y, liftBound); 1016 1020 for (long i= 1; i <= N.NumCols(); i++) … … 1042 1046 buf= mod (buf, yToL); 1043 1047 buf /= content (buf, x); 1044 if (fdivides (buf, F ))1048 if (fdivides (buf, F, quot)) 1045 1049 { 1046 1050 factorsFoundIndex[i - 1]= 1; 1047 1051 factorsFound++; 1048 F /= buf;1052 F= quot; 1049 1053 F /= Lc (F); 1050 1054 reconstructedFactors.append (buf); … … 1069 1073 CanonicalForm F= G; 1070 1074 CanonicalForm yToL= power (y, precision); 1075 CanonicalForm quot; 1071 1076 CFList result; 1072 1077 CFList bufFactors= factors; … … 1090 1095 buf= mod (buf, yToL); 1091 1096 buf /= content (buf, x); 1092 if (fdivides (buf, F ))1093 { 1094 F /= buf;1097 if (fdivides (buf, F, quot)) 1098 { 1099 F= quot; 1095 1100 F /= Lc (F); 1096 1101 result.append (buf); … … 1118 1123 CanonicalForm F= G; 1119 1124 CanonicalForm yToL= power (y, precision); 1125 CanonicalForm quot; 1120 1126 CFList result; 1121 1127 CFList bufFactors= factors; … … 1140 1146 buf= mod (buf, yToL); 1141 1147 buf /= content (buf, x); 1142 if (fdivides (buf, F ))1143 { 1144 F /= buf;1148 if (fdivides (buf, F, quot)) 1149 { 1150 F= quot; 1145 1151 F /= Lc (F); 1146 1152 result.append (buf2); … … 1177 1183 CFList bufFactors= factors; 1178 1184 CFList factorsConsidered; 1179 CanonicalForm buf2 ;1185 CanonicalForm buf2, quot; 1180 1186 for (long i= 1; i <= N.NumCols(); i++) 1181 1187 { … … 1201 1207 if (degree (buf2, alpha) < 1) 1202 1208 { 1203 if (fdivides (buf, F ))1204 { 1205 F /= buf;1209 if (fdivides (buf, F, quot)) 1210 { 1211 F= quot; 1206 1212 F /= Lc (F); 1207 1213 result.append (buf2); … … 1216 1222 if (!isInExtension (buf2, gamma, k, delta, source, dest)) 1217 1223 { 1218 if (fdivides (buf, F ))1219 { 1220 F /= buf;1224 if (fdivides (buf, F, quot)) 1225 { 1226 F= quot; 1221 1227 F /= Lc (F); 1222 1228 result.append (buf2); … … 1245 1251 CanonicalForm F= G; 1246 1252 CanonicalForm yToL= power (y, precision); 1253 CanonicalForm quot; 1247 1254 CFList result; 1248 1255 CFList bufFactors= factors; … … 1266 1273 buf= mod (buf, yToL); 1267 1274 buf /= content (buf, x); 1268 if (fdivides (buf, F ))1269 { 1270 F /= buf;1275 if (fdivides (buf, F, quot)) 1276 { 1277 F= quot; 1271 1278 F /= Lc (F); 1272 1279 result.append (buf); … … 1300 1307 CanonicalForm delta= info.getDelta(); 1301 1308 CanonicalForm yToL= power (y, liftBound); 1309 CanonicalForm quot; 1302 1310 CFList source, dest; 1303 1311 for (long i= 1; i <= N.NumCols(); i++) … … 1335 1343 if (degree (buf2, alpha) < 1) 1336 1344 { 1337 if (fdivides (buf, F ))1345 if (fdivides (buf, F, quot)) 1338 1346 { 1339 1347 factorsFoundIndex[i - 1]= 1; 1340 1348 factorsFound++; 1341 F /= buf;1349 F= quot; 1342 1350 F /= Lc (F); 1343 1351 buf2= mapDown (buf2, info, source, dest); … … 1351 1359 if (!isInExtension (buf2, gamma, k, delta, source, dest)) 1352 1360 { 1353 if (fdivides (buf, F ))1361 if (fdivides (buf, F, quot)) 1354 1362 { 1355 1363 factorsFoundIndex[i - 1]= 1; 1356 1364 factorsFound++; 1357 F /= buf;1365 F= quot; 1358 1366 F /= Lc (F); 1359 1367 buf2= mapDown (buf2, info, source, dest);
Note: See TracChangeset
for help on using the changeset viewer.