Cleanup Code (#11)

Author: abhinavmehndiratta

src/Enums.jl

@@ -8,10 +8,10 @@ import Base:
 import SuiteSparseGraphBLAS:
         GrB_Matrix, GrB_Vector, GrB_Descriptor
 
-include("Utils.jl")
-include("./Object_Methods/Matrix_Methods.jl")
-include("./Object_Methods/Vector_Methods.jl")
-include("./Object_Methods/Descriptor_Methods.jl")
+include("utils.jl")
+include("./object_methods/matrix.jl")
+include("./object_methods/vector.jl")
+include("./object_methods/descriptor.jl")
 export findnz, nnz, LowerTriangular, UpperTriangular, Diagonal, dropzeros!
 
 end # end of module

src/Interface/Interface.jl

@@ -1,7 +1,7 @@
 """
-    GrB_Descriptor(d::Dict{GrB_Desc_Field, GrB_Desc_Value})
+    GrB_Descriptor(::Pair{GrB_Desc_Field, GrB_Desc_Value}...)
 
-Create a new GraphBLAS descriptor from a dictionary of descriptor field and value pairs.
+Create a new GraphBLAS descriptor.
 
 # Examples
 ```jldoctest
@@ -10,11 +10,11 @@ julia> using SuiteSparseGraphBLAS
 julia> GrB_init(GrB_NONBLOCKING)
 GrB_SUCCESS::GrB_Info = 0
 
-julia> desc = GrB_Descriptor(Dict(GrB_INP0 => GrB_TRAN, GrB_OUTP => GrB_REPLACE))
+julia> desc = GrB_Descriptor(GrB_INP0 => GrB_TRAN, GrB_OUTP => GrB_REPLACE)
 GrB_Descriptor
 ```
 """
-function GrB_Descriptor(d::Dict{GrB_Desc_Field, GrB_Desc_Value})
+function GrB_Descriptor(d::Pair{GrB_Desc_Field, GrB_Desc_Value}...)
     desc = GrB_Descriptor()
     res = GrB_Descriptor_new(desc)
     if res != GrB_SUCCESS

src/Interface/Object_Methods/Descriptor_Methods.jl renamed to src/Interface/object_methods/descriptor.jl

@@ -10,8 +10,8 @@ function GrB_Matrix(
         I::Vector{U},
         J::Vector{U},
         X::Vector{T};
-        nrows::Union{Int64, UInt64} = maximum(I).x,
-        ncols::Union{Int64, UInt64} = maximum(J).x,
+        nrows::Union{Int64, UInt64} = maximum(I)[],
+        ncols::Union{Int64, UInt64} = maximum(J)[],
         nvals::Union{Int64, UInt64} = min(length(I), length(J)),
         dup::GrB_BinaryOp = default_dup(T)) where {T, U <: Abstract_GrB_Index}
 
@@ -88,7 +88,7 @@ function ==(A::GrB_Matrix{T}, B::GrB_Matrix{U}) where {T, U}
 end
 
 """
-    findnz(A, [index_type])
+    findnz(A,[ index_type])
 
 Return a tuple (I, J, X) where I and J are the row and column indices of the stored values in GraphBLAS matrix A,
 and X is a vector of the values. Indices are zero based by default if not specified.

src/Interface/Object_Methods/Matrix_Methods.jl renamed to src/Interface/object_methods/matrix.jl

@@ -9,7 +9,7 @@ nvals is set to length(I) if not specified.
 function GrB_Vector(
         I::Vector{U},
         X::Vector{T};
-        n::Union{Int64, UInt64} = maximum(I).x,
+        n::Union{Int64, UInt64} = maximum(I)[],
         nvals::Union{Int64, UInt64} = length(I),
         dup::GrB_BinaryOp = default_dup(T)) where {T, U <: Abstract_GrB_Index}
 
@@ -127,7 +127,7 @@ function nnz(V::GrB_Vector)
 end
 
 """
-    findnz(V, [index_type])
+    findnz(V,[ index_type])
 
 Return a tuple (I, X) where I is the indices of the stored values in GraphBLAS vector V and X is a vector of the values.
 Indices are zero based by default if not specified.

src/Interface/Object_Methods/Vector_Methods.jl renamed to src/Interface/object_methods/vector.jl

@@ -9,9 +9,9 @@ if !isfile(depsjl_path)
 end
 
 include(depsjl_path)
-include("Structures.jl")
-include("Global_Variables.jl")
-include("Utils.jl")
+include("structures.jl")
+include("global_variables.jl")
+include("utils.jl")
 
 const valid_matrix_mask_types = Union{GrB_Matrix, GrB_NULL_Type}
 const valid_vector_mask_types = Union{GrB_Vector, GrB_NULL_Type}
@@ -38,24 +38,23 @@ function __init__()
     end
 end
 
-include("Enums.jl")
-include("Context_Methods.jl")
-include("Sequence_Termination.jl")
-include("Object_Methods/Matrix_Methods.jl")
-include("Object_Methods/Vector_Methods.jl")
-include("Object_Methods/Algebra_Methods.jl")
-include("Object_Methods/Descriptor_Methods.jl")
-include("Object_Methods/Print_Objects.jl")
-include("Object_Methods/Free_Objects.jl")
-include("Operations/Multiplication.jl")
-include("Operations/Element_wise_multiplication.jl")
-include("Operations/Element_wise_addition.jl")
-include("Operations/Extract.jl")
-include("Operations/Apply.jl")
-include("Operations/Assign.jl")
-include("Operations/Reduce.jl")
-include("Operations/Transpose.jl")
-include("Operations/Select.jl")
+include("context_methods.jl")
+include("sequence_termination.jl")
+include("object_methods/matrix.jl")
+include("object_methods/vector.jl")
+include("object_methods/algebraic.jl")
+include("object_methods/descriptor.jl")
+include("object_methods/print.jl")
+include("object_methods/free.jl")
+include("operations/multiply.jl")
+include("operations/ewise_multiply.jl")
+include("operations/ewise_add.jl")
+include("operations/extract.jl")
+include("operations/apply.jl")
+include("operations/assign.jl")
+include("operations/reduce.jl")
+include("operations/transpose.jl")
+include("operations/select.jl")
 
 # Higher-level interface
 include("Interface/Interface.jl")