@@ -81,28 +81,29 @@ if VERSION < v"0.6-"
81
81
new_m
82
82
end
83
83
84
- end
85
-
86
- add_idxs (x,expr) = expr
87
- add_idxs {T<:AbstractMultiScaleArray} (:: Type{T} ,expr) = :($ (expr). x[i])
88
-
89
- add_y (x,expr) = expr
90
- add_y {T<:AbstractMultiScaleArray} (:: Type{T} ,expr) = :($ (expr). y)
91
-
92
- @generated function Base. broadcast! (f,A:: AbstractMultiScaleArray ,B:: Union{Number,AbstractMultiScaleArray} ...)
93
- exs = ((add_idxs (B[i],:(B[$ i])) for i in eachindex (B)). .. )
94
- exs_y = ((add_y (B[i],:(B[$ i])) for i in eachindex (B)). .. )
95
- quote
96
- for i in eachindex (A. x)
97
- broadcast! (f,A. x[i],$ (exs... ))
98
- end
99
- if ! (typeof (A)<: AbstractMultiScaleArrayLeaf ) && ! isempty (y)
100
- broadcast! (f,A. y,$ (exs_y... ))
84
+ else # Only define broadcasts on v0.6+
85
+ #=
86
+ add_idxs(x,expr) = expr
87
+ add_idxs{T<:AbstractMultiScaleArray}(::Type{T},expr) = :($(expr).x[i])
88
+
89
+ add_y(x,expr) = expr
90
+ add_y{T<:AbstractMultiScaleArray}(::Type{T},expr) = :($(expr).y)
91
+
92
+ @generated function Base.broadcast!(f,A::AbstractMultiScaleArray,B::Union{Number,AbstractMultiScaleArray}...)
93
+ exs = ((add_idxs(B[i],:(B[$i])) for i in eachindex(B))...)
94
+ exs_y = ((add_y(B[i],:(B[$i])) for i in eachindex(B))...)
95
+ quote
96
+ for i in eachindex(A.x)
97
+ broadcast!(f,A.x[i],$(exs...))
98
+ end
99
+ if !(typeof(A)<:AbstractMultiScaleArrayLeaf) && !isempty(y)
100
+ broadcast!(f,A.y,$(exs_y...))
101
+ end
101
102
end
102
103
end
104
+ =#
103
105
end
104
106
105
-
106
107
* (m:: AbstractMultiScaleArray ,y:: Number ) = m.* y
107
108
* (y:: Number ,m:: AbstractMultiScaleArray ) = m.* y
108
109
+ (m:: AbstractMultiScaleArray ,y:: AbstractMultiScaleArray ) = m.+ y
0 commit comments