fix argument order and count for piecewise function

Fixes #112
LCSB-BioCore · Jul 10, 2021 · b276ed4 · b276ed4
1 parent 00b48fb
commit b276ed4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/symbolics.jl b/src/symbolics.jl
@@ -45,7 +45,7 @@ const default_symbolics_mapping = Dict{String,Any}(
     "ln" => :log,
     "log" => :sbmlLog,
     "lt" => :<,
-    "piecewise" => :(Core.ifelse),
+    "piecewise" => :(sbmlPiecewise),
     "power" => :^,
     "root" => :sbmlRoot,
     "sech" => :sech,
@@ -56,6 +56,17 @@ const default_symbolics_mapping = Dict{String,Any}(
     "tan" => :tan,
 )
 
+function sbmlPiecewise(args...)
+    if length(args) == 1
+        args[1]
+    elseif length(args) >= 3
+        Core.ifelse(args[2], args[1], sbmlPiecewise(args[3:end]...))
+    else
+        throw(AssertionError("malformed piecewise SBML function"))
+    end
+end
+
+
 sbmlLog(x) = log(x, 10)
 sbmlLog(base, x) = log(base, x)
 

diff --git a/test/symbolics.jl b/test/symbolics.jl
@@ -30,8 +30,8 @@
     test = SBML.MathApply(
         "piecewise",
         SBML.Math[
-            SBML.MathApply("lt", SBML.Math[SBML.MathVal(1), SBML.MathVal(0)]),
             SBML.MathVal(123),
+            SBML.MathApply("lt", SBML.Math[SBML.MathVal(1), SBML.MathVal(0)]),
             SBML.MathVal(456),
         ],
     )