Changeset c49e6f in git
 Timestamp:
 Nov 29, 2012, 10:50:23 AM (10 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
 Children:
 fd806709d80df10779e64d6bfe77cdf372b9c004
 Parents:
 894604cd8e2bd80d9c29cfc35d194404eaa0d476
 gitauthor:
 Martin Lee <martinlee84@web.de>20121129 10:50:23+01:00
 gitcommitter:
 Martin Lee <martinlee84@web.de>20121130 17:25:20+01:00
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

factory/facFqBivar.cc
r894604 rc49e6f 412 412 if (recombination) 413 413 { 414 appendTestMapDown (result, buf (y  eval, y), info, source, 414 buf= buf (yeval,y); 415 buf /= Lc (buf); 416 appendTestMapDown (result, buf, info, source, 415 417 dest); 416 418 F= 1; … … 439 441 if (recombination) 440 442 { 441 appendTestMapDown (result, buf (y  eval, y), info, source, dest); 443 buf= buf (yeval,y); 444 buf /= Lc (buf); 445 appendTestMapDown (result, buf, info, source, dest); 442 446 F= 1; 443 447 return result; … … 1788 1792 buf /= content (buf, x); 1789 1793 buf2= buf (yevaluation, y); 1794 buf2 /= Lc (buf2); 1790 1795 if (!k && beta == x) 1791 1796 { … … 1868 1873 buf /= content (buf, x); 1869 1874 buf2= buf (yevaluation, y); 1875 buf2 /= Lc (buf2); 1870 1876 if (!k && beta == x) 1871 1877 { … … 2043 2049 tmp1= tmp1 (y  evaluation, y); 2044 2050 tmp2= tmp2 (y  evaluation, y); 2051 tmp1 /= Lc (tmp1); 2052 tmp2 /= Lc (tmp2); 2045 2053 if (!k && beta == x && degree (tmp2, alpha) < 1 && 2046 2054 degree (tmp1, alpha) < 1) … … 2097 2105 buf /= content (buf, x); 2098 2106 buf2= buf (y  evaluation, y); 2107 buf2 /= Lc (buf2); 2099 2108 if (!k && beta == x) 2100 2109 { … … 2172 2181 tmp1= tmp1 (y  evaluation, y); 2173 2182 tmp2= tmp2 (y  evaluation, y); 2183 tmp1 /= Lc (tmp1); 2184 tmp2 /= Lc (tmp2); 2174 2185 if (!k && beta == x && degree (tmp2, alpha) < 1 && 2175 2186 degree (tmp1, alpha) < 1) … … 2226 2237 buf /= content (buf, x); 2227 2238 buf2= buf (y  evaluation, y); 2239 buf2 /= Lc (buf2); 2228 2240 if (!k && beta == x) 2229 2241 { … … 3572 3584 { 3573 3585 delete [] bounds; 3574 CanonicalForm G= F; 3586 Variable y= Variable (2); 3587 CanonicalForm tmp= F (y  evaluation, y); 3588 CFList source, dest; 3589 tmp= mapDown (tmp, info, source, dest); 3575 3590 F= 1; 3576 return CFList ( G);3591 return CFList (tmp); 3577 3592 } 3578 3593 … … 5679 5694 { 5680 5695 i= 1; 5681 while (( degree (F,y)/4)*i+ 4 <= smallFactorDeg)5696 while (((degree (F,y)/4)*i+1) + 4 <= smallFactorDeg) 5682 5697 i++; 5683 5698 while (i < 5) 5684 5699 { 5685 dummy= tmin (degree (F,y)+1, ( degree (F,y)/4)*i+4);5700 dummy= tmin (degree (F,y)+1, ((degree (F,y)/4)+1)*i+4); 5686 5701 if (l < dummy) 5687 5702 { … … 5838 5853 { 5839 5854 i= 1; 5840 while ((degree (F,y)/4 )*i + 4 <= smallFactorDeg)5855 while ((degree (F,y)/4+1)*i + 4 <= smallFactorDeg) 5841 5856 i++; 5842 5857 while (i < 5) 5843 5858 { 5844 dummy= tmin (degree (F,y)+1, (degree (F,y)/4 )*i+4);5859 dummy= tmin (degree (F,y)+1, (degree (F,y)/4+1)*i+4); 5845 5860 if (l < dummy) 5846 5861 { … … 5986 6001 { 5987 6002 i= 1; 5988 while ((degree (F,y)/4 )*i + 4 <= smallFactorDeg)6003 while ((degree (F,y)/4+1)*i + 4 <= smallFactorDeg) 5989 6004 i++; 5990 6005 while (i < 5) 5991 6006 { 5992 dummy= tmin (degree (F,y)+1, (degree (F,y)/4 )*i+4);6007 dummy= tmin (degree (F,y)+1, (degree (F,y)/4+1)*i+4); 5993 6008 if (l < dummy) 5994 6009 { … … 7330 7345 if (degs.getLength() == 1  bufUniFactors.length() == 1) 7331 7346 { 7332 result.append (bufF); 7347 CFList source, dest; 7348 CanonicalForm tmp= bufF (y  evaluation, y); 7349 tmp= mapDown (tmp, info, source, dest); 7350 result.append (tmp); 7333 7351 return result; 7334 7352 } … … 7687 7705 } 7688 7706 7689 if (i == 0 )7707 if (i == 0 && !extension) 7690 7708 { 7691 7709 if (subCheck1 > 0)
Note: See TracChangeset
for help on using the changeset viewer.