fixing vec/mat conversions

Author: JohnCremona

libsrc/eclib/matrix.h

@@ -86,10 +86,19 @@
 #undef smat
 #undef smat_elim
 
-mat_m to_mat_m(const mat_i& v);
-mat_m to_mat_m(const mat_l& v);
-mat_i to_mat_i(const mat_m& v);
-mat_l to_mat_l(const mat_m& v);
+// conversions between matrices of different scalar types
+
+mat_m to_mat_m(const mat_i& m);
+mat_m to_mat_m(const mat_l& m);
+inline mat_m to_mat_m(const mat_m& m) {return m;}
+
+mat_i to_mat_i(const mat_m& m);
+mat_i to_mat_i(const mat_l& m);
+inline mat_i to_mat_i(const mat_i& m) {return m;}
+
+mat_l to_mat_l(const mat_m& m);
+mat_l to_mat_l(const mat_m& m);
+inline mat_l to_mat_l(const mat_l& m) {return m;}
 
 #endif
 

libsrc/eclib/splitbase.h

@@ -53,11 +53,11 @@ class splitter_base {
 public: 
   virtual mat opmat(int,int,int=0) = 0;
   virtual vec opmat_col(int i, int j, int verb=0) = 0;
-  virtual mat opmat_cols(int i, const vec& jlist, int verb=0) = 0;
+  virtual mat opmat_cols(int i, const vec_i& jlist, int verb=0) = 0;
   virtual mat opmat_restricted(int,const subspace& s, int,int=0) = 0;
   virtual smat s_opmat(int,int,int=0) = 0;
   virtual svec s_opmat_col(int i, int j, int verb=0) = 0;
-  virtual smat s_opmat_cols(int i, const vec& jlist, int verb=0) = 0;
+  virtual smat s_opmat_cols(int i, const vec_i& jlist, int verb=0) = 0;
   virtual smat s_opmat_restricted(int,const ssubspace& s, int, int=0) = 0;
   virtual long matdim(void) = 0;
   virtual scalar matden(void) = 0;

libsrc/eclib/vector.h

@@ -95,9 +95,18 @@ class subspace_i; class subspace_l; class subspace_m;
 #undef smat
 #undef smat_elim
 
+// conversions between vectors of different scalar types
+
 vec_m to_vec_m(const vec_i& v);
 vec_m to_vec_m(const vec_l& v);
-vec_i to_vec_i(const vec_m& v);
+inline vec_m to_vec_m(const vec_m& v) {return v;}
+
+vec_l to_vec_l(const vec_i& v);
+inline vec_l to_vec_l(const vec_l& v) {return v;}
 vec_l to_vec_l(const vec_m& v);
 
+inline vec_i to_vec_i(const vec_i& v) {return v;}
+vec_i to_vec_i(const vec_l& v);
+vec_i to_vec_i(const vec_m& v);
+
 #endif

libsrc/matrix.cc

@@ -94,6 +94,15 @@ mat_i to_mat_i(const mat_m& m)
   return mat_i(m.nrows(), m.ncols(), n);
 }
 
+mat_i to_mat_i(const mat_l& m)
+{
+  const vector<long> & mij = m.get_entries();
+  auto toint = [](const long& a) {return int(a);};
+  vector<int> n(mij.size());
+  std::transform(mij.begin(), mij.end(), n.begin(), toint);
+  return mat_i(m.nrows(), m.ncols(), n);
+}
+
 mat_l to_mat_l(const mat_m& m)
 {
   const vector<bigint> & mij = m.get_entries();
@@ -102,3 +111,12 @@ mat_l to_mat_l(const mat_m& m)
   std::transform(mij.begin(), mij.end(), n.begin(), tolong);
   return mat_l(m.nrows(), m.ncols(), n);
 }
+
+mat_l to_mat_l(const mat_i& m)
+{
+  const vector<int> & mij = m.get_entries();
+  auto tolong = [](const int& a) {return long(a);};
+  vector<long> n(mij.size());
+  std::transform(mij.begin(), mij.end(), n.begin(), tolong);
+  return mat_l(m.nrows(), m.ncols(), n);
+}

libsrc/mrank1.cc

@@ -81,39 +81,39 @@ int xsqrt(bigfloat a, bigfloat &b)
 
 vector<long> rank1::qeps(const quartic& q, int x2)
 {
-  vector<long> vec(num_aux);  // position 0 is not used
-  long i; vec[0]=0;
+  vector<long> v(num_aux);  // position 0 is not used
+  long i; v[0]=0;
   for(i=1; i<num_aux; i++)
     {
       long a = posmod(q.geta(),auxs[i]);
       long H = posmod(q.getH(),auxs[i]);
       if(x2) H=posmod(hscalemod[i]*H,auxs[i]);
-      vec[i] = flags[i][a][H];
+      v[i] = flags[i][a][H];
     }
-  return vec;
+  return v;
 }
 
-void rank1::show_eps_vec(const vector<long>& vec)
+void rank1::show_eps_vec(const vector<long>& v)
 {
   long i;
   cout<<"(";
   for(i=1; i<num_aux; i++) {
     if(i>1) cout<<":";
     if(aux_types[i]==1)
-      switch(vec[i]) {
+      switch(v[i]) {
       case 15: cout<<"0"; break;
       case  5: cout<<"1"; break;
       default: cout<<"?";
     }
     else
-      switch(vec[i]) {
+      switch(v[i]) {
       case 15: cout<<"00"; break;
       case  5: cout<<"01"; break;
       case  3: cout<<"10"; break;
       case  1: cout<<"11"; break;
       default: cout<<"??";
     }
-    //    cout<<"("<<vec[i]<<")";
+    //    cout<<"("<<v[i]<<")";
   }
   cout<<")";
 }

libsrc/vector.cc

@@ -97,6 +97,15 @@ vec_i to_vec_i(const vec_m& v)
   return vec_i(w);
 }
 
+vec_i to_vec_i(const vec_l& v)
+{
+  const vector<long> & vi = v.get_entries();
+  auto toint = [](const long& a) {return int(a);};
+  vector<int> w(vi.size());
+  std::transform(vi.begin(), vi.end(), w.begin(), toint);
+  return vec_i(w);
+}
+
 vec_l to_vec_l(const vec_m& v)
 {
   const vector<bigint> & vi = v.get_entries();
@@ -105,3 +114,12 @@ vec_l to_vec_l(const vec_m& v)
   std::transform(vi.begin(), vi.end(), w.begin(), tolong);
   return vec_l(w);
 }
+
+vec_l to_vec_l(const vec_i& v)
+{
+  const vector<int> & vi = v.get_entries();
+  auto tolong = [](const int& a) {return long(a);};
+  vector<long> w(vi.size());
+  std::transform(vi.begin(), vi.end(), w.begin(), tolong);
+  return vec_l(w);
+}