Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
julia 0.6
Compat 0.27.0
Compat 0.33.0
1 change: 1 addition & 0 deletions src/MATLAB.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ __precompile__()

module MATLAB

using Compat
using Compat.Sys: islinux, iswindows, isapple

import Base: eltype, close, size, copy, ndims, unsafe_convert
Expand Down
2 changes: 1 addition & 1 deletion src/mxarray.jl
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ function mxarray(a::Array{T}) where T<:MxComplexNum
end

mxarray(a::BitArray) = mxarray(convert(Array{Bool}, a))
mxarray(a::Range) = mxarray([a;])
mxarray(a::AbstractRange) = mxarray([a;])

# sparse matrix

Expand Down
2 changes: 1 addition & 1 deletion test/engine.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using MATLAB
using Base.Test
using Compat.Test

# test engine

Expand Down
2 changes: 1 addition & 1 deletion test/matfile.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using MATLAB
using Base.Test
using Compat.Test

# test MMAT file I/O
fn = "$(tempname()).mat"
Expand Down
2 changes: 1 addition & 1 deletion test/matstr.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using MATLAB
using Base.Test
using Compat.Test

@test mat"1" == 1
@test mat"[1, 2, 3]" == [1 2 3]
Expand Down
2 changes: 1 addition & 1 deletion test/mstatements.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using MATLAB
using Base.Test
using Compat.Test

@test mstatement(:abc) == "abc"

Expand Down
6 changes: 3 additions & 3 deletions test/mxarray.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using MATLAB
using Base.Test
using Compat.Test

# Unit testing for MxArray

Expand Down Expand Up @@ -192,7 +192,7 @@ a_mx = mxarray(a)

a2 = jsparse(a_mx)
@test size(a2) == (8, 9)
@test countnz(a2) == countnz(a)
@test count(!iszero, a2) == count(!iszero, a)
@test isequal(a2, a)
delete(a_mx)

Expand All @@ -205,7 +205,7 @@ a_mx = mxarray(a)

a2 = jsparse(a_mx)
@test size(a2) == (8, 9)
@test countnz(a2) == countnz(a)
@test count(!iszero, a2) == count(!iszero, a)
@test isequal(a2, a)
delete(a_mx)

Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using MATLAB
using Base.Test
using Compat.Test

include("engine.jl")
include("matfile.jl")
Expand Down