for consistency, makeprimitive --> make_primitive everywhere

Author: JohnCremona

libsrc/eclib/mat.h

@@ -63,7 +63,7 @@ friend class smat_elim;
   scalar content() const;
   scalar row_content(long r) const;
   void clearrow(long r);
-  void makeprimitive();
+  void make_primitive();
   void operator+=(const mat&);
   void operator-=(const mat&);
   void operator*=(const scalar&);

libsrc/eclib/vec.h

@@ -102,7 +102,7 @@ vec addmodp(const vec&, const vec&, const scalar&);
 vec operator-(const vec&, const vec&);
 inline vec operator*(const scalar&, const vec&);       // componentwise
 vec operator/(const vec&, const scalar&);       // componentwise
-void makeprimitive(vec& v);
+void make_primitive(vec& v);
 void elim(const vec& a, vec& b, long pos);
 void elim1(const vec& a, vec& b, long pos);
 void elim2(const vec& a, vec& b, long pos, const scalar& lastpivot);
@@ -140,14 +140,14 @@ inline vec operator*(const scalar& scal, const vec& v)
 inline vec operator/(const vec& v, const scalar& scal)
 { vec w(v); w/=scal; return w;}
 
-inline void makeprimitive(vec& v)
+inline void make_primitive(vec& v)
 { scalar g=content(v); if (g>1) v/=g;}
 
 inline void elim(const vec& a, vec& b, long pos)
 { (b*=a[pos])-=(b[pos]*a);}
 
 inline void elim1(const vec& a, vec& b, long pos)
-{ (b*=a[pos])-=(b[pos]*a); makeprimitive(b);}
+{ (b*=a[pos])-=(b[pos]*a); make_primitive(b);}
 
 inline void elim2(const vec& a, vec& b, long pos, const scalar& lastpivot)
 { ((b*=a[pos])-=(b[pos]*a))/=lastpivot;}

libsrc/mat.cc

@@ -163,7 +163,7 @@ void mat::clearrow(long r)
   divrow(r, row_content(r));
 }
 
-void mat::makeprimitive()
+void mat::make_primitive()
 {
   scalar g = content();
   if (is_zero(g)||is_one(g)) return;

libsrc/vec.cc

@@ -231,7 +231,7 @@ vec express(const vec& v, const vec& v1, const vec& v2)
    scalar vv1 = v * v1;
    scalar vv2 = v * v2;
    vec ans({vv1*v2v2 - vv2*v1v2,  vv2*v1v1 - vv1*v1v2, v1v1*v2v2 - v1v2*v1v2});
-   makeprimitive(ans);
+   make_primitive(ans);
    if (ans[3]*v!=ans[1]*v1+ans[2]*v2)
      cerr << "Error in express: v is not in <v1,v2>"<<endl;
    return ans;

libsrc/xsplit.cc

@@ -360,7 +360,7 @@ vec lift(const vec& v)
   else
     cout << "Unable to lift eigenvector from mod " << MODULUS << endl;
 #else
-  makeprimitive(b);
+  make_primitive(b);
 #endif
 #ifdef MULTI
   scalar n=0; // dummy variable to gt the right type in next line

tests/in_no_ntl/mattest1.in

@@ -1 +1 @@
-2 1 2 3 4 1 1 1 1 1 1 1 1 1 1 1 1 0
+2 1 2 3 4 1 1 1 1 1 1 1 1 1 1 1 0

tests/mvectest.cc

@@ -99,8 +99,8 @@ int main(void)
  cout << "Slice = " << v.slice(j,k) << endl;
  cout << "Now v = " << v << endl;
  cout << "w = " << w << "; content(w) = " << content(w) << endl;
- makeprimitive(w);
- cout << "After makeprimitive(w), w = " << w << endl;
+ make_primitive(w);
+ cout << "After make_primitive(w), w = " << w << endl;
 
  vec sv = to_vec_i(v);
  cout << "v shortened to a vector of ints: " << sv << endl;

tests/out_no_ntl/mattest1.out

@@ -12,12 +12,6 @@ Using A.output_pari(cout):
 Using A.output_pretty(cout): 
 [1 2]
 [3 4]
-Enter a filename for matrix binary output: Matrix dumped to file 1
-Matrix reread from file 1
-B = 
-[[1,2],
-[3,4]]
-agree
 Enter any number Creating an array of 3 matrices
  A=
 [[1,2],

tests/out_no_ntl/mvectest.out

@@ -47,7 +47,7 @@ Now v = [1,2,3,4,5,4,3,2,1,10]
 General slice; beginning, end? Slice = [4,3,2,1,10]
 Now v = [1,2,3,4,5,4,3,2,1,10]
 w = [2,4,6,8,10,8,6,4,2,0]; content(w) = 2
-After makeprimitive(w), w = [1,2,3,4,5,4,3,2,1,0]
+After make_primitive(w), w = [1,2,3,4,5,4,3,2,1,0]
 v shortened to a vector of ints: [1,2,3,4,5,4,3,2,1,10]
 u = [0,0,0,0,0,0,0,0,0,0]
 After swapvec(u,v):

tests/out_no_ntl/vectest1.out

@@ -39,7 +39,7 @@ Now v = [1]
 General slice; beginning, end? Slice = [1]
 Now v = [1]
 w = [2]; content(w) = 2
-After makeprimitive(w), w = [1]
+After make_primitive(w), w = [1]
 u = [0]
 After swapvec(u,v):
 u = [1]