Changeset 448d06 in git


Ignore:
Timestamp:
Feb 21, 2013, 5:40:49 PM (10 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'cbf866d4f8c3861325311c042cb2033c053453b2')
Children:
c2400cea086b85043ee8187be4765842d83ecac4
Parents:
e5aab035dcd0b56379d1af420d8c6fbac1c5f73ee29bd5c03a53b919fe8180547ab8722b6031b41e
Message:
Merge pull request #293 from mmklee/fix_sw_warnings

fix: some warnings in libfac
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • factory/libfac/charset/alg_factor.cc

    re5aab0 r448d06  
    378378      // muessen wir die Nachfolger aendern, wenn s != 0 ?
    379379      DEBOUTLN(CERR, "simpleextension: g= ", g);
    380       if ( s != 0 ) DEBOUTLN(CERR, "simpleextension: s= ", s);
    381       else DEBOUTLN(CERR, "simpleextension: s= ", s);
     380      DEBOUTLN(CERR, "simpleextension: s= ", s);
    382381      DEBOUTLN(CERR, "simpleextension: R= ", R);
    383382      Returnlist.insert(s);
     
    684683  CanonicalForm Fgcd;
    685684          Fgcd= alg_gcd(f,f.deriv(),Astar);
    686   if ( Fgcd == 0 ) DEBOUTMSG(CERR, "WARNING: p'th root ?");
     685  if ( Fgcd == 0 ) {DEBOUTMSG(CERR, "WARNING: p'th root ?");}
    687686  if (( degree(Fgcd, f.mvar()) > 0) && (!(f.deriv().isZero())) ){
    688687    DEBOUTLN(CERR, "Nontrivial GCD found of ", f);
  • factory/libfac/charset/algfactor.cc

    re5aab0 r448d06  
    2929int hasVar(const CanonicalForm &f, const Variable &v);
    3030
     31/* unused functions:
    3132static CFFList
    3233myminus( const CFFList & Inputlist, const CFFactor & TheFactor){
     
    4344}
    4445
    45 /* unused functions:
    4646static CFFList
    4747myDifference(const CFFList & Inputlist1,const CFFList & Inputlist2){
  • factory/libfac/factor/Factor.cc

    re5aab0 r448d06  
    620620    {
    621621      if (Extension.level()<0)
    622       DEBOUTLN(CERR, "Univ. Factorization over extension of degree ",
    623                degree(getMipo(Extension,'x')) );
     622      {
     623        DEBOUTLN(CERR, "Univ. Factorization over extension of degree ",
     624                 degree(getMipo(Extension,'x')) );
     625      }
    624626      else
    625       DEBOUTLN(CERR, "Univ. Factorization over extension of level ??",
    626                 Extension.level());
     627      {
     628        DEBOUTLN(CERR, "Univ. Factorization over extension of level ??",
     629                 Extension.level());
     630      }
    627631      TIMING_START(evaluate_time);
    628632      Outputlist = factorize2(F,Extension,alpha);
     
    964968//           * ensuring poly is sqrfree (n.y.i.)             //
    965969///////////////////////////////////////////////////////////////
    966 static bool fdivides2(const CanonicalForm &F, const CanonicalForm &G, const CanonicalForm &minpoly)
     970/*static bool fdivides2(const CanonicalForm &F, const CanonicalForm &G, const CanonicalForm &minpoly)
    967971{
    968972  if (!minpoly.isZero())
     
    985989  else
    986990   return fdivides(F,G);
    987 }
     991}*/
    988992
    989993CFFList
  • factory/libfac/factor/MVMultiHensel.cc

    re5aab0 r448d06  
    7272    return *this;
    7373  }
    74   RememberForm() : poly(0), calculated(false) {}
     74  RememberForm() : calculated(false), poly(0) {}
    7575  Boolean calculated;
    7676  CanonicalForm poly;
  • libpolys/polys/monomials/p_polys.cc

    re29bd5 r448d06  
    697697  if( p == NULL ) // TODO: ???
    698698     return -1;
    699    
    700   long r = totaldegreeWecart_IV(p, R, w); pIter(p);
    701 
    702   for ( ; p!=NULL; pIter(p) )
    703   {
    704     const long t = totaldegreeWecart_IV(p, R, w);
     699  long r=~0L;
     700  loop
     701  {
     702    long t = totaldegreeWecart_IV(p, R, w); pIter(p);
    705703    if (t > r) r = t;
    706   }
    707    
     704    pIter(p);
     705    if (p==NULL) break;
     706  }
    708707  return r;
    709708}
     
    728727    j+=p_GetExp(p, i, r)*r->firstwv[i-1];
    729728
    730   for (;i<=r->N;i++)
     729  for (;i<=rVar(r);i++)
    731730    j+=p_GetExp(p,i, r)*p_Weight(i, r);
    732731
Note: See TracChangeset for help on using the changeset viewer.