Remove more global using namespace decls

cpp/tests/trajectory/traj_util.cpp

@@ -3,15 +3,13 @@
 #include <utility/utility.hpp>
 #include "traj_util.h"
 
-using namespace cuspatial;
-
 /**
- * @brief retrive camera origin at a particular intersection from a configuration file
- *
+ * @brief retrieve camera origin at a particular intersection from a
+ * configuration file
  *
+ * @todo: don't return inscrutable error codes; throw helpful exceptions
  * @return negative error code; 0 for success
  */
-
 int get_camera_origin(const char *df_fn, const char * inter_name, location_3d<double> & camera_origin)
 {
     const int num_col=39;

cpp/tests/trajectory/trajectory_derive_toy.cu

@@ -32,93 +32,91 @@
 #include <tests/utilities/cudf_test_utils.cuh>
 #include <tests/utilities/cudf_test_fixtures.h>
 
-using namespace cuspatial;
-
 struct TrajectoryDeriveToy : public GdfTest 
 {
 };   
 
 TEST_F(TrajectoryDeriveToy, trajectoryderivetest)
 {
-  //three sorted trajectories with 5,4,3 points, respectively
-  std::cout<<"in TrajectoryDeriveToy"<<std::endl;
-  double point_x[]={1.0,2.0,3.0,5.0,7.0,1.0,2.0,3.0,6.0,0.0,3.0,6.0};
-  double point_y[]={0.0,1.0,2.0,3.0,1.0,3.0,5.0,6.0,5.0,4.0,7.0,4.0};
-  uint32_t point_id[]={0,0,0,0,0,1,1,1,1,2,2,2};
-
-  //handling timestamps - use millsecond field only for now 
-  int point_ms[]={1,2,3,4,5,1,2,3,4,1,2,3};
-  size_t num_point=sizeof(point_x)/sizeof(double);
-  std::cout<<"num_point="<<num_point<<std::endl;
-
-  std::vector<its_timestamp> point_ts;
-  for(size_t i=0;i<num_point;i++)
-  {
-  	its_timestamp ts;
-  	memset(&ts,0,sizeof(its_timestamp));
-  	ts.ms=point_ms[i];	
-  	point_ts.push_back(ts);
-  }
-
-  //randomize points 
-  uint32_t seq[]={11,9,4,5,2,7,10,1,3,8,0,6};
-  std::vector<double> rand_x;
-  std::vector<double> rand_y;
-  std::vector<uint32_t> rand_id;
-  std::vector<its_timestamp> rand_ts;
-
+    //three sorted trajectories with 5,4,3 points, respectively
+    std::cout<<"in TrajectoryDeriveToy"<<std::endl;
+    double point_x[]={1.0,2.0,3.0,5.0,7.0,1.0,2.0,3.0,6.0,0.0,3.0,6.0};
+    double point_y[]={0.0,1.0,2.0,3.0,1.0,3.0,5.0,6.0,5.0,4.0,7.0,4.0};
+    uint32_t point_id[]={0,0,0,0,0,1,1,1,1,2,2,2};
 
-  for(size_t i=0;i<num_point;i++)
-  {
-  	rand_x.push_back(point_x[seq[i]]);
-  	rand_y.push_back(point_y[seq[i]]);
-  	rand_id.push_back(point_id[seq[i]]);
-  	rand_ts.push_back(point_ts[seq[i]]);
-  }
-  //std::copy(rand_ts.begin(),rand_ts.end(),std::ostream_iterator<its_timestamp>(std::cout, " "));std::cout<<std::endl;
-
-  cudf::test::column_wrapper<double> point_x_wrapp{rand_x};
-  cudf::test::column_wrapper<double> point_y_wrapp{rand_y};
-  cudf::test::column_wrapper<uint32_t> point_id_wrapp{rand_id};
-  cudf::test::column_wrapper<its_timestamp> point_ts_wrapp{rand_ts};
+    //handling timestamps - use millsecond field only for now 
+    int point_ms[]={1,2,3,4,5,1,2,3,4,1,2,3};
+    size_t num_point=sizeof(point_x)/sizeof(double);
+    std::cout<<"num_point="<<num_point<<std::endl;
 
-  gdf_column traj_id,traj_len,traj_offset;
-  memset(&traj_id,0,sizeof(gdf_column));
-  memset(&traj_len,0,sizeof(gdf_column));
-  memset(&traj_offset,0,sizeof(gdf_column));
-  gdf_column pnt_x=*(point_x_wrapp.get());
-  gdf_column pnt_y=*(point_y_wrapp.get());
-  gdf_column pnt_id=*(point_id_wrapp.get());
-  gdf_column pnt_ts=*(point_ts_wrapp.get()); 
-
-  std::cout<<"calling cuspatial::derive_trajectory"<<std::endl;
-  uint32_t num_traj=cuspatial::derive_trajectories(pnt_x,pnt_y,pnt_id,pnt_ts,traj_id,traj_len,traj_offset);
-
-  std::cout<<"point data after sorting"<<std::endl; 
-  thrust::device_ptr<double> pnt_x_ptr=thrust::device_pointer_cast(static_cast<double*>(pnt_x.data));
-  thrust::device_ptr<double> pnt_y_ptr=thrust::device_pointer_cast(static_cast<double*>(pnt_y.data));
-  thrust::device_ptr<uint32_t> pnt_id_ptr=thrust::device_pointer_cast(static_cast<uint32_t*>(pnt_id.data));
-  thrust::device_ptr<its_timestamp> pnt_ts_ptr=thrust::device_pointer_cast(static_cast<its_timestamp*>(pnt_ts.data));
-
-  int num_print = (pnt_x.size<20)?pnt_x.size:20;  
-  std::cout<<"x"<<std::endl;
-  thrust::copy(pnt_x_ptr,pnt_x_ptr+num_print,std::ostream_iterator<double>(std::cout, " "));std::cout<<std::endl;  
-  std::cout<<"y"<<std::endl;
-  thrust::copy(pnt_y_ptr,pnt_y_ptr+num_print,std::ostream_iterator<double>(std::cout, " "));std::cout<<std::endl;  
-  std::cout<<"id"<<std::endl;
-  thrust::copy(pnt_id_ptr,pnt_id_ptr+num_print,std::ostream_iterator<uint32_t>(std::cout, " "));std::cout<<std::endl;  
-  std::cout<<"timestamp"<<std::endl;
-  thrust::copy(pnt_ts_ptr,pnt_ts_ptr+num_print,std::ostream_iterator<its_timestamp>(std::cout, " "));std::cout<<std::endl;
+    std::vector<cuspatial::its_timestamp> point_ts;
+    for(size_t i=0;i<num_point;i++)
+    {
+        cuspatial::its_timestamp ts;
+        memset(&ts,0,sizeof(cuspatial::its_timestamp));
+        ts.ms=point_ms[i];	
+        point_ts.push_back(ts);
+    }
+
+    //randomize points 
+    uint32_t seq[]={11,9,4,5,2,7,10,1,3,8,0,6};
+    std::vector<double> rand_x;
+    std::vector<double> rand_y;
+    std::vector<uint32_t> rand_id;
+    std::vector<cuspatial::its_timestamp> rand_ts;
+
+    for(size_t i=0;i<num_point;i++)
+    {
+        rand_x.push_back(point_x[seq[i]]);
+        rand_y.push_back(point_y[seq[i]]);
+        rand_id.push_back(point_id[seq[i]]);
+        rand_ts.push_back(point_ts[seq[i]]);
+    }
+    //std::copy(rand_ts.begin(),rand_ts.end(),std::ostream_iterator<its_timestamp>(std::cout, " "));std::cout<<std::endl;
 
-  std::cout<<"derived trajectories"<<std::endl;
-  num_print = (num_traj<10)?num_traj:10;  
-  thrust::device_ptr<uint32_t> traj_id_ptr=thrust::device_pointer_cast(static_cast<uint32_t*>(traj_id.data));
-  thrust::device_ptr<uint32_t> traj_len_ptr=thrust::device_pointer_cast(static_cast<uint32_t*>(traj_len.data));
-  thrust::device_ptr<uint32_t> traj_offset_ptr=thrust::device_pointer_cast(static_cast<uint32_t*>(traj_offset.data));
-  std::cout<<"ids of trajectories"<<std::endl;
-  thrust::copy(traj_id_ptr,traj_id_ptr+num_print,std::ostream_iterator<uint32_t>(std::cout, " "));std::cout<<std::endl; 
-  std::cout<<"#of points of trajectories"<<std::endl;
-  thrust::copy(traj_len_ptr,traj_len_ptr+num_print,std::ostream_iterator<uint32_t>(std::cout, " "));std::cout<<std::endl; 
-  std::cout<<"poisition indices on sorted point x/y array of trajectories"<<std::endl; 
-  thrust::copy(traj_offset_ptr,traj_offset_ptr+num_print,std::ostream_iterator<uint32_t>(std::cout, " "));std::cout<<std::endl;  
+    cudf::test::column_wrapper<double> point_x_wrapp{rand_x};
+    cudf::test::column_wrapper<double> point_y_wrapp{rand_y};
+    cudf::test::column_wrapper<uint32_t> point_id_wrapp{rand_id};
+    cudf::test::column_wrapper<cuspatial::its_timestamp> point_ts_wrapp{rand_ts};
+
+    gdf_column traj_id,traj_len,traj_offset;
+    memset(&traj_id,0,sizeof(gdf_column));
+    memset(&traj_len,0,sizeof(gdf_column));
+    memset(&traj_offset,0,sizeof(gdf_column));
+    gdf_column pnt_x=*(point_x_wrapp.get());
+    gdf_column pnt_y=*(point_y_wrapp.get());
+    gdf_column pnt_id=*(point_id_wrapp.get());
+    gdf_column pnt_ts=*(point_ts_wrapp.get()); 
+
+    std::cout<<"calling cuspatial::derive_trajectory"<<std::endl;
+    uint32_t num_traj=cuspatial::derive_trajectories(pnt_x,pnt_y,pnt_id,pnt_ts,traj_id,traj_len,traj_offset);
+
+    std::cout<<"point data after sorting"<<std::endl; 
+    thrust::device_ptr<double> pnt_x_ptr=thrust::device_pointer_cast(static_cast<double*>(pnt_x.data));
+    thrust::device_ptr<double> pnt_y_ptr=thrust::device_pointer_cast(static_cast<double*>(pnt_y.data));
+    thrust::device_ptr<uint32_t> pnt_id_ptr=thrust::device_pointer_cast(static_cast<uint32_t*>(pnt_id.data));
+    thrust::device_ptr<cuspatial::its_timestamp> pnt_ts_ptr =
+        thrust::device_pointer_cast(static_cast<cuspatial::its_timestamp*>(pnt_ts.data));
+
+    int num_print = (pnt_x.size<20)?pnt_x.size:20;  
+    std::cout<<"x"<<std::endl;
+    thrust::copy(pnt_x_ptr,pnt_x_ptr+num_print,std::ostream_iterator<double>(std::cout, " "));std::cout<<std::endl;  
+    std::cout<<"y"<<std::endl;
+    thrust::copy(pnt_y_ptr,pnt_y_ptr+num_print,std::ostream_iterator<double>(std::cout, " "));std::cout<<std::endl;  
+    std::cout<<"id"<<std::endl;
+    thrust::copy(pnt_id_ptr,pnt_id_ptr+num_print,std::ostream_iterator<uint32_t>(std::cout, " "));std::cout<<std::endl;  
+    std::cout<<"timestamp"<<std::endl;
+    thrust::copy(pnt_ts_ptr,pnt_ts_ptr+num_print,std::ostream_iterator<cuspatial::its_timestamp>(std::cout, " "));std::cout<<std::endl;
+
+    std::cout<<"derived trajectories"<<std::endl;
+    num_print = (num_traj<10)?num_traj:10;  
+    thrust::device_ptr<uint32_t> traj_id_ptr=thrust::device_pointer_cast(static_cast<uint32_t*>(traj_id.data));
+    thrust::device_ptr<uint32_t> traj_len_ptr=thrust::device_pointer_cast(static_cast<uint32_t*>(traj_len.data));
+    thrust::device_ptr<uint32_t> traj_offset_ptr=thrust::device_pointer_cast(static_cast<uint32_t*>(traj_offset.data));
+    std::cout<<"ids of trajectories"<<std::endl;
+    thrust::copy(traj_id_ptr,traj_id_ptr+num_print,std::ostream_iterator<uint32_t>(std::cout, " "));std::cout<<std::endl; 
+    std::cout<<"#of points of trajectories"<<std::endl;
+    thrust::copy(traj_len_ptr,traj_len_ptr+num_print,std::ostream_iterator<uint32_t>(std::cout, " "));std::cout<<std::endl; 
+    std::cout<<"poisition indices on sorted point x/y array of trajectories"<<std::endl; 
+    thrust::copy(traj_offset_ptr,traj_offset_ptr+num_print,std::ostream_iterator<uint32_t>(std::cout, " "));std::cout<<std::endl;  
 }

cpp/tests/trajectory/trajectory_distance_speed_toy.cu

@@ -32,63 +32,61 @@
 #include <tests/utilities/cudf_test_utils.cuh>
 #include <tests/utilities/cudf_test_fixtures.h>
 
-using namespace cuspatial;
-
 struct TrajectoryDeriveToy : public GdfTest 
 {
 };   
 
 TEST_F(TrajectoryDeriveToy, trajectoryderivetest)
 {
-  //three sorted trajectories with 5,4,3 points, respectively
-  std::cout<<"in TrajectoryDeriveToy"<<std::endl;
-  //assuming x/y are in the unit of killometers (km); 
-  //computed distance and speed are in the units of meters and m/s, respectively
-  double point_x[]={1.0,2.0,3.0,5.0,7.0,1.0,2.0,3.0,6.0,0.0,3.0,6.0};
-  double point_y[]={0.0,1.0,2.0,3.0,1.0,3.0,5.0,6.0,5.0,4.0,7.0,4.0};
-  uint32_t traj_len[]={5,4,3};
-  uint32_t traj_offset[]={5,9,12};
-
-  //handling timestamps - use millsecond field only for now 
-  int point_hh[]={0,1,2,3,4,0,1,2,3,0,1,2};
-  int point_ms[]={1,2,3,4,5,1,2,3,4,1,2,3};
-  int num_point=sizeof(point_x)/sizeof(double);
-  int num_traj=sizeof(traj_len)/sizeof(uint32_t);
-  std::cout<<"num_point="<<num_point<<"   num_traj="<<num_traj<<std::endl;
-
-  std::vector<its_timestamp> point_ts;
-  for(int i=0;i<num_point;i++)
-  {
-  	its_timestamp ts;
-  	memset(&ts,0,sizeof(its_timestamp));
-  	ts.hh=point_hh[i];
-  	ts.ms=point_ms[i];	
-  	point_ts.push_back(ts);
-  }
-
-  cudf::test::column_wrapper<double> point_x_wrapp{std::vector<double>(point_x,point_x+num_point)};
-  cudf::test::column_wrapper<double> point_y_wrapp{std::vector<double>(point_y,point_y+num_point)};
-  cudf::test::column_wrapper<its_timestamp> point_ts_wrapp{point_ts};
-  cudf::test::column_wrapper<uint32_t> traj_len_wrapp{std::vector<uint32_t>(traj_len,traj_len+num_traj)};
-  cudf::test::column_wrapper<uint32_t> traj_pos_wrapp{std::vector<uint32_t>(traj_offset,traj_offset+num_traj)};
+    //three sorted trajectories with 5,4,3 points, respectively
+    std::cout<<"in TrajectoryDeriveToy"<<std::endl;
+    //assuming x/y are in the unit of killometers (km); 
+    //computed distance and speed are in the units of meters and m/s, respectively
+    double point_x[]={1.0,2.0,3.0,5.0,7.0,1.0,2.0,3.0,6.0,0.0,3.0,6.0};
+    double point_y[]={0.0,1.0,2.0,3.0,1.0,3.0,5.0,6.0,5.0,4.0,7.0,4.0};
+    uint32_t traj_len[]={5,4,3};
+    uint32_t traj_offset[]={5,9,12};
+
+    //handling timestamps - use millsecond field only for now 
+    int point_hh[]={0,1,2,3,4,0,1,2,3,0,1,2};
+    int point_ms[]={1,2,3,4,5,1,2,3,4,1,2,3};
+    int num_point=sizeof(point_x)/sizeof(double);
+    int num_traj=sizeof(traj_len)/sizeof(uint32_t);
+    std::cout<<"num_point="<<num_point<<"   num_traj="<<num_traj<<std::endl;
+
+    std::vector<cuspatial::its_timestamp> point_ts;
+    for(int i=0;i<num_point;i++)
+    {
+        cuspatial::its_timestamp ts;
+        memset(&ts,0,sizeof(cuspatial::its_timestamp));
+        ts.hh=point_hh[i];
+        ts.ms=point_ms[i];	
+        point_ts.push_back(ts);
+    }
+
+    cudf::test::column_wrapper<double> point_x_wrapp{std::vector<double>(point_x,point_x+num_point)};
+    cudf::test::column_wrapper<double> point_y_wrapp{std::vector<double>(point_y,point_y+num_point)};
+    cudf::test::column_wrapper<cuspatial::its_timestamp> point_ts_wrapp{point_ts};
+    cudf::test::column_wrapper<uint32_t> traj_len_wrapp{std::vector<uint32_t>(traj_len,traj_len+num_traj)};
+    cudf::test::column_wrapper<uint32_t> traj_pos_wrapp{std::vector<uint32_t>(traj_offset,traj_offset+num_traj)};
+
+    std::cout<<"calling cuspatial::trajectory_distance_and_speed"<<std::endl;
+    std::pair<gdf_column,gdf_column> dist_speed_pair=
+    cuspatial::trajectory_distance_and_speed(*(point_x_wrapp.get()),*(point_y_wrapp.get()),
+    *(point_ts_wrapp.get()),*(traj_len_wrapp.get()),*(traj_pos_wrapp.get()));
+
+    CUDF_EXPECTS(num_traj==dist_speed_pair.first.size && num_traj==dist_speed_pair.second.size,
+        "size of output dist/speed columns should be the same as the number of the input trajectories");
 
-  std::cout<<"calling cuspatial::trajectory_distance_and_speed"<<std::endl;
-  std::pair<gdf_column,gdf_column> dist_speed_pair=
-  	cuspatial::trajectory_distance_and_speed(*(point_x_wrapp.get()),*(point_y_wrapp.get()),
-  	*(point_ts_wrapp.get()),*(traj_len_wrapp.get()),*(traj_pos_wrapp.get()));
-
-  CUDF_EXPECTS(num_traj==dist_speed_pair.first.size && num_traj==dist_speed_pair.second.size,
-      "size of output dist/speed columns should be the same as the number of the input trajectories");
-
-  std::cout<<"computed distance/speed"<<std::endl;
-  int num_print = (num_traj<10)?num_traj:10;  
-  thrust::device_ptr<double> traj_distance_ptr=
-      thrust::device_pointer_cast(static_cast<double*>(dist_speed_pair.first.data));
-  thrust::device_ptr<double> traj_speed_ptr=
-      thrust::device_pointer_cast(static_cast<double*>(dist_speed_pair.second.data));
+    std::cout<<"computed distance/speed"<<std::endl;
+    int num_print = (num_traj<10)?num_traj:10;  
+    thrust::device_ptr<double> traj_distance_ptr=
+        thrust::device_pointer_cast(static_cast<double*>(dist_speed_pair.first.data));
+    thrust::device_ptr<double> traj_speed_ptr=
+        thrust::device_pointer_cast(static_cast<double*>(dist_speed_pair.second.data));
 
-  std::cout<<"computed distance (in meters):"<<std::endl;
-  thrust::copy(traj_distance_ptr,traj_distance_ptr+num_print,std::ostream_iterator<double>(std::cout, " "));std::cout<<std::endl; 
-  std::cout<<"computed speed (in m/s):"<<std::endl;
-  thrust::copy(traj_speed_ptr,traj_speed_ptr+num_print,std::ostream_iterator<double>(std::cout, " "));std::cout<<std::endl; 
+    std::cout<<"computed distance (in meters):"<<std::endl;
+    thrust::copy(traj_distance_ptr,traj_distance_ptr+num_print,std::ostream_iterator<double>(std::cout, " "));std::cout<<std::endl; 
+    std::cout<<"computed speed (in m/s):"<<std::endl;
+    thrust::copy(traj_speed_ptr,traj_speed_ptr+num_print,std::ostream_iterator<double>(std::cout, " "));std::cout<<std::endl; 
 }

cpp/tests/trajectory/trajectory_spatial_bounds_toy.cu

@@ -32,8 +32,6 @@
 #include <tests/utilities/cudf_test_utils.cuh>
 #include <tests/utilities/cudf_test_fixtures.h>
 
-using namespace cuspatial;
-
 struct TrajectoryDeriveToy : public GdfTest 
 {
 };