Changeset e016ba in git
 Timestamp:
 Feb 10, 2012, 12:28:39 PM (11 years ago)
 Branches:
 (u'jengelhdatetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
 Children:
 c7c7fe472295329d72d18b083413fa9ac6d12400
 Parents:
 64b8244955360904656883f8cc313e5776722e11
 gitauthor:
 Martin Lee <martinlee84@web.de>20120210 12:28:39+01:00
 gitcommitter:
 Martin Lee <martinlee84@web.de>20120404 14:42:25+02:00
 Location:
 factory
 Files:

 2 edited
Legend:
 Unmodified
 Added
 Removed

factory/facHensel.cc
r64b824 re016ba 490 490 if (k != j  k + 1) 491 491 { 492 if ((one.hasTerms() && one.exp() == j  k + 1) && (two.hasTerms() && two.exp() == j  k + 1)) 493 { 494 tmp[0] += mulNTL ((bufFactors[0] [k] + one.coeff()), (bufFactors[1] [k] + 492 if ((one.hasTerms() && one.exp() == j  k + 1) 493 && (two.hasTerms() && two.exp() == j  k + 1)) 494 { 495 tmp[0] += mulNTL ((bufFactors[0][k]+one.coeff()), (bufFactors[1][k]+ 495 496 two.coeff()))  M (k + 1, 1)  M (j  k + 2, 1); 496 497 one++; … … 499 500 else if (one.hasTerms() && one.exp() == j  k + 1) 500 501 { 501 tmp[0] += mulNTL ((bufFactors[0] [k] + one.coeff()), bufFactors[1] [k])502 tmp[0] += mulNTL ((bufFactors[0][k]+one.coeff()), bufFactors[1][k]) 502 503 M (k + 1, 1); 503 504 one++; … … 505 506 else if (two.hasTerms() && two.exp() == j  k + 1) 506 507 { 507 tmp[0] += mulNTL (bufFactors[0] [k], (bufFactors[1] [k] + two.coeff()))508 tmp[0] += mulNTL (bufFactors[0][k], (bufFactors[1][k]+two.coeff())) 508 509 M (k + 1, 1); 509 510 two++; … … 577 578 (two.hasTerms() && two.exp() == j  k + 1)) 578 579 { 579 tmp[l] += mulNTL ((bufFactors[l + 1] [k] + one.coeff()), (Pi[l  1][k] +580 tmp[l] += mulNTL ((bufFactors[l+1][k] + one.coeff()), (Pi[l1][k] + 580 581 two.coeff()))  M (k + 1, l + 1)  M (j  k + 2, l + 1); 581 582 one++; … … 584 585 else if (one.hasTerms() && one.exp() == j  k + 1) 585 586 { 586 tmp[l] += mulNTL ((bufFactors[l + 1] [k] + one.coeff()), Pi[l  1][k]) 587 tmp[l] += mulNTL ((bufFactors[l+1][k]+one.coeff()), Pi[l1][k])  587 588 M (k + 1, l + 1); 588 589 one++; … … 590 591 else if (two.hasTerms() && two.exp() == j  k + 1) 591 592 { 592 tmp[l] += mulNTL (bufFactors[l + 1] [k], (Pi[l  1][k] + two.coeff())) 593 tmp[l] += mulNTL (bufFactors[l+1][k], (Pi[l1][k] + two.coeff()))  593 594 M (k + 1, l + 1); 594 595 two++; 
factory/facMul.cc
r64b824 re016ba 952 952 for (ind= 0; ind < repLengthBuf1; ind++) 953 953 { 954 fmpz_poly_get_coeff_fmpz (tmp1, buf1, ind); //oder fmpz_set (fmpz_poly_get_coeff_ptr (buf3, ind),fmpz_poly_get_coeff_ptr (buf1, ind))954 fmpz_poly_get_coeff_fmpz (tmp1, buf1, ind); 955 955 fmpz_poly_set_coeff_fmpz (buf3, ind, tmp1); 956 956 } … … 1826 1826 #ifdef HAVE_FLINT 1827 1827 Variable alpha; 1828 if (getCharacteristic() == 0 && !hasFirstAlgVar (F, alpha) && ! hasFirstAlgVar (G, alpha)) 1828 if (getCharacteristic() == 0 && !hasFirstAlgVar (F, alpha) 1829 && !hasFirstAlgVar (G, alpha)) 1829 1830 return mulMod2FLINTQ (F, G, M); 1830 1831 #endif … … 2414 2415 return; 2415 2416 } 2416 if (!(B.level() == 1 && B.isUnivariate()) && (A.level() == 1 && A.isUnivariate())) 2417 if (!(B.level() == 1 && B.isUnivariate()) && 2418 (A.level() == 1 && A.isUnivariate())) 2417 2419 { 2418 2420 Q= 0;
Note: See TracChangeset
for help on using the changeset viewer.