Merge pull request #5 from sbromberger/hotfix

Lint fixes
sbromberger · Feb 10, 2015 · 47e0d2d · 47e0d2d
2 parents 3568195 + b27abce
commit 47e0d2d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/dijkstra.jl b/src/dijkstra.jl
@@ -198,7 +198,7 @@ function dijkstra_shortest_paths(
  sources::AbstractVector{Int};
  visitor::AbstractDijkstraVisitor=TrivialDijkstraVisitor())
  state::DijkstraStates = create_dijkstra_states(graph)
- dijkstra_shortest_paths!(graph, sources, visitor, state)
+ dijkstra_shortest_paths!(graph, edge_dists, sources, visitor, state)
 end
 
 function dijkstra_shortest_paths(

diff --git a/src/persistence.jl b/src/persistence.jl
@@ -12,7 +12,7 @@ function readgraph(fn::AbstractString)
  f = GZip.open(fn,"r") # will work even if uncompressed
  line = chomp(readline(f))
  nstr, dirundir = split (line,r"\s*,\s*")
- n = int(nstr)
+ n = parseint(nstr)
  if dirundir == "u"
  directed = false
  end
@@ -25,8 +25,8 @@ function readgraph(fn::AbstractString)
  while !eof(f)
  line = chomp(readline(f))
  src_s, dst_s = split(line,r"\s*,\s*")
- src = int(src_s)
- dst = int(dst_s)
+ src = parseint(src_s)
+ dst = parseint(dst_s)
  add_edge!(g, src, dst)
  end
  return g

diff --git a/src/smallgraphs.jl b/src/smallgraphs.jl
@@ -38,7 +38,7 @@
 # > (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # > OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-function CompleteGraph(n::Integer; is_directed=true)
+function CompleteGraph(n::Integer)
  g = Graph(n)
  for i = 1:n, j=1:n
  if i < j