up

Author: TorkelE

src/reactionsystem_serialisation/serialisation_support.jl

@@ -14,11 +14,11 @@ end
 # E.g `@string_prepend! str1 str_base` becomes `str_base = str1 * str_base`.
 macro string_prepend!(input, string)
     rhs = :($input * $string)
-    esc(:($string = $rhs))
+    return esc(:($string = $rhs))
 end
 macro string_prepend!(input1, input2, string)
     rhs = :($input1 * $input2 * $string)
-    esc(:($string = $rhs))
+    return esc(:($string = $rhs))
 end
 
 # Gets the character at a specific index.
@@ -51,18 +51,18 @@ function push_field(file_text::String, rn::ReactionSystem,
 
     # Adds (potential) annotation. Returns the expanded file text, and a Bool that this field was added.
     annotate && (@string_prepend! "\n\n# " get_comp_annotation(rn) write_string)
-    (file_text * write_string, true)
+    return (file_text * write_string, true)
 end
 
 # Generic function for creating an string for a unsupported argument.
 function get_unsupported_comp_string(component::String)
     @warn "Writing ReactionSystem models with $(component) is currently not supported. This field is not written to the file."
-    ""
+    return ""
 end
 
 # Generic function for creating the annotation string for an unsupported argument.
 function get_unsupported_comp_annotation(component::String)
-    "$(component): (OBS: Currently not supported, and hence empty)"
+    return "$(component): (OBS: Currently not supported, and hence empty)"
 end
 
 ### String Conversion ###
@@ -72,14 +72,14 @@ end
 function expression_2_string(expr;
         strip_call_dict = make_strip_call_dict(Symbolics.get_variables(expr)))
     strip_called_expr = substitute(expr, strip_call_dict)
-    repr(strip_called_expr)
+    return repr(strip_called_expr)
 end
 
 # Converts a vector of symbolics (e.g. the species or parameter vectors) to a string vector. Strips 
 # any calls (e.g. X(t) becomes X). E.g. a species vector [X, Y, Z] is converted to "[X, Y, Z]".
 function syms_2_strings(syms)
     strip_called_syms = [strip_call(Symbolics.unwrap(sym)) for sym in syms]
-    get_substring_end("$(convert(Vector{Any}, strip_called_syms))", 4, 0)
+    return get_substring_end("$(convert(Vector{Any}, strip_called_syms))", 4, 0)
 end
 
 # Converts a vector of symbolic variables (e.g. the species or parameter vectors) to a string

src/reactionsystem_serialisation/serialise_fields.jl

@@ -2,18 +2,18 @@
 
 # Checks if the reaction system has any independent variable. True for all valid reaction systems.
 function seri_has_iv(rn::ReactionSystem)
-    true
+    return true
 end
 
 # Extract a string which declares the system's independent variable.
 function get_iv_string(rn::ReactionSystem)
     iv_dec = MT.get_iv(rn)
-    "@variables $(iv_dec)"
+    return "@variables $(iv_dec)"
 end
 
 # Creates an annotation for the system's independent variable.
 function get_iv_annotation(rn::ReactionSystem)
-    "Independent variable:"
+    return "Independent variable:"
 end
 
 # Combines the 3 independent variable-related functions in a constant tuple.
@@ -23,17 +23,17 @@ IV_FS = (seri_has_iv, get_iv_string, get_iv_annotation)
 
 # Checks if the reaction system has any spatial independent variables.
 function seri_has_sivs(rn::ReactionSystem)
-    !isempty(get_sivs(rn))
+    return !isempty(get_sivs(rn))
 end
 
 # Extract a string which declares the system's spatial independent variables.
 function get_sivs_string(rn::ReactionSystem)
-    "spatial_ivs = @variables$(syms_2_declaration_string(get_sivs(rn)))"
+    return "spatial_ivs = @variables$(syms_2_declaration_string(get_sivs(rn)))"
 end
 
 # Creates an annotation for the system's spatial independent variables.
 function get_sivs_annotation(rn::ReactionSystem)
-    "Spatial independent variables:"
+    return "Spatial independent variables:"
 end
 
 # Combines the 3 independent variables-related functions in a constant tuple.
@@ -133,7 +133,7 @@ function handle_us_n_ps(file_text::String, rn::ReactionSystem, annotate::Bool,
     end
 
     # Merges the file text with `us_n_ps_string` and returns the final outputs.
-    file_text * us_n_ps_string, has_ps, has_sps, has_vars
+    return file_text * us_n_ps_string, has_ps, has_sps, has_vars
 end
 
 ### Handles Parameters ###
@@ -142,20 +142,20 @@ end
 
 # Checks if the reaction system has any parameters.
 function seri_has_parameters(rn::ReactionSystem)
-    !isempty(get_ps(rn))
+    return !isempty(get_ps(rn))
 end
 
 # Extract a string which declares the system's parameters. Uses multiline declaration (a 
 # `begin ... end` block) if more than 3 parameters have a "complicated" declaration (if they
 # have metadata, default value, or type designation).
 function get_parameters_string(ps)
     multiline_format = count(complicated_declaration(p) for p in ps) > 3
-    "@parameters$(syms_2_declaration_string(ps; multiline_format))"
+    return "@parameters$(syms_2_declaration_string(ps; multiline_format))"
 end
 
 # Creates an annotation for the system's parameters.
 function get_parameters_annotation(rn::ReactionSystem)
-    "Parameters:"
+    return "Parameters:"
 end
 
 ### Handles Species ###
@@ -164,20 +164,20 @@ end
 
 # Checks if the reaction system has any species.
 function seri_has_species(rn::ReactionSystem)
-    !isempty(get_species(rn))
+    return !isempty(get_species(rn))
 end
 
 # Extract a string which declares the system's species. Uses multiline declaration (a 
 # `begin ... end` block) if more than 3 species have a "complicated" declaration (if they
 # have metadata, default value, or type designation).
 function get_species_string(sps)
     multiline_format = count(complicated_declaration(sp) for sp in sps) > 3
-    "@species$(syms_2_declaration_string(sps; multiline_format))"
+    return "@species$(syms_2_declaration_string(sps; multiline_format))"
 end
 
 # Creates an annotation for the system's species.
 function get_species_annotation(rn::ReactionSystem)
-    "Species:"
+    return "Species:"
 end
 
 ### Handles Variables ###