Small fixes regarding fixed and flow attributes

Author: HildingElmqvist

src/language/Instantiation.jl

@@ -208,6 +208,12 @@ function Base.show(io::IO, v::Variable)
         first = false
     end
 
+    if v.fixed != nothing
+        if !first; print(io, ", ") end
+        print(io, "fixed = ", v.fixed)
+        first = false
+    end
+
     if v.nominal != nothing
         if !first; print(io, ", ") end
         print(io, "nominal = ", v.nominal)

src/symbolic/StructuralTransform.jl

@@ -745,7 +745,7 @@ function transformStructurally(flat_model)
 
     nFlow = 0
     for (n, v) in unknowns
-        if v.flow
+        if v.flow != nothing && v.flow
             nFlow += 1
         end
     end

src/symbolic/Utilities.jl

@@ -164,7 +164,7 @@ function showVariable(v)
             first = false
         end
 
-        if v.flow != false
+        if v.flow != nothing
             if !first; logModia(", ") end
             logModia("flow = ", v.flow)
             first = false