add floor and ceiling blocks with tests

Author: shobhitvoleti

docs/src/API/blocks.md

@@ -39,6 +39,8 @@ Division
 UnaryMinus
 Power
 Modulo
+Floor
+Ceil
 StaticNonLinearity
 Abs
 Sign

src/Blocks/Blocks.jl

@@ -10,7 +10,7 @@ using ModelingToolkit: getdefault, t_nounits as t, D_nounits as D
 export RealInput, RealInputArray, RealOutput, RealOutputArray, SISO
 include("utils.jl")
 
-export Gain, Sum, MatrixGain, Feedback, Add, Add3, Product, Division, Power, Modulo, UnaryMinus
+export Gain, Sum, MatrixGain, Feedback, Add, Add3, Product, Division, Power, Modulo, UnaryMinus, Floor, Ceil
 export Abs, Sign, Sqrt, Sin, Cos, Tan, Asin, Acos, Atan, Atan2, Sinh, Cosh, Tanh, Exp
 export Log, Log10
 include("math.jl")

src/Blocks/math.jl

@@ -273,85 +273,46 @@ Output the product of -1 and the input.
 end
 
 ## Rounding functions add after the symbolic functions are registered
-# """
-#     Floor(; name)
-
-# Output the floor rounding of the input.
-
-# # Connectors:
-
-#   - `input`
-#   - `output`
-# """
-# @mtkmodel Floor begin
-#     @components begin
-#         input = RealInput()
-#         output = RealOutput()
-#     end
-#     @equations begin
-#         output.u ~ floor(input.u)
-#     end
-# end
-
-# """
-#     Ceil(; name)
-
-# Output the ceiling rounding of the input.
-
-# # Connectors:
-
-#   - `input`
-#   - `output`
-# """
-# @mtkmodel Ceil begin
-#     @components begin
-#         input = RealInput()
-#         output = RealOutput()
-#     end
-#     @equations begin
-#         output.u ~ ceil(input.u)
-#     end
-# end
-
-# """
-#     Round(; name)
-
-# Output the rounding to the nearest integer of the input.
-
-# # Connectors:
-
-#   - `input`
-#   - `output`
-# """
-# @mtkmodel Round begin
-#     @components begin
-#         input = RealInput()
-#         output = RealOutput()
-#     end
-#     @equations begin
-#         output.u ~ round(input.u)
-#     end
-# end
-
-# """
-#     Trunc(; name)
-
-# Output the truncation rounding of the input.
-
-# # Connectors:
-
-#   - `input`
-#   - `output`
-# """
-# @mtkmodel Trunc begin
-#     @components begin
-#         input = RealInput()
-#         output = RealOutput()
-#     end
-#     @equations begin
-#         output.u ~ trunc(input.u)
-#     end
-# end
+"""
+    Floor(; name)
+
+Output the floor rounding of the input.
+
+# Connectors:
+
+  - `input`
+  - `output`
+"""
+@mtkmodel Floor begin
+    @components begin
+        input = RealInput()
+        output = RealOutput()
+    end
+    @equations begin
+        output.u ~ floor(input.u)
+    end
+end
+
+"""
+    Ceil(; name)
+
+Output the ceiling rounding of the input.
+
+# Connectors:
+
+  - `input`
+  - `output`
+"""
+@mtkmodel Ceil begin
+    @components begin
+        input = RealInput()
+        output = RealOutput()
+    end
+    @equations begin
+        output.u ~ ceil(input.u)
+    end
+end
+
 
 """
     StaticNonLinearity(func; name)

test/Blocks/math.jl

@@ -216,6 +216,44 @@ end
     @test sol[minu.output.u] ≈ - sin.(2 * pi * sol.t)
 end
 
+@testset "Floor" begin
+    @named c1 = Sine(; frequency = 1)
+    @named flr = Floor(;)
+    @named int = Integrator(; k = 1)
+    @named model = ODESystem(
+        [
+            connect(c1.output, flr.input),
+            connect(flr.output, int.input)
+        ],
+        t,
+        systems = [int, flr, c1])
+    sys = structural_simplify(model)
+    prob = ODEProblem(sys, Pair[int.x => 0.0], (0.0, 1.0))
+    sol = solve(prob, Rodas4())
+    @test isequal(unbound_inputs(sys), [])
+    @test sol.retcode == Success
+    @test sol[flr.output.u] ≈ floor.(sin.(2 * pi * sol.t))
+end
+
+@testset "Ceil" begin
+    @named c1 = Sine(; frequency = 1)
+    @named cel = Ceil(;)
+    @named int = Integrator(; k = 1)
+    @named model = ODESystem(
+        [
+            connect(c1.output, cel.input),
+            connect(cel.output, int.input)
+        ],
+        t,
+        systems = [int, cel, c1])
+    sys = structural_simplify(model)
+    prob = ODEProblem(sys, Pair[int.x => 0.0], (0.0, 1.0))
+    sol = solve(prob, Rodas4())
+    @test isequal(unbound_inputs(sys), [])
+    @test sol.retcode == Success
+    @test sol[cel.output.u] ≈ ceil.(sin.(2 * pi * sol.t))
+end
+
 @testset "Division" begin
     @named c1 = Sine(; frequency = 1)
     @named c2 = Constant(; k = 2)