variable dependencies

Author: ChrisRackauckas

src/variables.jl

@@ -29,12 +29,32 @@ Variable(name,args...;kwargs...) = Variable(name,args...;subtype=:Variable,kwarg
 Parameter(name,args...;kwargs...) = Variable(name,args...;subtype=:Parameter,kwargs...)
 Constant(value::Number) = Variable(Symbol(value),value,typeof(value);subtype=:Constant)
 Constant(name,args...;kwargs...) = Variable(name,args...;subtype=:Constant,kwargs...)
-DependentVariable(name,args...;kwargs...) = Variable(name,args...;subtype=:DependentVariable,kwargs...)
-StateVariable(name,args...;kwargs...) = Variable(name,args...;subtype=:StateVariable,kwargs...)
-ControlVariable(name,args...;kwargs...) = Variable(name,args...;subtype=:ControlVariable,kwargs...)
 IndependentVariable(name,args...;kwargs...) = Variable(name,args...;subtype=:IndependentVariable,kwargs...)
-JumpVariable(name,args...;kwargs...) = Variable(name,args...;subtype=:JumpVariable,kwargs...)
-NoiseVariable(name,args...;kwargs...) = Variable(name,args...;subtype=:NoiseVariable,kwargs...)
+
+function DependentVariable(name,args...;dependents = [],kwargs...)
+    @assert !isempty(dependents)
+    Variable(name,args...;subtype=:DependentVariable,dependents=dependents,kwargs...)
+end
+
+function StateVariable(name,args...;dependents = [],kwargs...)
+    @assert !isempty(dependents)
+    Variable(name,args...;subtype=:StateVariable,dependents=dependents,kwargs...)
+end
+
+function ControlVariable(name,args...;dependents = [],kwargs...)
+    @assert !isempty(dependents)
+    Variable(name,args...;subtype=:ControlVariable,dependents=dependents,kwargs...)
+end
+
+function JumpVariable(name,args...;dependents = [],kwargs...)
+    @assert !isempty(dependents)
+    Variable(name,args...;subtype=:JumpVariable,dependents=dependents,kwargs...)
+end
+
+function NoiseVariable(name,args...;dependents = [],kwargs...)
+    @assert !isempty(dependents)
+    Variable(name,args...;subtype=:NoiseVariable,dependents=dependents,kwargs...)
+end
 
 export Variable,Parameter,Constant,DependentVariable,IndependentVariable,JumpVariable,NoiseVariable,
        @Var, @DVar, @IVar, @Param, @Const
@@ -109,28 +129,35 @@ function _parse_vars(macroname, fun, x)
     x = flatten_expr!(x)
     for _var in x
         iscall = typeof(_var) <: Expr && _var.head == :call
-        @show iscall
-        if iscall
-            dependents = Variable[:($(esc(d))) for d in _var.args[2:end]]
-            var = _var.args[1]
-        else
-            dependents = Variable[]
-            var = _var
-        end
-        issym    = var isa Symbol
-        isassign = issym ? false : var.head == :(=)
-        @assert issym || isassign "@$macroname expects a tuple of expressions!\nE.g. `@$macroname x y z=1`"
-        if issym
+        issym    = _var isa Symbol
+        isassign = issym ? false : _var.head == :(=)
+        @assert iscall || issym || isassign "@$macroname expects a tuple of expressions!\nE.g. `@$macroname x y z=1`"
+        if iscall || issym
+            if iscall
+                dependents = :([$(_var.args[2:end]...)])
+                var = _var.args[1]
+            else
+                dependents = Variable[]
+                var = _var
+            end
             lhs = var
             push!(lhss, lhs)
             expr = :( $lhs = $fun( Symbol($(String(lhs))) ,
                       dependents = $dependents))
         end
         if isassign
-            lhs = var.args[1]
-            rhs = var.args[2]
+            iscall = typeof(_var.args[1]) <: Expr && _var.args[1].head == :call
+            if iscall
+                dependents = :([$(_var.args[1].args[2:end]...)])
+                lhs = _var.args[1].args[1]
+            else
+                dependents = Variable[]
+                lhs = _var.args[1]
+            end
+            rhs = _var.args[2]
             push!(lhss, lhs)
-            expr = :( $lhs = $fun( Symbol($(String(lhs))) , $rhs))
+            expr = :( $lhs = $fun( Symbol($(String(lhs))) , $rhs,
+                      dependents = $dependents))
         end
         push!(ex.args, expr)
     end

test/ambiguity.jl

@@ -1,8 +1,8 @@
 using SciCompDSL
 using Base.Test
 
-@DVar x y z
 @IVar t
+@DVar x(t) y(t) z(t)
 
 struct __MyType__ end
 Base.:~(::__MyType__,::Number) = 2

test/basic_variables_and_operations.jl

@@ -2,21 +2,19 @@ using SciCompDSL
 using Base.Test
 
 @IVar t
-@DVar x(t)
-macroexpand(:(@DVar x(t)))
-macroexpand(:(@IVar t))
-@DVar x y z
+@DVar x(t) y(t) z(t)
+@test_throws AssertionError @DVar w
 
 @Deriv D'~t # Default of first derivative, Derivative(t,1)
 @Param σ ρ β
 @Const c=0
 
 # Default values
 p = Parameter(:p, 1)
-u = DependentVariable(:u, [1])
+u = DependentVariable(:u, [1], dependents = [t])
 
-s = JumpVariable(:s,3)
-n = NoiseVariable(:n)
+s = JumpVariable(:s,3,dependents=[t])
+n = NoiseVariable(:n,dependents=[t])
 
 σ*(y-x)
 D*x
@@ -26,11 +24,3 @@ D*y ~ x*(ρ-z)-sin(y)
 @test D*t == Constant(1)
 null_op = 0*t
 @test simplify_constants(null_op) == Constant(0)
-
-macro escape_all(x...)
-    :($(esc(x))...)
-end
-x = 1
-y = 2
-z = 3
-macroexpand(:(@escape_all x y z))

test/derivatives.jl

@@ -3,7 +3,7 @@ using Base.Test
 
 # Derivatives
 @IVar t
-@Var x y z
+@Var x(t) y(t) z(t)
 @Param σ ρ β
 @Deriv D'~t
 dsin = D*sin(t)

test/internal.jl

@@ -4,7 +4,7 @@ using Base.Test
 # `Expr`, `Number` -> `Operation`
 @IVar a
 @Param b
-@DVar x
+@DVar x(t)
 @Var y
 @test parse(Operation, 2) == 2
 expr = :(-inv(2sqrt(+($a, $b))))

test/system_construction.jl

@@ -2,8 +2,8 @@ using SciCompDSL
 using Base.Test
 
 # Define some variables
-@DVar x y z
 @IVar t
+@DVar x(t) y(t) z(t)
 @Deriv D'~t # Default of first derivative, Derivative(t,1)
 @Param σ ρ β
 @Const c=0
@@ -37,7 +37,7 @@ test_vars_extraction(de, de2)
 # Conversion to first-order ODEs #17
 @Deriv D3'''~t
 @Deriv D2''~t
-@DVar u u_tt u_t x_t
+@DVar u(t) u_tt(t) u_t(t) x_t(t)
 eqs = [D3*u ~ 2(D2*u) + D*u + D*x + 1
        D2*x ~ D*x + 2]
 de = DiffEqSystem(eqs, [t])

test/variable_parsing.jl

@@ -10,10 +10,13 @@ a1 = Variable(:a,1.0)
     b
 end
 
-@DVar x y=sin(1)+exp(1) z
-x1 = DependentVariable(:x)
-y1 = DependentVariable(:y, sin(1) + exp(1))
-z1 = DependentVariable(:z)
+@IVar t
+@DVar x(t)
+@DVar y(t)=sin(1)+exp(1)
+@DVar z(t)
+x1 = DependentVariable(:x,dependents = [t])
+y1 = DependentVariable(:y, sin(1) + exp(1),dependents = [t])
+z1 = DependentVariable(:z,dependents = [t])
 @test x1 == x
 @test y1 == y
 @test z1 == z