Changeset 772056 in git


Ignore:
Timestamp:
Aug 8, 2012, 2:00:01 PM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '96ce329119711a2b80858c8365abd29f8460bbfa')
Children:
fce807dd867479a3c2e3030b73a57dbe28db63c6
Parents:
8267b8f9ab43170a4026e7e570df48db4601a748
git-author:
Martin Lee <martinlee84@web.de>2012-08-08 14:00:01+02:00
git-committer:
Martin Lee <martinlee84@web.de>2012-09-04 18:01:16+02:00
Message:
chg: added new function sortByUniFactors
chg: deleted part of getLeadingCoeffs that is now part of sortByUniFactors
Location:
factory
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • factory/facFqFactorize.cc

    r8267b8 r772056  
    19121912}
    19131913
     1914
    19141915void getLeadingCoeffs (const CanonicalForm& A, CFList*& Aeval,
     1916                       const CFList& uniFactors, const CFList& evaluation
     1917                      )
     1918{
     1919  CFListIterator iter;
     1920  CFList LCs;
     1921  for (int j= 0; j < A.level() - 2; j++)
     1922  {
     1923    if (!Aeval[j].isEmpty())
     1924    {
     1925      LCs= CFList();
     1926      for (iter= Aeval[j]; iter.hasItem(); iter++)
     1927        LCs.append (LC (iter.getItem(), 1));
     1928      //normalize (LCs);
     1929      Aeval[j]= LCs;
     1930    }
     1931  }
     1932}
     1933
     1934void sortByUniFactors (CFList*& Aeval, int AevalLength,
    19151935                       const CFList& uniFactors, const CFList& evaluation
    19161936                      )
     
    19231943  CFArray l;
    19241944  int pos, index;
    1925   for (int j= 0; j < A.level() - 2; j++)
     1945  for (int j= 0; j < AevalLength; j++)
    19261946  {
    19271947    if (!Aeval[j].isEmpty())
    19281948    {
    1929       i= A.level();
     1949      i= evaluation.length() + 1;
    19301950      for (iter= evaluation; iter.hasItem(); iter++, i--)
    19311951      {
     
    19561976
    19571977      buf= buildUniFactors (Aeval[j], evalPoint, v);
    1958       LCs= CFList();
    1959       for (iter= Aeval[j]; iter.hasItem(); iter++)
    1960         LCs.append (LC (iter.getItem(), 1));
    1961       //normalize (LCs);
    1962       Aeval[j]= LCs;
    19631978    }
    19641979  }
  • factory/facFqFactorize.h

    r8267b8 r772056  
    606606                );
    607607
     608
     609/// sort bivariate factors in Aeval such that their corresponding univariate
     610/// factors coincide with uniFactors
     611void sortByUniFactors (CFList*& Aeval,          ///< [in,out] array of bivariate
     612                                                ///< factors
     613                       int AevalLength,         ///< [in] length of Aeval
     614                       const CFList& uniFactors,///< [in] univariate factors
     615                       const CFList& evaluation ///< [in] evaluation point
     616                      );
     617
    608618/// extract leading coefficients wrt Variable(1) from bivariate factors obtained
    609619/// from factorizations of A wrt different second variables
Note: See TracChangeset for help on using the changeset viewer.