Merge pull request #15 from MatthewStuber/FIxedTape

Minor update to fixed tape methods.

Author: MatthewStuber

example/DAGcontractor.jl

@@ -19,3 +19,14 @@ tapelist_out = Generate_TapeList(mult_expr,5,[-1.0,2.0],[2.0,3.0])
 X = [Interval(0.5,10.0) for i=1:5]
 DAGContractor!(X,tapelist_out,6)
 println("contracted X value: ", X)
+
+#=
+generates the tape list for the constraints -1 <= (x[1]+x[2]^2-exp(x[1]) <= 2
+and 2 <= :(x[1]*x[2]-x[5]) <= 4 with x[5]==5 and runs the contractor 6 times in place on the
+variable box X = [1,20]^5
+=#
+
+X = [Interval(-10.0,10.0) for i=1:5]
+ftapelist_out = Generate_Fixed_TapeList(mult_expr,4,[-8.0,0.5],[2.0,4.5],[[5.0]])
+DAGContractor!(X,ftapelist_out,6)
+println("contracted X value: ", X)

src/src/FBBT/DAGprop.jl

@@ -49,7 +49,6 @@ immutable Tape
   gU::Float64
   cnsts::Vector
   fix_val
-  fix_ind
 end
 
 """
@@ -69,7 +68,6 @@ Tape() =  ([],
            0.0,
            0.0,
            [],
-           [],
            [])
 
 """
@@ -113,7 +111,7 @@ function Generate_Tape(exp::Expr,nx::Int64,gL,gU)
                       NodeCounter,Interval[Interval(-Inf,Inf) for i=1:NodeCounter],
                       FW_Arg,[Expr(:call) for i=1:NodeCounter],nx,
                       RW_Arg,[Expr(:call) for i=1:NodeCounter],gL,gU,
-                      deepcopy(ConstList),[],[])
+                      deepcopy(ConstList),[])
   global EdgeList = []
   global HeaderList = Symbol[]
   global ConstList = []
@@ -135,7 +133,7 @@ function Generate_Fixed_Tape(exp::Expr,nx::Int64,gL,gU,vals)
   # Sets up node finding object and generates graph to global
   X_NodeF::Vector{Any} = vcat(Any[NodeFinder(i) for i=1:nx],vals)
   global NodeCounter = deepcopy(nx)
-  fX! = @eval x::Vector{NodeFinder} -> $exp
+  fX! = @eval x::Vector{Any} -> $exp
   Base.invokelatest(fX!,X_NodeF)
 
   # generates forward tape
@@ -295,10 +293,11 @@ and the initial interval bounds `X::Vector{Interval{T}}`.
 function DAGContractor!(X::Vector{Interval{T}},x::TapeList,r) where {T}
   Xprev::Vector{Interval} = copy(X) # sets variable bounds on first Array to Box Bounds
   SetConstraintNode!(x)
-  SetConstantNode!(x)
+  #SetConstantNode!(x)
   for i=1:r
     for j=1:length(x.sto)
       SetVarBounds!(x.sto[j],Xprev) # take refined bounds from previous graph
+      SetConstantNode!(x)
       ForwardPass!(x.sto[j]) # run forward and reverse pass
       ReversePass!(x.sto[j])
       Xprev = x.sto[j].Intv_Storage[1:length(X)]