Fix deprecation warnings for 0.4-dev.

src/arrays/constructors.jl

@@ -21,7 +21,7 @@
 function coherentstatevec_inf(n::Int,alpha::Number)
     s = zeros(typeof(float(alpha)),n)
     s[1] = one(alpha)
-    for i in [2:n]
+    for i in 2:n
         s[i] = alpha/sqrt(i-1)*s[i-1]
     end
     z = QuArray(s)

src/arrays/ladderops.jl

@@ -16,11 +16,11 @@
     lowermatrix(lens, particle) = eye_sandwich(lens, particle, lower_single(lens[particle]))
 
     laddercoeffs(n) = sqrt(linspace(1, n, n))
-    lower_single(n) = sparse([1:n-1], [2:n], laddercoeffs(n-1), n, n)
-    raise_single(n) = sparse([2:n], [1:n-1], laddercoeffs(n-1), n, n)
+    lower_single(n) = sparse([1:n-1;], [2:n;], laddercoeffs(n-1), n, n)
+    raise_single(n) = sparse([2:n;], [1:n-1;], laddercoeffs(n-1), n, n)
 
-    before_eye(lens, pivot) = speye(prod(lens[[1:pivot-1]]))
-    after_eye(lens, pivot) = speye(prod(lens[[pivot+1:length(lens)]]))
+    before_eye(lens, pivot) = speye(prod(lens[1:pivot-1]))
+    after_eye(lens, pivot) = speye(prod(lens[pivot+1:length(lens)]))
     function eye_sandwich(lens, pivot, op)
         return kron(before_eye(lens, pivot),
                     op,

src/arrays/spinops.jl

@@ -12,9 +12,9 @@ spin(s::HalfSpin) = s
 spin(j::Integer) = HalfSpin(2*j)
 function spin(j)
     if isinteger(j)       
-        return spin(int(j)) # j = 0.0, 1.0, 2.0...
+        return spin(@compat(rount(Int,j))) # j = 0.0, 1.0, 2.0...
     elseif isinteger(2*j) 
-        return HalfSpin(int(2*j)) # j = .5, 1.5, 2.5...
+        return HalfSpin(@compat(round(Int,2*j))) # j = .5, 1.5, 2.5...
     else
         error("Spin must be a multiple of 1/2.")
     end
@@ -25,6 +25,7 @@ spin_value(s::HalfSpin) = s.val/2
 #####################
 # Auxiliary Methods #
 #####################
+<<<<<<< HEAD
 spin_coeffs(j, scalar) = [scalar*sqrt(j*(j+1)-(x+1)*x) for x in j-1:-1:-j]
 
 function spinjyx_mat(s::HalfSpin, a, b)
@@ -37,6 +38,21 @@ end
 
 spinjx_mat(j) = spinjyx_mat(spin(j), .5, 1)
 spinjy_mat(j) = spinjyx_mat(spin(j), -.5im, -1)
+=======
+
+function mat_coeffs_1(j::Float64)
+    m = j-1:-1:-j
+    N = length(m)+1
+    m_coeffs = [sqrt(j*(j+1.0) - (x+1.0)*x) for x in m]
+    return spdiagm(m_coeffs,1,N,N)
+end
+
+function mat_coeffs_2(j::Float64)
+    m = j:-1:-j
+    N = length(m)
+    return spdiagm(m,0,N,N)
+end
+>>>>>>> Fix deprecation warnings for 0.4-dev.
 
 function spinjpm_mat(s::HalfSpin, k)
     N = s.val + 1

src/bases/labelbasis.jl

@@ -146,10 +146,10 @@
     ######################
     # Accessor Functions #
     ######################
-    ind_value(n, range, denom, modulus) = range[(div(n, denom) % modulus)+1]
+    ind_value(n, range, denom, modulus) = range[@compat(round(Int,div(n, denom) % modulus))+1]
     tuple_at_ind(b::LabelBasis, i) = ntuple(nfactors(b), x->ind_value(i-1, ranges(b,x), b.denoms[x], size(b,x)))
     pos_in_range(r::Range, i) = i in r ? (i-first(r))/step(r) : throw(BoundsError())
-    getpos(b::LabelBasis, label) = int(sum(map(*, map(pos_in_range, ranges(b), label), b.denoms))+1)
+    getpos(b::LabelBasis, label) = @compat round(Int, sum(map(*, map(pos_in_range, ranges(b), label), b.denoms))+1)
 
     Base.in(label, b::LabelBasis) = reduce(&, map(in, label, ranges(b)))