updates

Author: lqhl

src/conversions.cpp

@@ -116,7 +116,7 @@ void convert_adjlist(std::string inputfile, Converter *converter)
 
 void convert(std::string basefilename, Converter *converter)
 {
-    LOG(INFO) << "shuffle `" << basefilename << "'";
+    LOG(INFO) << "converting `" << basefilename << "'";
     if (basefilename.empty())
         LOG(FATAL) << "empty file name";
     if (converter->done()) {

src/dbh_partitioner.cpp

@@ -6,14 +6,11 @@
 
 DbhPartitioner::DbhPartitioner(std::string basefilename)
 {
-    if (!is_exists(binedgelist_name(basefilename))) {
-        Timer convert_timer;
-        convert_timer.start();
-        convert(basefilename, new Converter(basefilename));
-        convert_timer.stop();
-        LOG(INFO) << "convert time: " << convert_timer.get_time();
-    } else
-        LOG(INFO) << "skip conversion";
+    Timer convert_timer;
+    convert_timer.start();
+    convert(basefilename, new Converter(basefilename));
+    convert_timer.stop();
+    LOG(INFO) << "convert time: " << convert_timer.get_time();
 
     total_time.start();
     LOG(INFO) << "initializing partitioner";

src/hsfc_partitioner.cpp

@@ -10,14 +10,11 @@
 HsfcPartitioner::HsfcPartitioner(std::string basefilename)
     : basefilename(basefilename)
 {
-    if (!is_exists(binedgelist_name(basefilename))) {
-        Timer convert_timer;
-        convert_timer.start();
-        convert(basefilename, new Converter(basefilename));
-        convert_timer.stop();
-        LOG(INFO) << "convert time: " << convert_timer.get_time();
-    } else
-        LOG(INFO) << "skip conversion";
+    Timer convert_timer;
+    convert_timer.start();
+    convert(basefilename, new Converter(basefilename));
+    convert_timer.stop();
+    LOG(INFO) << "convert time: " << convert_timer.get_time();
 
     total_time.start();
     LOG(INFO) << "initializing partitioner";

src/neighbor_partitioner.cpp

@@ -5,14 +5,11 @@
 NeighborPartitioner::NeighborPartitioner(std::string basefilename)
     : basefilename(basefilename), rd(), gen(rd()), writer(basefilename)
 {
-    if (!is_exists(shuffled_binedgelist_name(basefilename))) {
-        Timer shuffle_timer;
-        shuffle_timer.start();
-        convert(basefilename, new Shuffler(basefilename));
-        shuffle_timer.stop();
-        LOG(INFO) << "shuffle time: " << shuffle_timer.get_time();
-    } else
-        LOG(INFO) << "skip shuffle";
+    Timer shuffle_timer;
+    shuffle_timer.start();
+    convert(basefilename, new Shuffler(basefilename));
+    shuffle_timer.stop();
+    LOG(INFO) << "shuffle time: " << shuffle_timer.get_time();
 
     total_time.start();
     LOG(INFO) << "initializing partitioner";

src/random_partitioner.cpp

@@ -7,14 +7,11 @@
 
 RandomPartitioner::RandomPartitioner(std::string basefilename)
 {
-    if (!is_exists(binedgelist_name(basefilename))) {
-        Timer convert_timer;
-        convert_timer.start();
-        convert(basefilename, new Converter(basefilename));
-        convert_timer.stop();
-        LOG(INFO) << "convert time: " << convert_timer.get_time();
-    } else
-        LOG(INFO) << "skip conversion";
+    Timer convert_timer;
+    convert_timer.start();
+    convert(basefilename, new Converter(basefilename));
+    convert_timer.stop();
+    LOG(INFO) << "convert time: " << convert_timer.get_time();
 
     total_time.start();
     LOG(INFO) << "initializing partitioner";

src/util.hpp

@@ -38,7 +38,7 @@ inline std::string binedgelist_name(const std::string &basefilename)
 inline std::string shuffled_binedgelist_name(const std::string &basefilename)
 {
     std::stringstream ss;
-    ss << basefilename << "shuffled.binedgelist";
+    ss << basefilename << ".shuffled.binedgelist";
     return ss.str();
 }
 inline std::string degree_name(const std::string &basefilename)
@@ -58,13 +58,13 @@ inline std::string partitioned_name(const std::string &basefilename)
 inline std::string hilbert_name(const std::string &basefilename)
 {
     std::stringstream ss;
-    ss << basefilename << ".hilbert.binedgelist";
+    ss << basefilename << ".hilbert.bin";
     return ss.str();
 }
 inline std::string sorted_hilbert_name(const std::string &basefilename)
 {
     std::stringstream ss;
-    ss << basefilename << ".sorted_hilbert.binedgelist";
+    ss << basefilename << ".sorted_hilbert.bin";
     return ss.str();
 }