Skip to content

Commit

Permalink
Merge pull request #3 from karenl7/ASCIIStringDeprecation
Browse files Browse the repository at this point in the history
julia 0.5 deprecation: ASCIIString -> String
  • Loading branch information
reesepathak authored Oct 25, 2016
2 parents 3a2b520 + 585c829 commit da20b00
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 3 deletions.
1 change: 1 addition & 0 deletions REQUIRE
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
julia 0.4
Compat
4 changes: 2 additions & 2 deletions examples/machine_learning/MatrixMarket.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module MatrixMarket

function mmread(filename::ASCIIString, infoonly::Bool)
function mmread(filename::String, infoonly::Bool)
# Reads the contents of the Matrix Market file 'filename'
# into a matrix, which will be either sparse or dense,
# depending on the Matrix Market format indicated by
Expand Down Expand Up @@ -45,6 +45,6 @@ function mmread(filename::ASCIIString, infoonly::Bool)
reshape([float64(readline(mmfile)) for i in 1:entries], (rows,cols))
end

mmread(filename::ASCIIString) = mmread(filename, false)
mmread(filename::String) = mmread(filename, false)

end # module
3 changes: 3 additions & 0 deletions src/LinearLeastSquares.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
module LinearLeastSquares

using Compat
import Compat.String

include("types/expressions.jl")
include("types/constraints.jl")
include("types/problems.jl")
Expand Down
2 changes: 1 addition & 1 deletion src/types/problems.jl
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ type Problem
head::Symbol
objective::SumSquaresExpr
constraints::Array{EqConstraint, 1}
status::ASCIIString
status::String
optval::Float64OrVoid

function Problem(head::Symbol, objective::SumSquaresExprOrVoid, constraints::Array{EqConstraint, 1})
Expand Down

0 comments on commit da20b00

Please sign in to comment.