Fix method definition override (#114)

OpenModelica · Nov 21, 2023 · 3b97b91 · 3b97b91
1 parent 55da8d9
commit 3b97b91
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 63 deletions.
diff --git a/src/api.jl b/src/api.jl
@@ -451,7 +451,7 @@ module API
         generatedFileName = OMJulia.sendExpression(omc, exp)
 
         if !isfile(generatedFileName) || !endswith(generatedFileName, ".fmu")
-            throw(ScriptingError(omc, msg = "Failed to load file $(modelicaString(fileName))."))
+            throw(ScriptingError(omc, msg = "Failed to load file $(modelicaString(generatedFileName))."))
         end
         return generatedFileName
     end

diff --git a/src/modelicaSystem.jl b/src/modelicaSystem.jl
@@ -69,8 +69,8 @@ ModelicaSystem(mod, "BouncingBall.mo", "BouncingBall", ["Modelica", "SystemDynam
 See also [`OMCSession()`](@ref).
 """
 function ModelicaSystem(omc::OMCSession,
-                        fileName::AbstractString = nothing,
-                        modelName::AbstractString = nothing,
+                        fileName::Union{AbstractString, Nothing},
+                        modelName::AbstractString,
                         library::Union{<:AbstractString, Tuple{<:AbstractString, <:AbstractString}, Array{<:AbstractString}, Array{Tuple{<:AbstractString, <:AbstractString}}, Nothing} = nothing;
                         commandLineOptions::Union{<:AbstractString, Nothing} = nothing,
                         variableFilter::Union{<:AbstractString, Nothing} = nothing)
@@ -84,12 +84,14 @@ function ModelicaSystem(omc::OMCSession,
     sendExpression(omc, "setCommandLineOptions(\"--linearizationDumpLanguage=julia\")")
     sendExpression(omc, "setCommandLineOptions(\"--generateSymbolicLinearization\")")
 
-    omc.filepath = fileName
     omc.modelname = modelName
     omc.variableFilter = variableFilter
 
     #loadFile and set temporary directory
-    loadFile(omc, fileName)
+    if !isnothing(fileName)
+        omc.filepath = fileName
+        loadFile(omc, fileName)
+    end
 
     #set temp directory for each modelica session
     setTempDirectory(omc)
@@ -136,35 +138,13 @@ ModelicaSystem(mod, modelName="Modelica.Electrical.Analog.Examples.CauerLowPassA
 See also [`OMCSession()`](@ref).
 """
 function ModelicaSystem(omc::OMCSession;
-    modelName::AbstractString=nothing,
-    library::Union{<:AbstractString,Tuple{<:AbstractString,<:AbstractString},Array{<:AbstractString},Array{Tuple{<:AbstractString,<:AbstractString}},Nothing}=nothing,
-    commandLineOptions::Union{<:AbstractString,Nothing}=nothing,
-    variableFilter::Union{<:AbstractString,Nothing}=nothing)
-
-    if isnothing(modelName)
-        return println("\"ModelicaSystem()\" constructor requires modelName")
-    end
-
-    ## check for commandLineOptions
-    setCommandLineOptions(omc, commandLineOptions)
-
-    ## set default command Line Options for linearization as
-    ## linearize() will use the simulation executable and runtime
-    ## flag -l to perform linearization
-    sendExpression(omc, "setCommandLineOptions(\"--linearizationDumpLanguage=julia\")")
-    sendExpression(omc, "setCommandLineOptions(\"--generateSymbolicLinearization\")")
-
-    omc.modelname = modelName
-    omc.variableFilter = variableFilter
-
-    #set temp directory for each modelica session
-    setTempDirectory(omc)
-
-    #load Libraries provided by users
-    loadLibrary(omc, library)
+                        fileName::Union{AbstractString, Nothing} = nothing,
+                        modelName::AbstractString,
+                        library::Union{<:AbstractString,Tuple{<:AbstractString,<:AbstractString},Array{<:AbstractString},Array{Tuple{<:AbstractString,<:AbstractString}},Nothing} = nothing,
+                        commandLineOptions::Union{<:AbstractString,Nothing} = nothing,
+                        variableFilter::Union{<:AbstractString,Nothing} = nothing)
 
-    # build the model
-    buildModel(omc)
+    ModelicaSystem(omc, fileName, modelName, library; commandLineOptions=commandLineOptions, variableFilter=variableFilter)
 end
 
 
@@ -199,36 +179,42 @@ function setTempDirectory(omc::OMCSession)
     sendExpression(omc, "cd(\"" * omc.tempdir * "\")")
 end
 
-function loadLibrary(omc::OMCSession, library::Union{<:AbstractString, Tuple{<:AbstractString, <:AbstractString}, Array{<:AbstractString}, Array{Tuple{<:AbstractString, <:AbstractString}}, Nothing} = nothing)
-    #load Libraries provided by users
-    if !isnothing(library)
-        if isa(library, AbstractString)
-            loadLibraryHelper(omc, library)
-        # allow users to provide library version e.g. ("Modelica", "3.2.3")
-        elseif isa(library, Tuple{AbstractString, AbstractString})
-            if !isempty(library[2])
-                loadLibraryHelper(omc, library[1], library[2])
-            else
-                loadLibraryHelper(omc, library[1])
-            end
-        elseif isa(library, Array)
-            for i in library
-                # allow users to provide library version e.g. ("Modelica", "3.2.3")
-                if isa(i, Tuple{AbstractString, AbstractString})
-                    if !isempty(i[2])
-                        loadLibraryHelper(omc, i[1], i[2])
-                    else
-                        loadLibraryHelper(omc, i[1])
-                    end
-                elseif isa(i, AbstractString)
-                    loadLibraryHelper(omc, i)
+"""
+    loadLibrary(omc, library)
+
+Load libraries.
+"""
+function loadLibrary(omc::OMCSession, library::Union{<:AbstractString, Tuple{<:AbstractString, <:AbstractString}, Array{<:AbstractString}, Array{Tuple{<:AbstractString, <:AbstractString}}, Nothing})
+    if isnothing(library)
+        return
+    end
+
+    if isa(library, AbstractString)
+        loadLibraryHelper(omc, library)
+    # allow users to provide library version e.g. ("Modelica", "3.2.3")
+    elseif isa(library, Tuple{AbstractString, AbstractString})
+        if !isempty(library[2])
+            loadLibraryHelper(omc, library[1], library[2])
+        else
+            loadLibraryHelper(omc, library[1])
+        end
+    elseif isa(library, Array)
+        for i in library
+            # allow users to provide library version e.g. ("Modelica", "3.2.3")
+            if isa(i, Tuple{AbstractString, AbstractString})
+                if !isempty(i[2])
+                    loadLibraryHelper(omc, i[1], i[2])
                 else
-                    error("Unknown type detected in input argument library[$i]. Is of type $(typeof(i))")
+                    loadLibraryHelper(omc, i[1])
                 end
+            elseif isa(i, AbstractString)
+                loadLibraryHelper(omc, i)
+            else
+                error("Unknown type detected in input argument library[$i]. Is of type $(typeof(i))")
             end
-        else
-            error("Unknown type detected in input argument library[$i]. Is of type $(typeof(i))")
         end
+    else
+        error("Unknown type detected in input argument library[$i]. Is of type $(typeof(i))")
     end
 end
 

diff --git a/test/apiTest.jl b/test/apiTest.jl
@@ -48,12 +48,11 @@ import OMJulia
     @test_throws OMJulia.API.ScriptingError OMJulia.API.cd(omc, "this/is/not/a/valid/directory/I/hope/otherwise/our/test/does/some/wild/stuff")
 
     dir = OMJulia.API.cd(omc, workdir)
-    result2 = OMJulia.API.buildModel(omc, "BouncingBall")
-    @test result2[2] == "BouncingBall_init.xml"
-    result2 = OMJulia.API.buildModel(omc, "BouncingBall")
-    @test result2[2] == "BouncingBall_init.xml"
+    result = OMJulia.API.buildModel(omc, "BouncingBall")
+    @test result[2] == "BouncingBall_init.xml"
     resultfile = joinpath(workdir, "BouncingBall_res.mat")
 
+    foreach(rm, readdir(workdir, join=true)) # Remove simulation artifacts from previous buildModel
     OMJulia.API.simulate(omc, "BouncingBall")
     @test isfile(resultfile)