Change to panda default csv reader

scorelab · Jun 25, 2017 · 49ac56f · 49ac56f
1 parent 8a82437
commit 49ac56f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/bellydynamic-adv/TemporalGraph.py b/bellydynamic-adv/TemporalGraph.py
@@ -2,7 +2,6 @@
 
 sys.path.append("../bellydynamic-util/")
 
-import csv_io
 import pandas as pd
 
 import MultiGraph as MG
@@ -22,9 +21,7 @@
     ## Edge level attributes
     EdgeA = EdgeA.EdgeAttribute(G)
 
-    data_matrix = csv_io.read_data(filename, " ", 0)
-
-    df = pd.DataFrame(data_matrix, columns=('src', 'dst', 'timestamp'))
+    df = pd.read_csv(filename, sep=' ')
 
     ##### init edge attributes
     attribute_type = 1
@@ -45,4 +42,4 @@
     # graph.walkNodes()
     # graph.walkEdges()
 
-    EdgeA.walkGraphEdgeAttributes(attribute_type, attribute_name)
+        # EdgeA.walkGraphEdgeAttributes(attribute_type, attribute_name)
diff --git a/bellydynamic-data/CollegeMsg.txt b/bellydynamic-data/CollegeMsg.txt
@@ -1,3 +1,4 @@
+src dst timestamp
 1 2 1082040961
 3 4 1082155839
 5 2 1082414391

diff --git a/bellydynamic-util/csv_io.py b/bellydynamic-util/csv_io.py