Fix #29

EnzymeML · Mar 9, 2022 · 7f70906 · 7f70906
1 parent 70f4ccb
commit 7f70906
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/pyenzyme/enzymeml/tools/enzymemlreader.py b/pyenzyme/enzymeml/tools/enzymemlreader.py
@@ -328,9 +328,14 @@ def _getSpecies(
             unit_id = species.getSubstanceUnits()
 
             if repr(init_conc) == "nan":
-                init_conc, unit_id, unit = None, None, None
-            else:
+                # Handle not existent init concs
+                init_conc = None
+
+            if unit_id:
+                # Get unit string if given
                 unit = enzmldoc.getUnitString(unit_id)
+            else:
+                unit = None
 
             # Get SBOTerm, but if there is none, give default
             ontology = self._sboterm_to_enum(species.getSBOTerm())

diff --git a/pyenzyme/enzymeml/tools/enzymemlwriter.py b/pyenzyme/enzymeml/tools/enzymemlwriter.py
@@ -572,6 +572,13 @@ def _addSpecies(
         if obj.unit and not obj._unit_id:
             obj._unit_id = self.enzmldoc._convertToUnitDef(obj.unit)
 
+        # TODO REFACTOR: Check consistency of unit
+        if obj.unit:
+            unit_id_check = self.enzmldoc._convertToUnitDef(obj.unit)
+
+            if unit_id_check != obj._unit_id:
+                obj._unit_id = unit_id_check
+
         if obj.init_conc is not None and obj._unit_id:
             species.setSubstanceUnits(obj._unit_id)
             species.setInitialConcentration(obj.init_conc)