Merge pull request #41 from tkelman/compatetc

Remove unnecessary uses of Compat, Docile, etc

Author: nassarhuda

REQUIRE

@@ -1,4 +1,3 @@
 julia 0.5
-Docile
 DataStructures
 #Lint

src/MatrixNetwork.jl

@@ -1,5 +1,3 @@
-using Compat 
-
 # create type MatrixNetwork
 type MatrixNetwork{T}
     n::Int64 # number of columns/rows

src/MatrixNetworks.jl

@@ -1,12 +1,7 @@
 module MatrixNetworks
 
-using Compat
 using DataStructures
 
-if VERSION < v"0.4-"
-    using Docile
-end
-
 """
 Module ``MatrixNetworks``: Documentation on the module
 

src/diffusions.jl

@@ -1,7 +1,7 @@
 
 ## Todo
 
-import Compat.LinAlg.checksquare
+import Base.LinAlg.checksquare
 import Base.eltype
 import Base.length
 import Base.*

src/manage_data.jl

@@ -1,7 +1,5 @@
 #using Lint
 
-using Compat
-
 function readSMAT(filename::AbstractString)
     (rows,header) = readdlm(filename;header=true)
     A = sparse(
@@ -23,7 +21,7 @@ end
 
 function load_matrix_network_all(name::AbstractString)
     A = load_matrix_network(name)
-    pathname = joinpath(Pkg.dir("MatrixNetworks"),"data")
+    pathname = joinpath(dirname(dirname(@__FILE__)),"data")
 
     meta_source = joinpath(pathname,"$(name).source")
     if isfile(meta_source)
@@ -51,7 +49,7 @@ end
 
 
 function load_matrix_network(name::AbstractString)
-    pathname = joinpath(Pkg.dir("MatrixNetworks"),"data")
+    pathname = joinpath(dirname(dirname(@__FILE__)),"data")
     smatfile = joinpath(pathname,"$(name).smat")
     if isfile(smatfile)
         return readSMAT(smatfile)
@@ -61,7 +59,7 @@ function load_matrix_network(name::AbstractString)
 end
 
 function load_matrix_network_metadata(name::AbstractString)
-    pathname = joinpath(Pkg.dir("MatrixNetworks"),"data")
+    pathname = joinpath(dirname(dirname(@__FILE__)),"data")
     smatfile = joinpath(pathname,"$(name).smat")
     meta_xy = joinpath(pathname,"$(name).xy")
     meta_labels = joinpath(pathname,"$(name).labels")
@@ -77,7 +75,7 @@ function load_matrix_network_metadata(name::AbstractString)
 end
 
 function matrix_network_datasets()
-    datasets_location = joinpath(Pkg.dir("MatrixNetworks"),"data")
+    datasets_location = joinpath(dirname(dirname(@__FILE__)),"data")
     content = readdir(datasets_location)
     smat_files = filter(x->contains(x,".smat"),content)
     for i = 1:length(smat_files)

src/spectral.jl

@@ -1,6 +1,4 @@
-# for issymmetric and checksquare 
-using Compat 
-import Compat.LinAlg.checksquare # updates for v0.5
+import Base.LinAlg.checksquare
 
 ## Todo
 # 1. Add method for partial sweep cut
@@ -48,10 +46,10 @@ function _symeigs_smallest_arpack{V}(
     mode = 1
     sym = true
     iscmplx = false
-    bmat = Compat.String("I") # ByteString on Julia 0.4, String on 0.5
+    bmat = String("I")
     ncv = min(max(2*nev,20),n-1)
 
-    whichstr = Compat.String("SA") # ByteString on Julia 0.4, String on 0.5
+    whichstr = String("SA")
     ritzvec = true
     sigma = 0.
 
@@ -105,7 +103,7 @@ function _symeigs_smallest_arpack{V}(
     # eigenvectors.
 
     # calls to eupd
-    howmny = Compat.String("A") # ByteString on Julia 0.4, String on 0.5
+    howmny = String("A")
     select = Array(Base.LinAlg.BlasInt, ncv)
 
     d = Array(V, nev)
@@ -300,7 +298,7 @@ immutable SweepcutProfile{V,F}
     total_volume::V
     total_nodes::Int
 
-    @compat function (::Type{SweepcutProfile{V,F}}){V,F}(p::Vector{Int},nnodes::Int,totalvol::V)
+    function (::Type{SweepcutProfile{V,F}}){V,F}(p::Vector{Int},nnodes::Int,totalvol::V)
         n = length(p)
         new{V,F}(p,Array(F,n-1),Array(V,n-1),Array(V,n-1),totalvol,nnodes)
     end

test/generators_test.jl

@@ -57,9 +57,7 @@ function pa_graph_test()
     @assert typeof(pa_graph(10,5,5)) == MatrixNetwork{Bool}
     @assert typeof(pa_edges!(2,1,[(1,1)])) == Vector{Tuple{Int,Int}}
     @test_throws ArgumentError pa_edges!(5,2,Vector{Tuple{Int,Int}}())
-    if VERSION >= v"0.5.0"
-        @test is_empty(pa_graph(0,0,0)) == true
-    end
+    @test is_empty(pa_graph(0,0,0)) == true
     @test all(diag(sparse_transpose(pa_graph(10, 2, 3))) .== 0.)
     @test is_undirected(pa_graph(10, 12, 3))
     @test_throws ArgumentError pa_graph(-1,10,3)
@@ -79,4 +77,4 @@ havel_hakimi_test()
 pa_graph_test()
 return true
 
-end
+end

test/runtests.jl

@@ -1,6 +1,5 @@
 using MatrixNetworks
 using Base.Test
-using Compat
 #using Lint
 
 # Todo
@@ -30,7 +29,7 @@ all_tests = ["matrixnetwork",
 
 for t in all_tests
     test_name = join(["$(t)", "_test",".jl"])
-    test_path = joinpath(Pkg.dir("MatrixNetworks"), "test", test_name)
+    test_path = joinpath(dirname(@__FILE__), test_name)
     println("running $(test_path) ...")
     test_function = include(test_path)
     test_function()