Changeset 773d28 in git
 Timestamp:
 Jun 6, 2012, 3:41:23 PM (11 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')
 Children:
 617dbcd561feba2c98f750ce8bd841e28e8da4d4
 Parents:
 ec664a2ce7842d3b8f5d7a9af2a8b2ff7944ec43
 gitauthor:
 Martin Lee <martinlee84@web.de>20120606 15:41:23+02:00
 gitcommitter:
 Martin Lee <martinlee84@web.de>20120731 11:48:23+02:00
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

factory/facFqBivar.cc
rec664a2 r773d28 1333 1333 if (factors.length() == 2) 1334 1334 { 1335 CanonicalForm tmp1, tmp2 ;1335 CanonicalForm tmp1, tmp2, tmp3; 1336 1336 tmp1= factors.getFirst(); 1337 1337 tmp2= factors.getLast(); … … 1342 1342 tmp2= mod (tmp2, yToL); 1343 1343 tmp2 /= content (tmp2, x); 1344 if (degree (tmp1) + degree (tmp2) == degree (F)) 1344 tmp3 = tmp1*tmp2; 1345 if (tmp3/Lc (tmp3) == F/Lc (F)) 1345 1346 { 1346 1347 factorsFound++; … … 1409 1410 if (factors.length() == 2) 1410 1411 { 1411 CanonicalForm tmp1, tmp2 ;1412 CanonicalForm tmp1, tmp2, tmp3; 1412 1413 tmp1= factors.getFirst(); 1413 1414 tmp2= factors.getLast(); … … 1418 1419 tmp2= mod (tmp2, yToL); 1419 1420 tmp2 /= content (tmp2, x); 1420 if (degree (tmp1) + degree (tmp2) == degree (F)) 1421 tmp3 = tmp1*tmp2; 1422 if (tmp3/Lc (tmp3) == F/Lc (F)) 1421 1423 { 1422 1424 factorsFound++; … … 1723 1725 if (factors.length() == 2) 1724 1726 { 1725 CanonicalForm tmp1, tmp2 ;1727 CanonicalForm tmp1, tmp2, tmp3; 1726 1728 tmp1= factors.getFirst(); 1727 1729 tmp2= factors.getLast(); … … 1732 1734 tmp2= mod (tmp2, yToL); 1733 1735 tmp2 /= content (tmp2, x); 1734 if (degree (tmp1) + degree (tmp2) == degree (F)) 1736 tmp3 = tmp1*tmp2; 1737 if (tmp3/Lc (tmp3) == F/Lc (F)) 1735 1738 { 1736 1739 tmp1= tmp1 (y  evaluation, y); 1737 1740 tmp2= tmp2 (y  evaluation, y); 1738 factorsFound++; 1739 F= 1; 1740 tmp1= mapDown (tmp1, info, source, dest); 1741 tmp2= mapDown (tmp2, info, source, dest); 1742 reconstructedFactors.append (tmp1); 1743 reconstructedFactors.append (tmp2); 1744 return; 1741 if (!k && beta == x && degree (tmp2, alpha) < 1 && 1742 degree (tmp1, alpha) < 1) 1743 { 1744 factorsFound++; 1745 F= 1; 1746 tmp1= mapDown (tmp1, info, source, dest); 1747 tmp2= mapDown (tmp2, info, source, dest); 1748 reconstructedFactors.append (tmp1); 1749 reconstructedFactors.append (tmp2); 1750 return; 1751 } 1752 else if (!isInExtension (tmp2, gamma, k, delta, source, dest) && 1753 !isInExtension (tmp1, gamma, k, delta, source, dest)) 1754 { 1755 factorsFound++; 1756 F= 1; 1757 tmp1= mapDown (tmp1, info, source, dest); 1758 tmp2= mapDown (tmp2, info, source, dest); 1759 reconstructedFactors.append (tmp1); 1760 reconstructedFactors.append (tmp2); 1761 return; 1762 } 1745 1763 } 1746 1764 } … … 4641 4659 } 4642 4660 Variable y= F.mvar(); 4643 CanonicalForm shiftedF= G (y  evaluation, y); 4644 int sizeOldF= size (shiftedF); 4661 int sizeOldF= size (G); 4645 4662 if (size (F) < sizeOldF) 4646 4663 { 4647 H= F (y + evaluation, y); //shift back to zero4664 H= F; 4648 4665 success= true; 4649 4666 return earlyFactors; … … 4689 4706 CFList smallFactors; 4690 4707 CanonicalForm H; 4691 bool success ;4708 bool success= false; 4692 4709 smallFactors= sieveSmallFactors (F, bufUniFactors, degs, H, diophant, Pi, M, 4693 4710 success, minBound + 1 … … 5343 5360 { 5344 5361 delete [] bounds; 5345 return CFList (F); 5362 CFList source, dest; 5363 CanonicalForm tmp= G (y  evaluation, y); 5364 tmp= mapDown (tmp, info, source, dest); 5365 return CFList (tmp); 5346 5366 } 5347 5367 int minBound= bounds[0]; … … 5361 5381 CFList smallFactors; 5362 5382 CanonicalForm H; 5363 bool success ;5383 bool success= false; 5364 5384 smallFactors= extSieveSmallFactors (F, bufUniFactors, degs, H, diophant, Pi, 5365 5385 M, success, minBound + 1, evaluation, info
Note: See TracChangeset
for help on using the changeset viewer.