Changeset 4439f8e in git
 Timestamp:
 Feb 6, 2013, 3:11:06 PM (10 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
 Children:
 58c0e4759150dd2e6e37fe30ba3369048248e78c
 Parents:
 f4d7641e74a466b25fca59f236f67698ac0ac369
 gitauthor:
 Martin Lee <martinlee84@web.de>20130206 15:11:06+01:00
 gitcommitter:
 Martin Lee <martinlee84@web.de>20130218 15:00:39+01:00
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

factory/facHensel.cc
rf4d7641 r4439f8e 918 918 M (j + 1, 1)= mulNTL (bufFactors[0] [j], bufFactors[1] [j], b); 919 919 CanonicalForm uIZeroJ; 920 if (j == 1) 921 { 922 if (degBuf0 > 0 && degBuf1 > 0) 923 uIZeroJ= mulNTL ((bufFactors[0] [0] + bufFactors[0] [j]), 924 (bufFactors[1] [0] + buf[1]), b)  M(1, 1)  M(j + 1, 1); 925 else if (degBuf0 > 0) 926 uIZeroJ= mulNTL (bufFactors[0] [j], bufFactors[1], b); 927 else if (degBuf1 > 0) 928 uIZeroJ= mulNTL (bufFactors[0], buf[1], b); 929 else 930 uIZeroJ= 0; 931 if (b.getp() != 0) 932 uIZeroJ= b (uIZeroJ); 933 Pi [0] += xToJ*uIZeroJ; 934 if (b.getp() != 0) 935 Pi [0]= b (Pi[0]); 936 } 920 921 if (degBuf0 > 0 && degBuf1 > 0) 922 uIZeroJ= mulNTL ((bufFactors[0] [0] + bufFactors[0] [j]), 923 (bufFactors[1] [0] + buf[1]), b)  M(1, 1)  M(j + 1, 1); 924 else if (degBuf0 > 0) 925 uIZeroJ= mulNTL (bufFactors[0] [j], bufFactors[1], b); 926 else if (degBuf1 > 0) 927 uIZeroJ= mulNTL (bufFactors[0], buf[1], b); 937 928 else 938 { 939 if (degBuf0 > 0 && degBuf1 > 0) 940 uIZeroJ= mulNTL ((bufFactors[0] [0] + bufFactors[0] [j]), 941 (bufFactors[1] [0] + buf[1]), b)  M(1, 1)  M(j + 1, 1); 942 else if (degBuf0 > 0) 943 uIZeroJ= mulNTL (bufFactors[0] [j], bufFactors[1], b); 944 else if (degBuf1 > 0) 945 uIZeroJ= mulNTL (bufFactors[0], buf[1], b); 946 else 947 uIZeroJ= 0; 948 if (b.getp() != 0) 949 uIZeroJ= b (uIZeroJ); 950 Pi [0] += xToJ*uIZeroJ; 951 if (b.getp() != 0) 952 Pi [0]= b (Pi[0]); 953 } 929 uIZeroJ= 0; 930 if (b.getp() != 0) 931 uIZeroJ= b (uIZeroJ); 932 Pi [0] += xToJ*uIZeroJ; 933 if (b.getp() != 0) 934 Pi [0]= b (Pi[0]); 935 954 936 CFArray tmp= CFArray (factors.length()  1); 955 937 for (k= 0; k < factors.length()  1; k++) … … 1445 1427 M (j + 1, 1)= mulMod (bufFactors[0] [j], bufFactors[1] [j], MOD); 1446 1428 CanonicalForm uIZeroJ; 1447 if (j == 1) 1448 { 1449 if (degBuf0 > 0 && degBuf1 > 0) 1450 uIZeroJ= mulMod ((bufFactors[0] [0] + bufFactors[0] [j]), 1429 1430 if (degBuf0 > 0 && degBuf1 > 0) 1431 uIZeroJ= mulMod ((bufFactors[0] [0] + bufFactors[0] [j]), 1451 1432 (bufFactors[1] [0] + buf[1]), MOD)  M(1, 1)  M(j + 1, 1); 1452 else if (degBuf0 > 0) 1453 uIZeroJ= mulMod (bufFactors[0] [j], bufFactors[1], MOD); 1454 else if (degBuf1 > 0) 1455 uIZeroJ= mulMod (bufFactors[0], buf[1], MOD); 1456 else 1457 uIZeroJ= 0; 1458 Pi [0] += xToJ*uIZeroJ; 1459 } 1433 else if (degBuf0 > 0) 1434 uIZeroJ= mulMod (bufFactors[0] [j], bufFactors[1], MOD); 1435 else if (degBuf1 > 0) 1436 uIZeroJ= mulMod (bufFactors[0], buf[1], MOD); 1460 1437 else 1461 { 1462 if (degBuf0 > 0 && degBuf1 > 0) 1463 uIZeroJ= mulMod ((bufFactors[0] [0] + bufFactors[0] [j]), 1464 (bufFactors[1] [0] + buf[1]), MOD)  M(1, 1)  M(j + 1, 1); 1465 else if (degBuf0 > 0) 1466 uIZeroJ= mulMod (bufFactors[0] [j], bufFactors[1], MOD); 1467 else if (degBuf1 > 0) 1468 uIZeroJ= mulMod (bufFactors[0], buf[1], MOD); 1469 else 1470 uIZeroJ= 0; 1471 Pi [0] += xToJ*uIZeroJ; 1472 } 1438 uIZeroJ= 0; 1439 Pi [0] += xToJ*uIZeroJ; 1473 1440 1474 1441 CFArray tmp= CFArray (factors.length()  1);
Note: See TracChangeset
for help on using the changeset viewer.