- fixed a bug 509, where LoadEdgeListStr() failed with a mapping parameter

- updated bug list with latest reports

Author: roks

doc/source/reference/LoadEdgeListStr1.rst

@@ -21,7 +21,7 @@ Parameters:
 - *DstColId*: int (input)
     The column number in the file, which contains the node id representing the destination vertex.
 
-- *StrToNIdH*: :class:`TStrIntH`, a hash table with string keys and int values (output)
+- *StrToNIdH*: :class:`TStrIntSH`, a string hash table with string keys and int values (output)
     Contains the mapping of strings to node ids.
 
 
@@ -35,5 +35,5 @@ The following example shows how to load the following from a text file, wiki-vot
 
     import snap
 
-    mapping = snap.TStrIntH()
+    mapping = snap.TStrIntSH()
     G0 = snap.LoadEdgeListStr(snap.PNGraph, "wiki-Vote.txt", 0, 1, mapping)

swig/snap.i

@@ -366,6 +366,7 @@ Version = "1.2.2"
 %template(TIntStrH) THash<TInt, TStr>;
 %template(TIntPrFltH) THash<TIntPr, TFlt>;
 %template(TStrIntH) THash<TStr, TInt>;
+%template(TStrIntSH) TStrHash<TInt, TStrPool, TDefaultHashFunc<TStr> >;
 
 // define keydat types
 %template(TIntHI) THashKeyDatI <TInt, TInt>;
@@ -437,7 +438,6 @@ Version = "1.2.2"
 %template(TStrVStrH) THash<TStrV, TStr>;
 %template(TStrVStrVH) THash<TStrV, TStrV>;
 //%template(TStrSH) TStrHash<TInt>;
-//%template(TStrIntSH) TStrHash<TInt>;
 //%template(TStrToIntVSH) TStrHash<TIntV>;
 
 // define keydat types

test/bug-509-load.py

@@ -0,0 +1,12 @@
+import snap
+
+print "LoadEdgeListStr 1"
+G1 = snap.LoadEdgeListStr(snap.PUNGraph, "data/test-509.txt", 0, 1)
+print "nodes %d, edges %d" % (G1.GetNodes(), G1.GetEdges())
+
+print "LoadEdgeListStr 2"
+#mapping = snap.TStrIntH()
+mapping = snap.TStrIntSH()
+G2 = snap.LoadEdgeListStr(snap.PUNGraph, "data/test-509.txt", 0, 1, mapping)
+print "nodes %d, edges %d" % (G2.GetNodes(), G2.GetEdges())
+

test/data/coocurence_graph.txt renamed to test/data/cooccurrence.txt

@@ -9,9 +9,11 @@
 
 # TODO
 #   bug-328-cnm.py
-#   bug-509-load.py
 #   bug-585-genrndpowerlaw.py
 #   bug-20150706-pagerank.py
+#   bug-2015-18.py
+#   bug-2015-130.py
+#   bug-GetClosenessCentr.py
 scripts=(quick_test.py \
     cncom.py intro.py tutorial.py tneanet.py bfs.py attributes.py \
     test-tnodei.py test-io.py \
@@ -20,6 +22,7 @@ scripts=(quick_test.py \
     test-356-getei.py \
     test-374-addstrattrdate.py \
     test-384-deledge.py \
+    test-509-load.py \
     test-582-getnodewcc.py \
     test-585-genrndpowerlaw.py \
     test-613-getbfstree.py \