Changeset d193e12 in git


Ignore:
Timestamp:
Apr 28, 2014, 1:55:43 PM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
b6cba687bdf0dced5f30bdbc8d8521d8c1b0af8b
Parents:
9393e86176909d1ae03332ca82410f01a9d44138
git-author:
Martin Lee <martinlee84@web.de>2014-04-28 13:55:43+02:00
git-committer:
Martin Lee <martinlee84@web.de>2014-04-28 15:33:22+02:00
Message:
fix: pass by reference
Location:
factory
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • factory/DegreePattern.h

    r9393e86 rd193e12  
    4040    /// construct a Pattern from an int
    4141    Pattern(int n): m_refCounter(1), m_length(n), m_pattern( new int[n]) {};
    42     /// default contructor
     42    /// default constructor
    4343    Pattern(): m_refCounter(1), m_length(0), m_pattern(NULL) {};
    4444

  • factory/NTLconvert.cc

    r9393e86 rd193e12  
    5959////////////////////////////////////////////////////////////////////////////////
    6060
    61 ZZ_pX convertFacCF2NTLZZpX(CanonicalForm f)
     61ZZ_pX convertFacCF2NTLZZpX(const CanonicalForm & f)
    6262{
    6363  ZZ_pX ntl_poly;
    … …  
    100100  return ntl_poly;
    101101}
    102 zz_pX convertFacCF2NTLzzpX(CanonicalForm f)
     102zz_pX convertFacCF2NTLzzpX(const CanonicalForm & f)
    103103{
    104104  zz_pX ntl_poly;
    … …  
    177177////////////////////////////////////////////////////////////////////////////////
    178178
    179 GF2X convertFacCF2NTLGF2X(CanonicalForm f)
     179GF2X convertFacCF2NTLGF2X(const CanonicalForm & f)
    180180{
    181181  //printf("convertFacCF2NTLGF2X\n");
    … …  
    243243////////////////////////////////////////////////////////////////////////////////
    244244
    245 CanonicalForm convertNTLZZpX2CF(ZZ_pX poly,Variable x)
     245CanonicalForm convertNTLZZpX2CF(const ZZ_pX & poly,const Variable & x)
    246246{
    247247  return convertNTLZZX2CF (to_ZZX (poly), x);
    248248}
    249249
    250 CanonicalForm convertNTLzzpX2CF(zz_pX poly,Variable x)
     250CanonicalForm convertNTLzzpX2CF(const zz_pX & poly,const Variable & x)
    251251{
    252252  //printf("convertNTLzzpX2CF\n");
    … …  
    278278}
    279279
    280 CanonicalForm convertNTLZZX2CF(ZZX polynom,Variable x)
     280CanonicalForm convertNTLZZX2CF(const ZZX & polynom,const Variable & x)
    281281{
    282282  //printf("convertNTLZZX2CF\n");
    … …  
    315315////////////////////////////////////////////////////////////////////////////////
    316316
    317 CanonicalForm convertNTLGF2X2CF(GF2X poly,Variable x)
     317CanonicalForm convertNTLGF2X2CF(const GF2X & poly,const Variable & x)
    318318{
    319319  //printf("convertNTLGF2X2CF\n");
    … …  
    367367
    368368CFFList convertNTLvec_pair_ZZpX_long2FacCFFList
    369                                   (vec_pair_ZZ_pX_long e,ZZ_p multi,Variable x)
     369                                  (const vec_pair_ZZ_pX_long & e,const ZZ_p & multi,const Variable & x)
    370370{
    371371  //printf("convertNTLvec_pair_ZZpX_long2FacCFFList\n");
    … …  
    392392}
    393393CFFList convertNTLvec_pair_zzpX_long2FacCFFList
    394                                   (vec_pair_zz_pX_long e,zz_p multi,Variable x)
     394                                  (const vec_pair_zz_pX_long & e,const zz_p multi,const Variable & x)
    395395{
    396396  //printf("convertNTLvec_pair_zzpX_long2FacCFFList\n");
    … …  
    439439
    440440CFFList convertNTLvec_pair_GF2X_long2FacCFFList
    441     (vec_pair_GF2X_long e, GF2 /*multi*/, Variable x)
     441    (const vec_pair_GF2X_long& e, GF2 /*multi*/, const Variable & x)
    442442{
    443443  //printf("convertNTLvec_pair_GF2X_long2FacCFFList\n");
    … …  
    490490static unsigned long cf_stringtemp_l=0L;
    491491CanonicalForm
    492 convertZZ2CF (ZZ a)
     492convertZZ2CF (const ZZ & a)
    493493{
    494494  long coeff_long=to_long(a);
    … …  
    550550static char *cf_stringtemp2;
    551551static int cf_stringtemp_l=0;
    552 CanonicalForm convertZZ2CF(ZZ coefficient)
     552CanonicalForm convertZZ2CF(const ZZ & coefficient)
    553553{
    554554  long coeff_long;
    … …  
    658658////////////////////////////////////////////////////////////////////////////////
    659659
    660 ZZ convertFacCF2NTLZZ(const CanonicalForm f)
     660ZZ convertFacCF2NTLZZ(const CanonicalForm & f)
    661661{
    662662  ZZ temp;
    … …  
    679679}
    680680
    681 ZZX convertFacCF2NTLZZX(CanonicalForm f)
     681ZZX convertFacCF2NTLZZX(const CanonicalForm & f)
    682682{
    683683    ZZX ntl_poly;
    … …  
    740740////////////////////////////////////////////////////////////////////////////////
    741741
    742 CFFList convertNTLvec_pair_ZZX_long2FacCFFList(vec_pair_ZZX_long e,ZZ multi,Variable x)
     742CFFList
     743convertNTLvec_pair_ZZX_long2FacCFFList (const vec_pair_ZZX_long & e,const ZZ & multi,const Variable & x)
    743744{
    744745  CFFList result;
    … …  
    783784////////////////////////////////////////////////////////////////////////////////
    784785
    785 CanonicalForm convertNTLZZpE2CF(ZZ_pE coefficient,Variable x)
     786CanonicalForm convertNTLZZpE2CF(const ZZ_pE & coefficient,const Variable & x)
    786787{
    787788  return convertNTLZZpX2CF(rep(coefficient),x);
    788789}
    789 CanonicalForm convertNTLzzpE2CF(zz_pE coefficient,Variable x)
     790CanonicalForm convertNTLzzpE2CF(const zz_pE & coefficient,const Variable & x)
    790791{
    791792  return convertNTLzzpX2CF(rep(coefficient),x);
    … …  
    812813////////////////////////////////////////////////////////////////////////////////
    813814
    814 CFFList convertNTLvec_pair_ZZpEX_long2FacCFFList(vec_pair_ZZ_pEX_long e,ZZ_pE multi,Variable x,Variable alpha)
     815CFFList
     816convertNTLvec_pair_ZZpEX_long2FacCFFList(const vec_pair_ZZ_pEX_long & e,const ZZ_pE & multi,const Variable & x,const Variable & alpha)
    815817{
    816818  CFFList result;
    … …  
    856858  return result;
    857859}
    858 CFFList convertNTLvec_pair_zzpEX_long2FacCFFList(vec_pair_zz_pEX_long e,zz_pE multi,Variable x,Variable alpha)
     860CFFList
     861convertNTLvec_pair_zzpEX_long2FacCFFList(const vec_pair_zz_pEX_long & e,const zz_pE & multi,const Variable & x,const Variable & alpha)
    859862{
    860863  CFFList result;
    … …  
    918921////////////////////////////////////////////////////////////////////////////////
    919922
    920 CanonicalForm convertNTLGF2E2CF(GF2E coefficient,Variable x)
     923CanonicalForm convertNTLGF2E2CF(const GF2E & coefficient,const Variable & x)
    921924{
    922925  return convertNTLGF2X2CF(rep(coefficient),x);
    … …  
    945948
    946949CFFList convertNTLvec_pair_GF2EX_long2FacCFFList
    947     (vec_pair_GF2EX_long e, GF2E /*multi*/, Variable x, Variable alpha)
     950    (const vec_pair_GF2EX_long & e, const GF2E & multi, const Variable & x, const Variable & alpha)
    948951{
    949952  CFFList result;
    … …  
    986989
    987990  }
     991
     992  if (!IsOne(multi))
     993    result.insert(CFFactor(convertNTLGF2E2CF(multi,alpha),1));
     994
    988995  // return the computed CFFList
    989996  return result;
    … …  
    9931000// CanonicalForm in Z_2(a)[X] to NTL GF2EX        //
    9941001////////////////////////////////////////////////////
    995 GF2EX convertFacCF2NTLGF2EX(CanonicalForm f,GF2X mipo)
     1002GF2EX convertFacCF2NTLGF2EX(const CanonicalForm & f,const GF2X & mipo)
    9961003{
    9971004  GF2E::init(mipo);
    … …  
    10231030// CanonicalForm in Z_p(a)[X] to NTL ZZ_pEX       //
    10241031////////////////////////////////////////////////////
    1025 ZZ_pEX convertFacCF2NTLZZ_pEX(CanonicalForm f, ZZ_pX mipo)
     1032ZZ_pEX convertFacCF2NTLZZ_pEX(const CanonicalForm & f, const ZZ_pX & mipo)
    10261033{
    10271034  ZZ_pE::init(mipo);
    … …  
    10501057  return result;
    10511058}
    1052 zz_pEX convertFacCF2NTLzz_pEX(CanonicalForm f, zz_pX mipo)
     1059zz_pEX convertFacCF2NTLzz_pEX(const CanonicalForm & f, const zz_pX & mipo)
    10531060{
    10541061  zz_pE::init(mipo);
    … …  
    10781085}
    10791086
    1080 CanonicalForm convertNTLzz_pEX2CF (zz_pEX f, Variable x, Variable alpha)
     1087CanonicalForm convertNTLzz_pEX2CF (const zz_pEX& f, const Variable & x, const Variable & alpha)
    10811088{
    10821089  CanonicalForm bigone;
    … …  
    11011108}
    11021109
    1103 CanonicalForm convertNTLZZ_pEX2CF (ZZ_pEX f, Variable x, Variable alpha)
     1110CanonicalForm convertNTLZZ_pEX2CF (const ZZ_pEX& f, const Variable & x, const Variable & alpha)
    11041111{
    11051112  CanonicalForm bigone;
    … …  
    11241131}
    11251132//----------------------------------------------------------------------
    1126 mat_ZZ* convertFacCFMatrix2NTLmat_ZZ(CFMatrix &m)
     1133mat_ZZ* convertFacCFMatrix2NTLmat_ZZ(const CFMatrix &m)
    11271134{
    11281135  mat_ZZ *res=new mat_ZZ;
    … …  
    11391146  return res;
    11401147}
    1141 CFMatrix* convertNTLmat_ZZ2FacCFMatrix(mat_ZZ &m)
     1148CFMatrix* convertNTLmat_ZZ2FacCFMatrix(const mat_ZZ &m)
    11421149{
    11431150  CFMatrix *res=new CFMatrix(m.NumRows(),m.NumCols());
    … …  
    11531160}
    11541161
    1155 mat_zz_p* convertFacCFMatrix2NTLmat_zz_p(CFMatrix &m)
     1162mat_zz_p* convertFacCFMatrix2NTLmat_zz_p(const CFMatrix &m)
    11561163{
    11571164  mat_zz_p *res=new mat_zz_p;
    … …  
    11691176  return res;
    11701177}
    1171 CFMatrix* convertNTLmat_zz_p2FacCFMatrix(mat_zz_p &m)
     1178CFMatrix* convertNTLmat_zz_p2FacCFMatrix(const mat_zz_p &m)
    11721179{
    11731180  CFMatrix *res=new CFMatrix(m.NumRows(),m.NumCols());
    … …  
    11821189  return res;
    11831190}
    1184 mat_zz_pE* convertFacCFMatrix2NTLmat_zz_pE(CFMatrix &m)
     1191mat_zz_pE* convertFacCFMatrix2NTLmat_zz_pE(const CFMatrix &m)
    11851192{
    11861193  mat_zz_pE *res=new mat_zz_pE;
    … …  
    11981205  return res;
    11991206}
    1200 CFMatrix* convertNTLmat_zz_pE2FacCFMatrix(mat_zz_pE &m, Variable alpha)
     1207CFMatrix* convertNTLmat_zz_pE2FacCFMatrix(const mat_zz_pE &m, const Variable & alpha)
    12011208{
    12021209  CFMatrix *res=new CFMatrix(m.NumRows(),m.NumCols());

  • factory/NTLconvert.h

    r9393e86 rd193e12  
    5151
    5252
    53 ZZ_pX convertFacCF2NTLZZpX(CanonicalForm f);
    54 zz_pX convertFacCF2NTLzzpX(CanonicalForm f);
    55 GF2X convertFacCF2NTLGF2X(CanonicalForm f);
    56 CanonicalForm convertNTLZZpX2CF(ZZ_pX poly,Variable x);
    57 CanonicalForm convertNTLzzpX2CF(zz_pX poly,Variable x);
    58 CanonicalForm convertNTLGF2X2CF(GF2X poly,Variable x);
    59 CanonicalForm convertNTLZZX2CF(ZZX polynom,Variable x);
    60 CFFList convertNTLvec_pair_ZZpX_long2FacCFFList(vec_pair_ZZ_pX_long e,ZZ_p multi,Variable x);
    61 CFFList convertNTLvec_pair_zzpX_long2FacCFFList(vec_pair_zz_pX_long e,zz_p multi,Variable x);
     53ZZ_pX convertFacCF2NTLZZpX(const CanonicalForm & f);
     54zz_pX convertFacCF2NTLzzpX(const CanonicalForm & f);
     55GF2X convertFacCF2NTLGF2X(const CanonicalForm & f);
     56CanonicalForm convertNTLZZpX2CF(const ZZ_pX & poly,const Variable & x);
     57CanonicalForm convertNTLzzpX2CF(const zz_pX & poly,const Variable & x);
     58CanonicalForm convertNTLGF2X2CF(const GF2X & poly,const Variable & x);
     59CanonicalForm convertNTLZZX2CF(const ZZX & polynom,const Variable & x);
     60CFFList convertNTLvec_pair_ZZpX_long2FacCFFList(const vec_pair_ZZ_pX_long& e,const ZZ_p & multi,const Variable & x);
     61CFFList convertNTLvec_pair_zzpX_long2FacCFFList(const vec_pair_zz_pX_long& e,const zz_p multi,const Variable & x);
    6262
    63 CFFList convertNTLvec_pair_GF2X_long2FacCFFList(vec_pair_GF2X_long e,GF2 multi,Variable x);
    64 CanonicalForm convertZZ2CF(ZZ coefficient);
    65 ZZ convertFacCF2NTLZZ(const CanonicalForm f);
    66 ZZX convertFacCF2NTLZZX(CanonicalForm f);
    67 CFFList convertNTLvec_pair_ZZX_long2FacCFFList(vec_pair_ZZX_long e,ZZ multi,Variable x);
    68 CanonicalForm convertNTLZZpE2CF(ZZ_pE coefficient,Variable x);
    69 CFFList convertNTLvec_pair_ZZpEX_long2FacCFFList(vec_pair_ZZ_pEX_long e,ZZ_pE multi,Variable x,Variable alpha);
    70 CanonicalForm convertNTLGF2E2CF(GF2E coefficient,Variable x);
    71 CFFList convertNTLvec_pair_GF2EX_long2FacCFFList(vec_pair_GF2EX_long e,GF2E multi,Variable x,Variable alpha);
    72 GF2EX convertFacCF2NTLGF2EX(CanonicalForm f,GF2X mipo);
    73 ZZ_pEX convertFacCF2NTLZZ_pEX(CanonicalForm f,ZZ_pX mipo);
    74 zz_pEX convertFacCF2NTLzz_pEX(CanonicalForm f,zz_pX mipo);
    75 CanonicalForm convertNTLzzpE2CF(zz_pE f, Variable x);
    76 CFFList convertNTLvec_pair_zzpEX_long2FacCFFList(vec_pair_zz_pEX_long e,zz_pE multi,Variable x,Variable alpha);
    77 CanonicalForm convertNTLzz_pEX2CF(zz_pEX f, Variable x, Variable alpha);
    78 CanonicalForm convertNTLZZ_pEX2CF(ZZ_pEX f, Variable x, Variable alpha);
     63CFFList convertNTLvec_pair_GF2X_long2FacCFFList(const vec_pair_GF2X_long& e,const GF2 multi,const Variable & x);
     64CanonicalForm convertZZ2CF(const ZZ & coefficient);
     65ZZ convertFacCF2NTLZZ(const CanonicalForm & f);
     66ZZX convertFacCF2NTLZZX(const CanonicalForm & f);
     67CFFList convertNTLvec_pair_ZZX_long2FacCFFList(const vec_pair_ZZX_long& e,const ZZ & multi,const Variable & x);
     68CanonicalForm convertNTLZZpE2CF(const ZZ_pE & coefficient,const Variable & x);
     69CFFList convertNTLvec_pair_ZZpEX_long2FacCFFList(const vec_pair_ZZ_pEX_long & e,const ZZ_pE & multi,const Variable & x,const Variable & alpha);
     70CanonicalForm convertNTLGF2E2CF(const GF2E & coefficient,const Variable & x);
     71CFFList convertNTLvec_pair_GF2EX_long2FacCFFList(const vec_pair_GF2EX_long& e,const GF2E & multi,const Variable & x,const Variable & alpha);
     72GF2EX convertFacCF2NTLGF2EX(const CanonicalForm & f,const GF2X & mipo);
     73ZZ_pEX convertFacCF2NTLZZ_pEX(const CanonicalForm & f,const ZZ_pX & mipo);
     74zz_pEX convertFacCF2NTLzz_pEX(const CanonicalForm & f,const zz_pX & mipo);
     75CanonicalForm convertNTLzzpE2CF(const zz_pE & f, const Variable & x);
     76CFFList convertNTLvec_pair_zzpEX_long2FacCFFList(const vec_pair_zz_pEX_long & e,const zz_pE & multi,const Variable & x,const Variable & alpha);
     77CanonicalForm convertNTLzz_pEX2CF(const zz_pEX & f, const Variable & x, const Variable & alpha);
     78CanonicalForm convertNTLZZ_pEX2CF(const ZZ_pEX & f, const Variable & x, const Variable & alpha);
    7979
    80 mat_ZZ* convertFacCFMatrix2NTLmat_ZZ(CFMatrix &m);
    81 CFMatrix* convertNTLmat_ZZ2FacCFMatrix(mat_ZZ &m);
    82 mat_zz_p* convertFacCFMatrix2NTLmat_zz_p(CFMatrix &m);
    83 CFMatrix* convertNTLmat_zz_p2FacCFMatrix(mat_zz_p &m);
    84 mat_zz_pE* convertFacCFMatrix2NTLmat_zz_pE(CFMatrix &m);
    85 CFMatrix* convertNTLmat_zz_pE2FacCFMatrix(mat_zz_pE &m, Variable alpha);
     80mat_ZZ* convertFacCFMatrix2NTLmat_ZZ(const CFMatrix &m);
     81CFMatrix* convertNTLmat_ZZ2FacCFMatrix(const mat_ZZ &m);
     82mat_zz_p* convertFacCFMatrix2NTLmat_zz_p(const CFMatrix &m);
     83CFMatrix* convertNTLmat_zz_p2FacCFMatrix(const mat_zz_p &m);
     84mat_zz_pE* convertFacCFMatrix2NTLmat_zz_pE(const CFMatrix &m);
     85CFMatrix* convertNTLmat_zz_pE2FacCFMatrix(const mat_zz_pE &m, const Variable & alpha);
    8686
    8787extern long fac_NTL_char;

  • factory/algext.cc

    r9393e86 rd193e12  
    373373
    374374static inline CanonicalForm
    375 tryNewtonInterp (const CanonicalForm alpha, const CanonicalForm u,
    376               const CanonicalForm newtonPoly, const CanonicalForm oldInterPoly,
     375tryNewtonInterp (const CanonicalForm & alpha, const CanonicalForm & u,
     376              const CanonicalForm & newtonPoly, const CanonicalForm & oldInterPoly,
    377377              const Variable & x, const CanonicalForm& M, bool& fail)
    378378{

  • factory/cfModResultant.cc

    r9393e86 rd193e12  
    301301
    302302static inline CanonicalForm
    303 newtonInterp (const CanonicalForm alpha, const CanonicalForm u,
    304               const CanonicalForm newtonPoly, const CanonicalForm oldInterPoly,
     303newtonInterp (const CanonicalForm & alpha, const CanonicalForm & u,
     304              const CanonicalForm & newtonPoly, const CanonicalForm & oldInterPoly,
    305305              const Variable & x)
    306306{

  • factory/cf_gcd_smallp.cc

    r9393e86 rd193e12  
    359359/// newtonPoly must be equal to (x - alpha_1) * ... * (x - alpha_{n-1})
    360360static inline CanonicalForm
    361 newtonInterp(const CanonicalForm alpha, const CanonicalForm u,
    362              const CanonicalForm newtonPoly, const CanonicalForm oldInterPoly,
     361newtonInterp(const CanonicalForm & alpha, const CanonicalForm & u,
     362             const CanonicalForm & newtonPoly, const CanonicalForm & oldInterPoly,
    363363             const Variable & x)
    364364{

  • factory/variable.cc

    r9393e86 rd193e12  
    152152#endif /* NOSTREAMIO */
    153153
    154 static CanonicalForm conv2mipo ( const CanonicalForm & mipo, const Variable alpha )
     154static CanonicalForm conv2mipo ( const CanonicalForm & mipo, const Variable & alpha )
    155155{
    156156    CanonicalForm result;
Note: See TracChangeset for help on using the changeset viewer.