Changeset 19addd1 in git for gfanlib/gfanlib_vector.h

Timestamp:

Oct 25, 2013, 6:22:01 PM (10 years ago)

Author:

Yue Ren <ren@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

69b2c1754cbeecd7c1b844e71e2101e1b3794062

Parents:

b7b2c516034df879b01c7c8666bbdf0928da91dc

git-author:

Yue Ren <ren@mathematik.uni-kl.de>2013-10-25 18:22:01+02:00

git-committer:

Yue Ren <ren@mathematik.uni-kl.de>2013-10-25 18:25:28+02:00

Message:

fix: warnings

File:

• gfanlib/gfanlib_vector.h (modified) (7 diffs)

gfanlib/gfanlib_vector.h

@@ -101 +101 @@
       if(size()<b.size())return true;
       if(size()>b.size())return false;
-      for(int i=0;i<size();i++)
+      for(unsigned i=0;i<size();i++)
         {
           if(v[i]<b[i])return true;
@@ -156 +156 @@
       return pq*pq==pp*qq;
 */
-          int n=p.size();
+          unsigned n=p.size();
           assert(n==q.size());
-          int i;
+          unsigned i;
           for(i=0;i<n;i++)
           {
@@ -167 +167 @@
           typ a=p.v[i];
           typ b=q.v[i];
-          for(int j=0;j<n;j++)
+          for(unsigned j=0;j<n;j++)
             if(a*q.v[j]!=b*p.v[j])return false;
           return true;
@@ -175 +175 @@
   // Arithmetic slow
   //-----------------
-  inline friend Vector operator*(typ s, const Vector& q){Vector p=q;for(int i=0;i<q.size();i++)p[i]*=s;return p;}
+  inline friend Vector operator*(typ s, const Vector& q){Vector p=q;for(unsigned i=0;i<q.size();i++)p[i]*=s;return p;}
 //  inline friend Vektor operator/(const Vektor& q, typ s){Vektor p=q;for(int i=0;i<q.size();i++)p[i]/=s;return p;}
 /*  inline friend Vector operator*(const Vektor& p, const Vektor& q){assert(p.size()==q.size());Vektor p1=p;for(int i=0;i<p.size();i++)p1.v[i]*=q.v[i];return p1;}
@@ -181 +181 @@
 */
   inline friend Vector operator/(const Vector& p, typ const &s){Vector ret(p.size());for(unsigned i=0;i<p.size();i++)ret[i]=p[i]/s;return ret;}
-  inline friend Vector operator+(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(int i=0;i<p.size();i++)p1[i]+=q[i];return p1;}
-  inline friend Vector operator-(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(int i=0;i<p.size();i++)p1[i]-=q[i];return p1;}
-  inline friend Vector max(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(int i=0;i<p.size();i++)if(p1[i]<q[i])p1[i]=q[i];return p1;}
-  inline friend Vector min(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(int i=0;i<p.size();i++)if(p1[i]>q[i])p1[i]=q[i];return p1;}
+  inline friend Vector operator+(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(unsigned i=0;i<p.size();i++)p1[i]+=q[i];return p1;}
+  inline friend Vector operator-(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(unsigned i=0;i<p.size();i++)p1[i]-=q[i];return p1;}
+  inline friend Vector max(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(unsigned i=0;i<p.size();i++)if(p1[i]<q[i])p1[i]=q[i];return p1;}
+  inline friend Vector min(const Vector& p, const Vector& q){assert(p.size()==q.size());Vector p1=p;for(unsigned i=0;i<p.size();i++)if(p1[i]>q[i])p1[i]=q[i];return p1;}
 
   friend Vector operator-(const Vector &b)
   {
     Vector ret(b.size());
-    for(int i=0;i<b.size();i++)ret[i]=-b[i];
+    for(unsigned i=0;i<b.size();i++)ret[i]=-b[i];
     return ret;
   }
@@ -226 +226 @@
     {
       assert(begin>=0);
-      assert(end<=size());
+      assert(end<=(int)size());
       assert(end>=begin);
       Vector ret(end-begin);
@@ -293 +293 @@
     typ temp1,temp2;
     typ ret(1);
-    for(int i=0;i<size();i++)
+    for(unsigned i=0;i<size();i++)
       ret=typ::gcd(ret,v[i],temp1,temp2);
     return ret;