Changeset bffe62 in git


Ignore:
Timestamp:
Nov 19, 2012, 5:26:28 PM (10 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
8e51caea071beef6e0f3c31472a9553c63c8df6d
Parents:
a209e1d3deac62269a6170eb87b8dd656049e036
git-author:
Martin Lee <martinlee84@web.de>2012-11-19 17:26:28+01:00
git-committer:
Martin Lee <martinlee84@web.de>2012-11-19 18:01:22+01:00
Message:
chg: skip zz_p::init() if it is already correctly initialized
Location:
factory
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • factory/algext.cc

    ra209e1d rbffe62  
    467467#ifdef HAVE_NTL
    468468  Variable v= M.mvar();
    469   zz_p::init (getCharacteristic());
     469  if (fac_NTL_char != getCharacteristic())
     470  {
     471    fac_NTL_char= getCharacteristic();
     472    zz_p::init (getCharacteristic());
     473  }
    470474  zz_pX NTLMipo= convertFacCF2NTLzzpX (M);
    471475  zz_pE::init (NTLMipo);

  • factory/cfModResultant.cc

    ra209e1d rbffe62  
    258258  return CanonicalForm ((long) FLINTresult);
    259259#else
    260   zz_pBak bak;
    261   bak.save();
    262   zz_p::init (getCharacteristic());
     260  if (fac_NTL_char != getCharacteristic())
     261  {
     262    fac_NTL_char= getCharacteristic();
     263    zz_p::init (getCharacteristic());
     264  }
    263265  zz_pX NTLF= convertFacCF2NTLzzpX (F);
    264266  zz_pX NTLG= convertFacCF2NTLzzpX (G);
    … …  
    266268  zz_p NTLResult= resultant (NTLF, NTLG);
    267269
    268   bak.restore();
    269270  return CanonicalForm (to_long (rep (NTLResult)));
    270271#endif

  • factory/cf_gcd.cc

    ra209e1d rbffe62  
    115115      if (p == 2 && d < 6)
    116116      {
    117         zz_p::init (p);
     117        if (fac_NTL_char != 2)
     118        {
     119          fac_NTL_char= 2;
     120          zz_p::init (p);
     121        }
    118122        bool primFail= false;
    119123        Variable vBuf;
    … …  
    139143      else if ((p == 3 && d < 4) || ((p == 5 || p == 7) && d < 3))
    140144      {
    141         zz_p::init (p);
     145        if (fac_NTL_char != p)
     146        {
     147          fac_NTL_char= p;
     148          zz_p::init (p);
     149        }
    142150        bool primFail= false;
    143151        Variable vBuf;

  • factory/cf_gcd_smallp.cc

    ra209e1d rbffe62  
    414414Variable chooseExtension (const Variable & alpha)
    415415{
    416   zz_p::init (getCharacteristic());
     416  if (fac_NTL_char != getCharacteristic())
     417  {
     418    fac_NTL_char= getCharacteristic();
     419    zz_p::init (getCharacteristic());
     420  }
    417421  zz_pX NTLIrredpoly;
    418422  int i, m;
    … …  
    440444{
    441445  int p= getCharacteristic();
    442   zz_p::init (p);
     446  if (p != fac_NTL_char)
     447  {
     448    fac_NTL_char= p;
     449    zz_p::init (p);
     450  }
    443451  zz_pX NTLirredpoly;
    444452  //TODO: replace d by max_{i} (deg_x{i}(f))
    … …  
    13331341{
    13341342  int p= getCharacteristic();
    1335   zz_p::init (p);
     1343  if (fac_NTL_char != p)
     1344  {
     1345    fac_NTL_char= p;
     1346    zz_p::init (p);
     1347  }
    13361348  zz_pX NTLirredpoly;
    13371349  CanonicalForm CFirredpoly;
    … …  
    19982010#else
    19992011  int p= getCharacteristic ();
    2000   zz_p::init (p);
     2012  if (fac_NTL_char != p)
     2013  {
     2014    fac_NTL_char= p;
     2015    zz_p::init (p);
     2016  }
    20012017  mat_zz_p *NTLN= convertFacCFMatrix2NTLmat_zz_p(*N);
    20022018  long rk= gauss (*NTLN);
    … …  
    20282044    (*N) (j, M.columns() + 1)= L[i];
    20292045  int p= getCharacteristic ();
    2030   zz_p::init (p);
     2046  if (fac_NTL_char != p)
     2047  {
     2048    fac_NTL_char= p;
     2049    zz_p::init (p);
     2050  }
    20312051  zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
    20322052  zz_pE::init (NTLMipo);
    … …  
    20692089#else
    20702090  int p= getCharacteristic ();
    2071   zz_p::init (p);
     2091  if (fac_NTL_char != p)
     2092  {
     2093    fac_NTL_char= p;
     2094    zz_p::init (p);
     2095  }
    20722096  mat_zz_p *NTLN= convertFacCFMatrix2NTLmat_zz_p(*N);
    20732097  long rk= gauss (*NTLN);
    … …  
    21092133    (*N) (j, M.columns() + 1)= L[i];
    21102134  int p= getCharacteristic ();
    2111   zz_p::init (p);
     2135  if (fac_NTL_char != p)
     2136  {
     2137    fac_NTL_char= p;
     2138    zz_p::init (p);
     2139  }
    21122140  zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
    21132141  zz_pE::init (NTLMipo);
    … …  
    45944622    if (p == 2 && d < 6)
    45954623    {
    4596       zz_p::init (p);
     4624      if (fac_NTL_char != p)
     4625      {
     4626        fac_NTL_char= p;
     4627        zz_p::init (p);
     4628      }
    45974629      bool primFail= false;
    45984630      Variable vBuf;
    … …  
    46184650    else if ((p == 3 && d < 4) || ((p == 5 || p == 7) && d < 3))
    46194651    {
    4620       zz_p::init (p);
     4652      if (fac_NTL_char != p)
     4653      {
     4654        fac_NTL_char= p;
     4655        zz_p::init (p);
     4656      }
    46214657      bool primFail= false;
    46224658      Variable vBuf;

  • factory/cf_map_ext.cc

    ra209e1d rbffe62  
    6767{
    6868  int p= getCharacteristic ();
    69   zz_p::init (p);
     69  if (fac_NTL_char != p)
     70  {
     71    fac_NTL_char= p;
     72    zz_p::init (p);
     73  }
    7074  zz_pX NTL_mipo= convertFacCF2NTLzzpX (getMipo (beta));
    7175  zz_pE::init (NTL_mipo);
    … …  
    325329  int d= degree (mipo);
    326330  int p= getCharacteristic ();
    327   zz_p::init (p);
     331  if (fac_NTL_char != p)
     332  {
     333    fac_NTL_char= p;
     334    zz_p::init (p);
     335  }
    328336  zz_pX NTL_mipo;
    329337  CanonicalForm mipo2;
    … …  
    378386    CanonicalForm primElemMipo= findMinPoly (primElem, alpha);
    379387    int p= getCharacteristic ();
    380     zz_p::init (p);
     388    if (fac_NTL_char != p)
     389    {
     390      fac_NTL_char= p;
     391      zz_p::init (p);
     392    }
    381393    zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (beta));
    382394    zz_pE::init (NTLMipo);
    … …  
    399411  }
    400412  int p= getCharacteristic ();
    401   zz_p::init (p);
     413  if (fac_NTL_char != p)
     414  {
     415    fac_NTL_char= p;
     416    zz_p::init (p);
     417  }
    402418  zz_pX NTL_mipo= convertFacCF2NTLzzpX (getMipo (beta));
    403419  zz_pE::init (NTL_mipo);
    … …  
    422438  ASSERT (F.isUnivariate() && F.mvar()==alpha,"expected element of F_p(alpha)");
    423439
    424   zz_p::init (getCharacteristic());
     440  if (fac_NTL_char != getCharacteristic())
     441  {
     442    fac_NTL_char= getCharacteristic();
     443    zz_p::init (getCharacteristic());
     444  }
    425445  zz_pX NTLF= convertFacCF2NTLzzpX (F);
    426446  int d= degree (getMipo (alpha));

  • factory/facFqBivar.cc

    ra209e1d rbffe62  
    155155          "univariate polynomial expected or constant expected");
    156156  CFFList factorsA;
    157   zz_p::init (getCharacteristic());
     157  if (fac_NTL_char != getCharacteristic())
     158  {
     159    fac_NTL_char= getCharacteristic();
     160    zz_p::init (getCharacteristic());
     161  }
    158162  if (GF)
    159163  {
    … …  
    673677Variable chooseExtension (const Variable & alpha, const Variable& beta, int k)
    674678{
    675   zz_p::init (getCharacteristic());
     679  if (fac_NTL_char != getCharacteristic())
     680  {
     681    fac_NTL_char= getCharacteristic();
     682    zz_p::init (getCharacteristic());
     683  }
    676684  zz_pX NTLIrredpoly;
    677685  int i=1, m= 2;
    … …  
    35553563  CFArray * A= new CFArray [factors.length()];
    35563564  CFArray bufQ= CFArray (factors.length());
    3557   zz_p::init (getCharacteristic());
     3565  if (fac_NTL_char != getCharacteristic())
     3566  {
     3567    fac_NTL_char= getCharacteristic();
     3568    zz_p::init (getCharacteristic());
     3569  }
    35583570  mat_zz_p NTLN;
    35593571  ident (NTLN, factors.length());
    … …  
    37483760  CFArray * A= new CFArray [factors.length()];
    37493761  CFArray bufQ= CFArray (factors.length());
    3750   zz_p::init (getCharacteristic());
     3762  if (fac_NTL_char != getCharacteristic())
     3763  {
     3764    fac_NTL_char= getCharacteristic();
     3765    zz_p::init (getCharacteristic());
     3766  }
    37513767  zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
    37523768  zz_pE::init (NTLMipo);
    … …  
    62066222  nmod_mat_t FLINTN;
    62076223#else
    6208   zz_p::init (getCharacteristic());
     6224  if (fac_NTL_char != getCharacteristic())
     6225  {
     6226    fac_NTL_char= getCharacteristic();
     6227    zz_p::init (getCharacteristic());
     6228  }
    62096229  mat_zz_p NTLN;
    62106230#endif
    … …  
    70767096  int l= 1;
    70777097
    7078   zz_p::init (getCharacteristic());
     7098  if (fac_NTL_char != getCharacteristic())
     7099  {
     7100    fac_NTL_char= getCharacteristic();
     7101    zz_p::init (getCharacteristic());
     7102  }
    70797103  zz_pX NTLMipo;
    70807104  mat_zz_p NTLN;

  • factory/facHensel.cc

    ra209e1d rbffe62  
    3939CFList productsNTL (const CFList& factors, const CanonicalForm& M)
    4040{
    41   zz_p::init (getCharacteristic());
     41  if (fac_NTL_char != getCharacteristic())
     42  {
     43    fac_NTL_char= getCharacteristic();
     44    zz_p::init (getCharacteristic());
     45  }
    4246  zz_pX NTLMipo= convertFacCF2NTLzzpX (M);
    4347  zz_pE::init (NTLMipo);
    … …  
    103107#ifdef HAVE_NTL
    104108  Variable x= Variable (1);
    105   zz_p::init (getCharacteristic());
     109  if (fac_NTL_char != getCharacteristic())
     110  {
     111    fac_NTL_char= getCharacteristic();
     112    zz_p::init (getCharacteristic());
     113  }
    106114  zz_pX NTLMipo= convertFacCF2NTLzzpX (M);
    107115  zz_pE::init (NTLMipo);

  • factory/facMul.cc

    ra209e1d rbffe62  
    503503  ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
    504504  ASSERT (F.level() == G.level(), "expected polys of same level");
    505   zz_p::init (getCharacteristic());
     505  if (fac_NTL_char != getCharacteristic())
     506  {
     507    fac_NTL_char= getCharacteristic();
     508    zz_p::init (getCharacteristic());
     509  }
    506510  Variable alpha;
    507511  CanonicalForm result;
    … …  
    619623  ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
    620624  ASSERT (F.level() == G.level(), "expected polys of same level");
    621   zz_p::init (getCharacteristic());
     625  if (fac_NTL_char != getCharacteristic())
     626  {
     627    fac_NTL_char= getCharacteristic();
     628    zz_p::init (getCharacteristic());
     629  }
    622630  Variable alpha;
    623631  CanonicalForm result;
    … …  
    764772  ASSERT (F.isUnivariate() && G.isUnivariate(), "expected univariate polys");
    765773  ASSERT (F.level() == G.level(), "expected polys of same level");
    766   zz_p::init (getCharacteristic());
     774  if (fac_NTL_char != getCharacteristic())
     775  {
     776    fac_NTL_char= getCharacteristic();
     777    zz_p::init (getCharacteristic());
     778  }
    767779  Variable alpha;
    768780  CanonicalForm result;
    … …  
    20742086    int d1= degAx + degBx + 1;
    20752087    int d2= tmax (degAy, degBy);
    2076     zz_p::init (getCharacteristic());
     2088    if (fac_NTL_char != getCharacteristic())
     2089    {
     2090      fac_NTL_char= getCharacteristic();
     2091      zz_p::init (getCharacteristic());
     2092    }
    20772093    zz_pX NTLMipo= convertFacCF2NTLzzpX (getMipo (alpha));
    20782094    zz_pE::init (NTLMipo);
    … …  
    28342850  if (p > 0)
    28352851  {
    2836     zz_p::init (p);
     2852    if (fac_NTL_char != p)
     2853    {
     2854      fac_NTL_char= p;
     2855      zz_p::init (p);
     2856    }
    28372857    Variable alpha;
    28382858    if (hasFirstAlgVar (A, alpha) || hasFirstAlgVar (B, alpha))
Note: See TracChangeset for help on using the changeset viewer.