fixing param names; removing generic; renaming apps

gunrock · Nov 20, 2020 · 8db0533 · 8db0533
1 parent 9533cdc
commit 8db0533
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 116 deletions.
diff --git a/examples/color/color.cu b/examples/color/color.cu
@@ -1,7 +1,7 @@
 #include <cstdlib>  // EXIT_SUCCESS
 #include <set>
 
-#include <gunrock/applications/color/color_implementation.hxx>
+#include <gunrock/applications/color.hxx>
 
 using namespace gunrock;
 using namespace memory;

diff --git a/examples/generic/Makefile b/examples/generic/Makefile
diff --git a/examples/generic/generic.cu b/examples/generic/generic.cu
diff --git a/examples/sssp/sssp.cu b/examples/sssp/sssp.cu
@@ -1,6 +1,6 @@
 #include <cstdlib>  // EXIT_SUCCESS
 
-#include <gunrock/applications/sssp/sssp_implementation.hxx>
+#include <gunrock/applications/sssp.hxx>
 
 using namespace gunrock;
 using namespace memory;

diff --git a/...plications/color/color_implementation.hxx → gunrock/applications/color.hxx b/...plications/color/color_implementation.hxx → gunrock/applications/color.hxx
diff --git a/...applications/sssp/sssp_implementation.hxx → gunrock/applications/sssp.hxx b/...applications/sssp/sssp_implementation.hxx → gunrock/applications/sssp.hxx
@@ -25,9 +25,9 @@ struct param_t {
    vertex_t single_source;
 
    param_t(
-     vertex_t single_source_
+     vertex_t _single_source
    ) :
-    single_source(single_source_) {}
+    single_source(_single_source) {}
 };
 
 template <typename meta_t>
@@ -39,11 +39,11 @@ struct result_t {
   vertex_t* predecessors;
 
   result_t(
-    weight_t* distances_,
-    vertex_t* predecessors_
+    weight_t* _distances,
+    vertex_t* _predecessors
   ) :
-    distances(distances_),
-    predecessors(predecessors_) {}
+    distances(_distances),
+    predecessors(_predecessors) {}
 };
 
 template <typename graph_t, typename meta_t, typename param_t, typename result_t>

diff --git a/gunrock/framework/problem.hxx b/gunrock/framework/problem.hxx
@@ -43,14 +43,14 @@ struct problem_t {
   problem_t(
     graph_t* G,
     meta_t* meta,
-    param_t* param_,
-    result_t* result_,
+    param_t* _param,
+    result_t* _result,
     std::shared_ptr<cuda::multi_context_t> _context
   ) : 
     graph_slice(G),
-    meta_slice(meta),  
-    param(param_), 
-    result(result_),
+    meta_slice(meta),
+    param(_param), 
+    result(_result),
     context(_context) { }
 
   // Disable copy ctor and assignment operator.