Merge pull request #143 from ModiaSim/mo_bug_fix_bool_conversion

Bug fix: Do not convert Bool or Int (without units) to FloatType

Author: MartinOtter

Project.toml

@@ -1,7 +1,7 @@
 authors = ["Hilding Elmqvist <[email protected]>", "Martin Otter <[email protected]>"]
 name = "Modia"
 uuid = "cb905087-75eb-5f27-8515-1ce0ec8e839e"
-version = "0.8.2"
+version = "0.8.3"
 
 [compat]
 DataFrames = "1"

docs/src/index.md

@@ -36,6 +36,12 @@ functionalities of these packages.
 
 ## Release Notes
 
+### Version 0.8.3
+
+- Bug fix: Parameters that are Numbers, but not AbstractFloats, and have no unit defined, 
+  e.g. a Bool or an Int parameter, are no longer converted to FloatType in the generated Code.
+  
+
 ### Version 0.8.2
 
 - New exported functions

src/Symbolic.jl

@@ -79,9 +79,14 @@ function addCastAndTypeCheck(ex,value,FloatType)
                     addCastAndTypeCheckBasicValueType(ex,value,T)
                 end
 
-            else
-                # FloatType is neither Measurements nor MonteCarloMeasurements
+            elseif valueType <: AbstractFloat || isQuantity(valueType)
+                # FloatType is neither Measurements nor MonteCarloMeasurements and
+                # is either an AbstractFloat or has a unit (is treated as Float)
                 addCastAndTypeCheckBasicValueType(ex,value,T)
+                
+            else
+                # For example Bool or Int values: No conversion, just define the type in the code
+                :( ($ex)::$valueType )
             end            
         else
             # Numeric array