Use registered [email protected] + Adapted all examples and tests, so that dependent packages are included via Modia.

Author: MartinOtter

Manifest.toml

@@ -108,10 +108,8 @@ version = "0.3.1"
 uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
 [[ModiaMath]]
-deps = ["DataFrames", "DataStructures", "LinearAlgebra", "Printf", "Requires", "StaticArrays", "Sundials", "Test", "Unitful"]
+deps = ["DataFrames", "DataStructures", "LinearAlgebra", "Pkg", "Printf", "Requires", "StaticArrays", "Sundials", "Test", "Unitful"]
 git-tree-sha1 = "7007013a87bfb4cd165c2df1c54ee48fff166e60"
-repo-rev = "master"
-repo-url = "ModiaMath"
 uuid = "67ccffd1-116d-535b-ad39-76a8fd0cbf71"
 version = "0.2.4"
 

examples/CauerLowPassFilter.jl

@@ -5,7 +5,12 @@ println("\nTestCauerLowPassFilter: Demonstrating the ability to simulate an elec
 
 using Modia
 using Modia.Electric
-using ModiaMath:plot
+
+# Desired:
+#   using ModiaMath: plot
+#
+# In order that ModiaMath need not to be defined in the user environment, it is included via Modia:
+using Modia.ModiaMath: plot
 
 
 @model CauerLowPassOPV begin

examples/CollidingBalls.jl

@@ -3,13 +3,20 @@ module TestBalls
 println("\nCollidingBalls: Demonstrating the use of allInstances to set up contact force between any number of balls")
 
 using Modia
-using ModiaMath:plot
+
+# Desired:
+#   using ModiaMath: plot
+#   using Test
+#   using LinearAlgebra
+#
+# In order that these packages need not to be defined in the user environment, they are included via Modia:
+using Modia.ModiaMath: plot
 
 @static if VERSION < v"0.7.0-DEV.2005"
   using Base.Test
 else
-  using Test
-  using LinearAlgebra
+  using Modia.Test
+  using Modia.LinearAlgebra
 end
 
 const k=10000

examples/CurrentController.jl

@@ -6,7 +6,13 @@ using Modia
 using Modia.Electric
 using Modia.Rotational
 using Modia.Blocks
-using ModiaMath: plot
+
+# Desired:
+#   using ModiaMath: plot
+#
+# In order that ModiaMath need not to be defined in the user environment, it is included via Modia:
+using Modia.ModiaMath: plot
+
 
 @model CurrentController begin
   k=30   # Gain of PI current controller
@@ -46,10 +52,10 @@ end
 
 #result = simulate(CurrentController, 0.1, storeEliminated=false)
 
-#=
-result = checkSimulation(CurrentController, 0.1, "load.w", 0.07929151315487117, removeSingularities=false)
-plot(result, ("currentSensor.i", "step.y", "load.w"))
-=#
+# result = checkSimulation(CurrentController, 0.1, "load.w", 0.07929151315487117, removeSingularities=false)
+# plot(result, ("currentSensor.i", "step.y", "load.w"))
+
+
 @static if VERSION < v"0.7.0-DEV.2005"
   result = checkSimulation(CurrentController, 0.1, "load.w", 0.07927285979038304, removeSingularities=true)
   plot(result, [("currentSensor.i", "step.y"), "load.w"], heading="CurrentController", figure=11)

examples/ElectricalVehicleAndCharger.jl

@@ -4,13 +4,19 @@ println("ElectricalVehicleAndCharger: Demonstrates the ability to change models
 
 using Modia
 using Modia.Electric
-using ModiaMath:plot
-
 
 using Modia:@equation
 using Modia:addEquation!
 using Modia:deleteEquation!
 
+
+# Desired:
+#   using ModiaMath: plot
+#
+# In order that ModiaMath need not to be defined in the user environment, it is included via Modia:
+using Modia.ModiaMath: plot
+
+
 # -----------------------------------
 
 function concatenateTimeSeries(result1, result2)

examples/HeatTransfer2D.jl

@@ -1,7 +1,13 @@
 module HeatTransfer2D
 
 using Modia
-using ModiaMath
+
+# Desired:
+#   using ModiaMath: plot
+#
+# In order that ModiaMath need not to be defined in the user environment, it is included via Modia:
+using Modia.ModiaMath: plot
+
 
 # Definition of model  
 const N      = 30 # 100 # Number of nodes in x-direction (same number of nodes in y-direction
@@ -83,7 +89,7 @@ end
 end 
 
 result = simulate(HeatTransfer, 30)
-#ModiaMath.plot(result, "T", figure=22)
+#plot(result, "T", figure=22)
 
 res = Dict{AbstractString,Any}()
 res["time"] = result["time"]
@@ -98,6 +104,6 @@ res[v2] = T[:, 1, div(N,2)]
 res[v3] = T[:, N, 1]
 res[v4] = T[:, 1, N]
 
-ModiaMath.plot(res, (v1, v2, v3, v4), figure=20, heading="HeatTransfer2D: N=$N, temperature [K]")
+plot(res, (v1, v2, v3, v4), figure=20, heading="HeatTransfer2D: N=$N, temperature [K]")
 
 end

examples/LinearSystems.jl

@@ -4,7 +4,13 @@ println("\nLinearSystems: Demonstrates type and size deduction.")
 
 using Modia
 using Modia.Blocks: ABCD, Switch
-using ModiaMath: plot
+
+
+# Desired:
+#   using ModiaMath: plot
+#
+# In order that ModiaMath need not to be defined in the user environment, it is included via Modia:
+using Modia.ModiaMath: plot
 
 
 @model MySISOABCD begin

examples/Rectifier.jl

@@ -4,7 +4,13 @@ println("\nRectifier: Demonstrating the ability to simulate models with state ev
 
 using Modia
 using Modia.Electric
-using ModiaMath: plot
+
+# Desired:
+#   using ModiaMath: plot
+#
+# In order that ModiaMath need not to be defined in the user environment, it is included via Modia:
+using Modia.ModiaMath: plot
+
 
 @model Rectifier begin
   R=Resistor(R=1)

examples/SynchronousExamples.jl

@@ -4,12 +4,18 @@ println("\nSynchronousExamples: Demonstrating the ability to simulate models wit
 
 using Modia
 using Modia.Synchronous: sample, Clock, previous, hold
-using ModiaMath:plot
+
+# Desired:
+#   using ModiaMath: plot
+#   using Test
+#
+# In order that these packages need not to be defined in the user environment, they are included via Modia:
+using Modia.ModiaMath: plot
 
 @static if VERSION < v"0.7.0-DEV.2005"
     using Base.Test
 else
-    using Test
+    using Modia.Test
 end
 
 @testset "Synchronous" begin

examples/runexamples.jl

@@ -21,8 +21,8 @@ include("LinearSystems.jl")
 include("SynchronousExamples.jl")
 @static if VERSION < v"0.7.0-DEV.2005"
   include("ElectricalVehicleAndCharger.jl") # Problem in 1.0
-  include("CollidingBalls.jl")
 end
+include("CollidingBalls.jl")
 include("HeatTransfer2D.jl")
 
 Modia.ModiaLogging.printTestStatus()