V0.12.1 (#134)

* Update Project.toml * Update scheduler.jl pass through for print keyword * pull down FMIZoo compat for testing * workshop initial * rm backup file
ThummeTo · Jul 4, 2024 · 4f425a1 · 4f425a1 · ThummeTo · Jul 4, 2024
1 parent 4a35090
commit 4f425a1
Show file tree

Hide file tree

Showing 11 changed files with 4,532 additions and 4,083 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "FMIFlux"
 uuid = "fabad875-0d53-4e47-9446-963b74cae21f"
-version = "0.12.0"
+version = "0.12.1"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"

diff --git a/examples/pluto-src/HybridModelingUsingFMI/HybridModelingUsingFMI.jl b/examples/pluto-src/HybridModelingUsingFMI/HybridModelingUsingFMI.jl
diff --git a/examples/pluto-src/SciMLUsingFMUs/SciMLUsingFMUs.jl b/examples/pluto-src/SciMLUsingFMUs/SciMLUsingFMUs.jl
diff --git a/...ridModelingUsingFMI/src/plan_complete.png → ...-src/SciMLUsingFMUs/src/plan_complete.png b/...ridModelingUsingFMI/src/plan_complete.png → ...-src/SciMLUsingFMUs/src/plan_complete.png
diff --git a/...rc/HybridModelingUsingFMI/src/plan_e1.png → .../pluto-src/SciMLUsingFMUs/src/plan_e1.png b/...rc/HybridModelingUsingFMI/src/plan_e1.png → .../pluto-src/SciMLUsingFMUs/src/plan_e1.png
diff --git a/...rc/HybridModelingUsingFMI/src/plan_e2.png → .../pluto-src/SciMLUsingFMUs/src/plan_e2.png b/...rc/HybridModelingUsingFMI/src/plan_e2.png → .../pluto-src/SciMLUsingFMUs/src/plan_e2.png
diff --git a/...rc/HybridModelingUsingFMI/src/plan_e3.png → .../pluto-src/SciMLUsingFMUs/src/plan_e3.png b/...rc/HybridModelingUsingFMI/src/plan_e3.png → .../pluto-src/SciMLUsingFMUs/src/plan_e3.png
diff --git a/...HybridModelingUsingFMI/src/plan_train.png → ...uto-src/SciMLUsingFMUs/src/plan_train.png b/...HybridModelingUsingFMI/src/plan_train.png → ...uto-src/SciMLUsingFMUs/src/plan_train.png
diff --git a/src/scheduler.jl b/src/scheduler.jl
@@ -206,7 +206,7 @@ mutable struct SequentialScheduler <: BatchScheduler
     end
 end
 
-function initialize!(scheduler::BatchScheduler; runkwargs...)
+function initialize!(scheduler::BatchScheduler; print::Bool=true, runkwargs...)
 
     lastIndex = 0
     scheduler.step = 0
@@ -216,7 +216,7 @@ function initialize!(scheduler::BatchScheduler; runkwargs...)
         scheduler.runkwargs = runkwargs
     end
 
-    scheduler.elementIndex = apply!(scheduler)
+    scheduler.elementIndex = apply!(scheduler; print=print)
 
     if scheduler.plotStep > 0
         plot(scheduler, lastIndex)
@@ -230,7 +230,7 @@ function update!(scheduler::BatchScheduler; print::Bool=true)
     scheduler.step += 1
 
     if scheduler.applyStep > 0 && scheduler.step % scheduler.applyStep == 0
-        scheduler.elementIndex = apply!(scheduler)
+        scheduler.elementIndex = apply!(scheduler; print=print)
     end
 
     # max/avg error 
@@ -491,4 +491,4 @@ function apply!(scheduler::SequentialScheduler; print::Bool=true)
     end
 
     return next
-end
+end
diff --git a/test/Project.toml b/test/Project.toml
@@ -8,3 +8,6 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[compat]
+FMIZoo = "0.3.0"
diff --git a/test/hybrid_ME_dis.jl b/test/hybrid_ME_dis.jl
@@ -146,8 +146,8 @@ for solver in solvers
                 net = nets[i]
                 problem = ME_NeuralFMU(fmu, net, (t_start, t_stop), solver) 
 
-                if i ∈ (3, 4, 6)
-                    @warn "Currently skipping nets ∈ (3, 4, 6)"
+                if i ∈ (1, 2, 3, 4, 6)
+                    @warn "Currently skipping nets ∈ (1, 2, 3, 4, 6)"
                     continue
                 end