minor bug fixes

Project.toml

@@ -1,7 +1,7 @@
 name = "FMIBase"
 uuid = "900ee838-d029-460e-b485-d98a826ceef2"
 authors = ["TT <[email protected]>", "LM <[email protected]>"]
-version = "1.0.6"
+version = "1.0.7"
 
 [deps]
 ChainRulesCore = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"

ext/DataFramesExt.jl

@@ -16,7 +16,7 @@ function DataFrames.DataFrame(solution::FMUSolution)
         df[
             !,
             Symbol(
-                valueReferenceToString(solution.component.fmu, solution.valueReferences[i]),
+                valueReferenceToString(solution.instance.fmu, solution.valueReferences[i]),
             ),
         ] = [val[i] for val in solution.values.saveval]
     end

src/snapshot.jl

@@ -20,7 +20,7 @@ function snapshot!(c::FMUInstance)
     return s
 end
 function snapshot!(sol::FMUSolution)
-    s = snapshot!(sol.component)
+    s = snapshot!(sol.instance)
     push!(sol.snapshots, s)
     return s
 end
@@ -57,7 +57,28 @@ function getSnapshot(c::Union{FMU,FMUSolution}, t::Float64; exact::Bool = false,
     # [Note] only take exact fit if we are at 0, otherwise take the next left, 
     #        because we are saving snapshots for the right root of events.
 
-    @assert t ∉ (-Inf, Inf) "t = $(t), this is not allowed for snapshot search!"
+    #@assert t ∉ (-Inf, Inf) "t = $(t), this is not allowed for snapshot search!"
+    # if t == Inf 
+    #     if length(c.snapshots) > 0
+    #         @warn "t = $(t), this is not allowed for snapshot search!\nFallback to left-most snapshot!"
+    #         left = snapshots[1]
+    #         for snapshot in c.snapshots
+    #             if snapshot.t < left.t
+    #                 left = snapshot
+    #             end
+    #         end
+    #         return left
+    #     else
+    #         @warn "t = $(t), this is not allowed for snapshot search!\nNo snapshots available, returning nothing!"
+    #         return nothing 
+    #     end
+    # end
+
+    if t ∈ (-Inf, Inf)
+        @warn "t = $(t), this is not allowed for snapshot search! Returning nothing!"
+        return nothing
+    end
+
     @assert length(c.snapshots) > 0 "No snapshots available!"
 
     left = c.snapshots[1]

src/struct.jl

@@ -417,7 +417,7 @@ Overload the Base.show() function for custom printing of the FMU2.
 function Base.show(io::IO, sol::FMUSolution)
     print(
         io,
-        "Model name:\n\t$(sol.component.fmu.modelDescription.modelName)\nSuccess:\n\t$(sol.success)\n",
+        "Model name:\n\t$(sol.instance.fmu.modelDescription.modelName)\nSuccess:\n\t$(sol.success)\n",
     )
 
     print(io, "f(x)-Evaluations:\n")