Changeset 45328f in git


Ignore:
Timestamp:
Apr 2, 2014, 4:32:13 PM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')
Children:
a94f331b0fb5457db6f6819575c343fb01073fcf
Parents:
be5bf9edaeda312b9d4d211ec87d7c8b994951a5
Message:
chg: replaced getAlgVar by hasFirstAlgVar
Location:
factory
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • factory/algext.h

    rbe5bf9 r45328f  
    1616#endif
    1717void tryInvert( const CanonicalForm &, const CanonicalForm &, CanonicalForm &, bool & );
     18/*BEGINPUBLIC*/
    1819bool hasFirstAlgVar( const CanonicalForm &, Variable & );
     20/*ENDPUBLIC*/
    1921void tryBrownGCD( const CanonicalForm & F, const CanonicalForm & G, const CanonicalForm & M, CanonicalForm & result, bool & fail, bool topLevel= true );
    2022int * leadDeg(const CanonicalForm & f, int *degs);

  • factory/factory.template

    rbe5bf9 r45328f  
    110110#include "cfModResultant.h"
    111111
     112/*MAKEHEADER PUBLIC ONLY*/
     113#include "algext.h"
     114
    112115#endif /* ! INCL_FACTORY_H */

  • factory/libfac/charset/alg_factor.cc

    rbe5bf9 r45328f  
    4141static Varlist
    4242Var_is_in_AS(const Varlist & uord, const CFList & Astar);
    43 
    44 int getAlgVar(const CanonicalForm &f, Variable &X)
    45 {
    46   if (f.inBaseDomain()) return 0;
    47   if (f.inCoeffDomain())
    48   {
    49     if (f.level()!=0)
    50     {
    51       X= f.mvar();
    52       return 1;
    53     }
    54     return getAlgVar(f.LC(),X);
    55   }
    56   if (f.inPolyDomain())
    57   {
    58     if (getAlgVar(f.LC(),X)) return 1;
    59     for( CFIterator i=f; i.hasTerms(); i++)
    60     {
    61       if (getAlgVar(i.coeff(),X)) return 1;
    62     }
    63   }
    64   return 0;
    65 }
    6643
    6744////////////////////////////////////////////////////////////////////////
    … …  
    166143      // ...but it should go away soon!!!!
    167144      Variable X;
    168       if (getAlgVar(R,X))
     145      if (hasFirstAlgVar(R,X))
    169146        testlist=factorize( R, X );
    170147      else
    … …  
    241218      // ...but it should go away soon!!!!
    242219      Variable X;
    243       if (getAlgVar(R,X))
     220      if (hasFirstAlgVar(R,X))
    244221        testlist= factorize( R, X );
    245222      else
    … …  
    851828  DEBOUTLN(CERR, "alg_factor: R= ", R);
    852829  Variable X;
    853   if (getAlgVar(R,X))
     830  if (hasFirstAlgVar(R,X))
    854831  {
    855832    // factorize R over alg.extension with X
Note: See TracChangeset for help on using the changeset viewer.