Changeset cfaf16 in git for Singular/svd_si.h


Ignore:
Timestamp:
Nov 3, 2017, 4:16:00 PM (6 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
c6e446fa33d72d4eb037ca712dfdec6a28c5914d
Parents:
dbb26818e03a9b85b6dd00922db4fdd7c008f44b
Message:
complier warnings: svd stuff
File:
1 edited

Legend:

Unmodified
Added
Removed

  • Singular/svd_si.h

    rdbb268 rcfaf16  
    108108
    109109const complex operator/(const complex& lhs, const complex& rhs);
    110 const bool operator==(const complex& lhs, const complex& rhs);
    111 const bool operator!=(const complex& lhs, const complex& rhs);
     110bool operator==(const complex& lhs, const complex& rhs);
     111bool operator!=(const complex& lhs, const complex& rhs);
    112112const complex operator+(const complex& lhs);
    113113const complex operator-(const complex& lhs);
    … …  
    124124const complex operator/(const double& lhs, const complex& rhs);
    125125const complex operator/(const complex& lhs, const double& rhs);
    126 const double abscomplex(const complex &z);
     126double abscomplex(const complex &z);
    127127const complex conj(const complex &z);
    128128const complex csqr(const complex &z);
    … …  
    16171617    //
    16181618    template<unsigned int Precision>
    1619     const bool operator==(const ampf<Precision>& op1, const ampf<Precision>& op2)
     1619    bool operator==(const ampf<Precision>& op1, const ampf<Precision>& op2)
    16201620    {
    16211621        return mpfr_cmp(op1.getReadPtr(), op2.getReadPtr())==0;
    … …  
    16231623
    16241624    template<unsigned int Precision>
    1625     const bool operator!=(const ampf<Precision>& op1, const ampf<Precision>& op2)
     1625    bool operator!=(const ampf<Precision>& op1, const ampf<Precision>& op2)
    16261626    {
    16271627        return mpfr_cmp(op1.getReadPtr(), op2.getReadPtr())!=0;
    … …  
    16291629
    16301630    template<unsigned int Precision>
    1631     const bool operator<(const ampf<Precision>& op1, const ampf<Precision>& op2)
     1631    bool operator<(const ampf<Precision>& op1, const ampf<Precision>& op2)
    16321632    {
    16331633        return mpfr_cmp(op1.getReadPtr(), op2.getReadPtr())<0;
    … …  
    16351635
    16361636    template<unsigned int Precision>
    1637     const bool operator>(const ampf<Precision>& op1, const ampf<Precision>& op2)
     1637    bool operator>(const ampf<Precision>& op1, const ampf<Precision>& op2)
    16381638    {
    16391639        return mpfr_cmp(op1.getReadPtr(), op2.getReadPtr())>0;
    … …  
    16411641
    16421642    template<unsigned int Precision>
    1643     const bool operator<=(const ampf<Precision>& op1, const ampf<Precision>& op2)
     1643    bool operator<=(const ampf<Precision>& op1, const ampf<Precision>& op2)
    16441644    {
    16451645        return mpfr_cmp(op1.getReadPtr(), op2.getReadPtr())<=0;
    … …  
    16471647
    16481648    template<unsigned int Precision>
    1649     const bool operator>=(const ampf<Precision>& op1, const ampf<Precision>& op2)
     1649    bool operator>=(const ampf<Precision>& op1, const ampf<Precision>& op2)
    16501650    {
    16511651        return mpfr_cmp(op1.getReadPtr(), op2.getReadPtr())>=0;
    … …  
    17151715
    17161716    template<unsigned int Precision>
    1717     const int sign(const ampf<Precision> &x)
     1717    int sign(const ampf<Precision> &x)
    17181718    {
    17191719        int s = mpfr_sgn(x.getReadPtr());
    … …  
    17621762
    17631763    template<unsigned int Precision>
    1764     const signed long trunc(const ampf<Precision> &x)
     1764    signed long trunc(const ampf<Precision> &x)
    17651765    {
    17661766        ampf<Precision> tmp;
    … …  
    17881788
    17891789    template<unsigned int Precision>
    1790     const signed long floor(const ampf<Precision> &x)
     1790    signed long floor(const ampf<Precision> &x)
    17911791    {
    17921792        ampf<Precision> tmp;
    … …  
    18051805
    18061806    template<unsigned int Precision>
    1807     const signed long ceil(const ampf<Precision> &x)
     1807    signed long ceil(const ampf<Precision> &x)
    18081808    {
    18091809        ampf<Precision> tmp;
    … …  
    18221822
    18231823    template<unsigned int Precision>
    1824     const signed long round(const ampf<Precision> &x)
     1824    signed long round(const ampf<Precision> &x)
    18251825    {
    18261826        ampf<Precision> tmp;
    … …  
    18871887        template<unsigned int Precision> const ampf<Precision> operator/(const ampf<Precision>& op1, const signed type& op2) { return op1/ampf<Precision>(op2); }   \
    18881888        template<unsigned int Precision> const ampf<Precision> operator/(const ampf<Precision>& op1, const unsigned type& op2) { return op1/ampf<Precision>(op2); } \
    1889         template<unsigned int Precision> const bool       operator==(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)==op2; }   \
    1890         template<unsigned int Precision> const bool       operator==(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)==op2; } \
    1891         template<unsigned int Precision> const bool       operator==(const ampf<Precision>& op1, const signed type& op2) { return op1==ampf<Precision>(op2); }   \
    1892         template<unsigned int Precision> const bool       operator==(const ampf<Precision>& op1, const unsigned type& op2) { return op1==ampf<Precision>(op2); } \
    1893         template<unsigned int Precision> const bool       operator!=(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)!=op2; }   \
    1894         template<unsigned int Precision> const bool       operator!=(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)!=op2; } \
    1895         template<unsigned int Precision> const bool       operator!=(const ampf<Precision>& op1, const signed type& op2) { return op1!=ampf<Precision>(op2); }   \
    1896         template<unsigned int Precision> const bool       operator!=(const ampf<Precision>& op1, const unsigned type& op2) { return op1!=ampf<Precision>(op2); } \
    1897         template<unsigned int Precision> const bool       operator<=(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)<=op2; }   \
    1898         template<unsigned int Precision> const bool       operator<=(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)<=op2; } \
    1899         template<unsigned int Precision> const bool       operator<=(const ampf<Precision>& op1, const signed type& op2) { return op1<=ampf<Precision>(op2); }   \
    1900         template<unsigned int Precision> const bool       operator<=(const ampf<Precision>& op1, const unsigned type& op2) { return op1<=ampf<Precision>(op2); } \
    1901         template<unsigned int Precision> const bool       operator>=(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)>=op2; }   \
    1902         template<unsigned int Precision> const bool       operator>=(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)>=op2; } \
    1903         template<unsigned int Precision> const bool       operator>=(const ampf<Precision>& op1, const signed type& op2) { return op1>=ampf<Precision>(op2); }   \
    1904         template<unsigned int Precision> const bool       operator>=(const ampf<Precision>& op1, const unsigned type& op2) { return op1>=ampf<Precision>(op2); } \
    1905         template<unsigned int Precision> const bool       operator<(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)<op2; }   \
    1906         template<unsigned int Precision> const bool       operator<(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)<op2; } \
    1907         template<unsigned int Precision> const bool       operator<(const ampf<Precision>& op1, const signed type& op2) { return op1<ampf<Precision>(op2); }   \
    1908         template<unsigned int Precision> const bool       operator<(const ampf<Precision>& op1, const unsigned type& op2) { return op1<ampf<Precision>(op2); } \
    1909         template<unsigned int Precision> const bool       operator>(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)>op2; }   \
    1910         template<unsigned int Precision> const bool       operator>(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)>op2; } \
    1911         template<unsigned int Precision> const bool       operator>(const ampf<Precision>& op1, const signed type& op2) { return op1>ampf<Precision>(op2); }   \
    1912         template<unsigned int Precision> const bool       operator>(const ampf<Precision>& op1, const unsigned type& op2) { return op1>ampf<Precision>(op2); }
     1889        template<unsigned int Precision> bool       operator==(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)==op2; }   \
     1890        template<unsigned int Precision> bool       operator==(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)==op2; } \
     1891        template<unsigned int Precision> bool       operator==(const ampf<Precision>& op1, const signed type& op2) { return op1==ampf<Precision>(op2); }   \
     1892        template<unsigned int Precision> bool       operator==(const ampf<Precision>& op1, const unsigned type& op2) { return op1==ampf<Precision>(op2); } \
     1893        template<unsigned int Precision> bool       operator!=(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)!=op2; }   \
     1894        template<unsigned int Precision> bool       operator!=(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)!=op2; } \
     1895        template<unsigned int Precision> bool       operator!=(const ampf<Precision>& op1, const signed type& op2) { return op1!=ampf<Precision>(op2); }   \
     1896        template<unsigned int Precision> bool       operator!=(const ampf<Precision>& op1, const unsigned type& op2) { return op1!=ampf<Precision>(op2); } \
     1897        template<unsigned int Precision> bool       operator<=(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)<=op2; }   \
     1898        template<unsigned int Precision> bool       operator<=(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)<=op2; } \
     1899        template<unsigned int Precision> bool       operator<=(const ampf<Precision>& op1, const signed type& op2) { return op1<=ampf<Precision>(op2); }   \
     1900        template<unsigned int Precision> bool       operator<=(const ampf<Precision>& op1, const unsigned type& op2) { return op1<=ampf<Precision>(op2); } \
     1901        template<unsigned int Precision> bool       operator>=(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)>=op2; }   \
     1902        template<unsigned int Precision> bool       operator>=(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)>=op2; } \
     1903        template<unsigned int Precision> bool       operator>=(const ampf<Precision>& op1, const signed type& op2) { return op1>=ampf<Precision>(op2); }   \
     1904        template<unsigned int Precision> bool       operator>=(const ampf<Precision>& op1, const unsigned type& op2) { return op1>=ampf<Precision>(op2); } \
     1905        template<unsigned int Precision> bool       operator<(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)<op2; }   \
     1906        template<unsigned int Precision> bool       operator<(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)<op2; } \
     1907        template<unsigned int Precision> bool       operator<(const ampf<Precision>& op1, const signed type& op2) { return op1<ampf<Precision>(op2); }   \
     1908        template<unsigned int Precision> bool       operator<(const ampf<Precision>& op1, const unsigned type& op2) { return op1<ampf<Precision>(op2); } \
     1909        template<unsigned int Precision> bool       operator>(const signed type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)>op2; }   \
     1910        template<unsigned int Precision> bool       operator>(const unsigned type& op1, const ampf<Precision>& op2) { return ampf<Precision>(op1)>op2; } \
     1911        template<unsigned int Precision> bool       operator>(const ampf<Precision>& op1, const signed type& op2) { return op1>ampf<Precision>(op2); }   \
     1912        template<unsigned int Precision> bool       operator>(const ampf<Precision>& op1, const unsigned type& op2) { return op1>ampf<Precision>(op2); }
    19131913    __AMP_BINARY_OPI(char)
    19141914    __AMP_BINARY_OPI(short)
    … …  
    21542154    //
    21552155    template<unsigned int Precision>
    2156     const bool operator==(const campf<Precision>& lhs, const campf<Precision>& rhs)
     2156    bool operator==(const campf<Precision>& lhs, const campf<Precision>& rhs)
    21572157    { return lhs.x==rhs.x && lhs.y==rhs.y; }
    21582158
    21592159    template<unsigned int Precision>
    2160     const bool operator!=(const campf<Precision>& lhs, const campf<Precision>& rhs)
     2160    bool operator!=(const campf<Precision>& lhs, const campf<Precision>& rhs)
    21612161    { return lhs.x!=rhs.x || lhs.y!=rhs.y; }
    21622162
    … …  
    26922692        amp::ampf<Precision> t;
    26932693        int i;
    2694         int vm;
    2695 
    26962694
    26972695        if( tau==0 || n1>n2 || m1>m2 )
    … …  
    27032701        // w := C' * v
    27042702        //
    2705         vm = m2-m1+1;
    27062703        for(i=n1; i<=n2; i++)
    27072704        {
    … …  
    66016598        ap::template_1d_array< amp::ampf<Precision> > ctemp;
    66026599        ap::template_1d_array< amp::ampf<Precision> > etemp;
    6603         bool rightside;
    66046600        bool fwddir;
    66056601        amp::ampf<Precision> tmp;
    … …  
    66446640        ctemp.setbounds(cstart, cend);
    66456641        maxitr = 12;
    6646         rightside = true;
    66476642        fwddir = true;
    66486643
Note: See TracChangeset for help on using the changeset viewer.