Merge pull request #24 from ldm2468/minor-improvements

Minor improvements

.gitignore

@@ -1,4 +1,5 @@
 *.o
+*.d
 main
 test
 data

Makefile

@@ -1,11 +1,14 @@
-CXX = g++
-MAIN = main
-MAIN_OBJECTS = main.o graph.o parse.o stat.o basicstat.o connectstat.o biconnected.o eigencentrality.o closenesscentrality.o betweennesscentrality.o countstat.o makeplot.o html.o statanalyzer.o
-TEST = test
-TEST_OBJECTS = test.o graph.o parse.o diameter.o
-PYPLOT_DIR = pyplot
-CXXFLAGS = -std=c++17 -Wall -O3
-LDFLAGS =
+CXX := g++
+MAIN := main
+MAIN_OBJECTS := main.o graph.o parse.o stat.o basicstat.o connectstat.o biconnected.o eigencentrality.o closenesscentrality.o betweennesscentrality.o countstat.o makeplot.o html.o statanalyzer.o
+TEST := test
+TEST_OBJECTS := test.o graph.o parse.o diameter.o
+PYPLOT_DIR := pyplot
+CXXFLAGS := -std=c++17 -Wall -O3
+LDFLAGS :=
+MAIN_DEPS := $(MAIN_OBJECTS:.o=.d)
+TEST_DEPS := $(TEST_OBJECTS:.o=.d)
+CPPFLAGS := -MMD -MP
 
 all: $(MAIN) $(TEST) $(PYPLOT_DIR)
 
@@ -19,4 +22,7 @@ $(PYPLOT_DIR):
 	mkdir -p pyplot
 
 clean:
-	rm -rf $(MAIN) $(MAIN_OBJECTS) $(TEST) $(TEST_OBJECTS) *.html pyplot __pycache__
+	rm -rf $(MAIN) $(MAIN_OBJECTS) $(TEST) $(TEST_OBJECTS) $(MAIN_DEPS) $(TEST_DEPS) *.html pyplot __pycache__
+
+-include $(MAIN_DEPS)
+-include $(TEST_DEPS)

betweennesscentrality.h

@@ -6,7 +6,7 @@
 #include "graph.h"
 #include "stat.h"
 
-#define MAX_BETWEENNESS_SAMPLE_SZ 50
+#define MAX_BETWEENNESS_SAMPLE_SZ 300
 
 namespace snu {
 class BetweennessCentrality : public CommonStat {

testers/test_centrality.py

@@ -55,12 +55,12 @@
         test_dict[vid] = i
 
     f_out.write(f'Comparing Stat: {stat_to_compare}\n\n')
-    f_out.write(f'{"B-rank" :<8}{"T-rank" :<8}{"vid" :<8}{"B-value" :<16}{"T-value" :<16}{"R-Err" :<8}\n')
+    f_out.write(f'{"SNAP-rank" :<14}{"OUR-rank" :<14}{"vid" :<8}{"SNAP-value" :<16}{"OUR-value" :<16}{"R-Err" :<8}\n')
     for i in range (min(len(base_lis), len(test_lis))):
         (val, vid) = base_lis[i]
         t_idx = test_dict[vid]
         t_val = test_lis[t_idx][0]
         err = str(t_val/val - 1) if (val > 0 and t_val > 0) else "A:" + str(abs(t_val - val))
-        l = f'{i :<8}{t_idx :<8}{vid :<8}{val :<16}{t_val :<16}{err :<8}\n'
+        l = f'{i :<14}{t_idx :<14}{vid :<8}{val :<16}{t_val :<16}{err :<8}\n'
         f_out.write(l)