Changeset e016ba in git


Ignore:
Timestamp:
Feb 10, 2012, 12:28:39 PM (12 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '4188d308699580d975efd0f6cca8dcb41c396f70')
Children:
c7c7fe472295329d72d18b083413fa9ac6d12400
Parents:
64b8244955360904656883f8cc313e5776722e11
git-author:
Martin Lee <martinlee84@web.de>2012-02-10 12:28:39+01:00
git-committer:
Martin Lee <martinlee84@web.de>2012-04-04 14:42:25+02:00
Message:
chg: code formatting
Location:
factory
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • factory/facHensel.cc

    r64b824 re016ba  
    490490      if (k != j - k + 1)
    491491      {
    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]+
    495496                     two.coeff())) - M (k + 1, 1) - M (j - k + 2, 1);
    496497          one++;
     
    499500        else if (one.hasTerms() && one.exp() == j - k + 1)
    500501        {
    501           tmp[0] += mulNTL ((bufFactors[0] [k] + one.coeff()), bufFactors[1] [k]) -
     502          tmp[0] += mulNTL ((bufFactors[0][k]+one.coeff()), bufFactors[1][k])-
    502503                     M (k + 1, 1);
    503504          one++;
     
    505506        else if (two.hasTerms() && two.exp() == j - k + 1)
    506507        {
    507           tmp[0] += mulNTL (bufFactors[0] [k], (bufFactors[1] [k] + two.coeff())) -
     508          tmp[0] += mulNTL (bufFactors[0][k], (bufFactors[1][k]+two.coeff()))-
    508509                    M (k + 1, 1);
    509510          two++;
     
    577578              (two.hasTerms() && two.exp() == j - k + 1))
    578579          {
    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[l-1][k] +
    580581                       two.coeff())) - M (k + 1, l + 1) - M (j - k + 2, l + 1);
    581582            one++;
     
    584585          else if (one.hasTerms() && one.exp() == j - k + 1)
    585586          {
    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[l-1][k]) -
    587588                       M (k + 1, l + 1);
    588589            one++;
     
    590591          else if (two.hasTerms() && two.exp() == j - k + 1)
    591592          {
    592             tmp[l] += mulNTL (bufFactors[l + 1] [k], (Pi[l - 1] [k] + two.coeff())) -
     593            tmp[l] += mulNTL (bufFactors[l+1][k], (Pi[l-1][k] + two.coeff())) -
    593594                      M (k + 1, l + 1);
    594595            two++;
  • factory/facMul.cc

    r64b824 re016ba  
    952952    for (ind= 0; ind < repLengthBuf1; ind++)
    953953    {
    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);
    955955      fmpz_poly_set_coeff_fmpz (buf3, ind, tmp1);
    956956    }
     
    18261826#ifdef HAVE_FLINT
    18271827  Variable alpha;
    1828   if (getCharacteristic() == 0 && !hasFirstAlgVar (F, alpha) && ! hasFirstAlgVar (G, alpha))
     1828  if (getCharacteristic() == 0 && !hasFirstAlgVar (F, alpha)
     1829      && !hasFirstAlgVar (G, alpha))
    18291830    return mulMod2FLINTQ (F, G, M);
    18301831#endif
     
    24142415    return;
    24152416  }
    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()))
    24172419  {
    24182420    Q= 0;
Note: See TracChangeset for help on using the changeset viewer.