Cleaning updates

Author: RXGottlieb

src/SourceCodeMcCormick.jl

@@ -1,3 +1,6 @@
+
+module SourceCodeMcCormick
+
 using ModelingToolkit
 using SymbolicUtils.Code
 # TODO: Need to import Assignment and other stuff probably
@@ -8,18 +11,13 @@ abstract type AbstractTransform end
 # ADD documentation for generic function here
 function transform_rule end
 
-# struct AssignmentPair
-#     l::Assignment
-#     u::Assignment
-# end
 
-# struct AssignmentQuad
-#     l::Assignment
-#     u::Assignment
-#     cv::Assignment
-#     cc::Assignment
-# end
+export McCormickIntervalTransform
+
+export apply_transform, extract_terms, genvar, genparam, get_name
 
 include(joinpath(@__DIR__, "interval", "interval.jl"))
 include(joinpath(@__DIR__, "relaxation", "relaxation.jl"))
-include(joinpath(@__DIR__, "transform", "transform.jl"))
+include(joinpath(@__DIR__, "transform", "transform.jl"))
+
+end

src/relaxation/relaxation.jl

@@ -105,7 +105,7 @@ end
 line_expr(x, xL, xU, zL, zU) = IfElse.ifelse(zU > zL, (zL*(xU - x) + zU*(x - xL))/(xU - xL), zU)
 
 # A symbolic way of computing the mid of three numbers (returns IfElse block)
-mid_expr(x, y, z) = IfElse.ifelse((x < y) && (y < z), y, IfElse.ifelse((z < y) && (y < x), y,
-                    IfElse.ifelse((y < x) && (x < z), x, IfElse.ifelse((z < x) && (x < y), x, z))))
+mid_expr(a, b, c) = IfElse.ifelse((a < b) && (b < c), y, IfElse.ifelse((c < b) && (b < a), b,
+                    IfElse.ifelse((b < a) && (a < c), x, IfElse.ifelse((c < a) && (a < b), a, c))))
 
 include(joinpath(@__DIR__, "rules.jl"))

src/transform/transform.jl

@@ -148,6 +148,9 @@ end
 function apply_transform(transform::T, prob::ODESystem) where T<:AbstractTransform
 
     # Factorize all model equations to generate a new set of equations
+
+    genparam(get_name(prob.iv.val))
+
     equations = Equation[]
     for eqn in prob.eqs
         current = length(equations)
@@ -178,33 +181,37 @@ function apply_transform(transform::T, prob::ODESystem) where T<:AbstractTransfo
         end
     end
 
-    println("")
-    println("Old equations:")
-    for i in prob.eqs
-        println(i)
-    end
-    println("")
-    println("New equations:")
-    for i in new_equations
-        println(i)
-    end
-    println("")
+    # println("")
+    # println("Old equations:")
+    # for i in prob.eqs
+    #     println(i)
+    # end
+    # println("")
+    # println("New equations:")
+    # for i in new_equations
+    #     println(i)
+    # end
+    # println("")
 
     # Copy model start points to the newly transformed variables
     var_defaults, param_defaults = translate_initial_conditions(transform, prob, new_equations)
+    # for i in param_defaults
+    #     print(i)
+    #     print("\n")
+    # end
+    # for i in var_defaults
+    #     print(i)
+    #     print("\n")
+    # end
+    
 
     # Use the transformed equations and new start points to generate a new ODE system
-    @named new_sys = ODESystem(new_equations, default_u0=var_defaults, default_p=param_defaults)
-
+    # @named new_sys = ODESystem(new_equations, default_u0=var_defaults, default_p=param_defaults)
 
-    # Form ODE system from new equations
-    # CSE - MTK.structural_simplify()
+    @named new_sys = ODESystem(new_equations, defaults=merge(var_defaults, param_defaults))
 
     #Extract RHS and evaluate at a point, make that a script that tests any functions.
     # RHS this function, reference the correct thing, go
 
-    # Figure out a way to give the new ODE system the proper parameters, variables, etc.
-
-
     return new_sys
 end

src/transform/utilities.jl

@@ -90,6 +90,7 @@ function extract_terms(eqs::Vector{Equation})
         ModelingToolkit.collect_vars!(allstates, ps, eq.lhs, iv)
         ModelingToolkit.collect_vars!(allstates, ps, eq.rhs, iv)
     end
+
     return allstates, ps
 end
 
@@ -137,3 +138,41 @@ function set_bounds(sys::ODESystem, terms::Vector{Num}, bounds::Vector{Tuple{Flo
     end
     return sys
 end 
+
+function get_cvcc_start_dict(sys::ODESystem, term::Num, start_point::Float64)
+    base_name = get_name(Symbolics.value(term))
+    name_cv = String(base_name)*"_"*"cv"
+    name_cc = String(base_name)*"_"*"cc"
+
+    model_terms = Vector{Union{Term,Sym}}()
+    for i in sys.states
+        push!(model_terms, Symbolics.value(i))
+    end
+    for i in sys.ps
+        push!(model_terms, Symbolics.value(i))
+    end
+    real_cv = nothing
+    real_cc = nothing
+    for i in model_terms
+        if String(get_name(i))==name_cv
+            real_cv = i
+        elseif String(get_name(i))==name_cc
+            real_cc = i
+        end
+    end
+
+    new_dict = copy(sys.defaults)
+    if real_cv in keys(new_dict)
+        delete!(new_dict, real_cv)
+        new_dict[real_cv] = start_point
+    else
+        new_dict[real_cv] = start_point
+    end
+    if real_cc in keys(new_dict)
+        delete!(new_dict, real_cc)
+        new_dict[real_cc] = start_point
+    else
+        new_dict[real_cc] = start_point
+    end
+    return new_dict
+end