changed order of lipid_fa_types

lifs-tools · Dec 6, 2022 · 181c971 · 181c971
1 parent e92f331
commit 181c971
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/cppgoslin/domain/LipidEnums.h b/cppgoslin/domain/LipidEnums.h
@@ -95,7 +95,8 @@ struct LipidClassMeta {
 
 
 typedef map<LipidClass, LipidClassMeta> ClassMap;
-enum LipidFaBondType { LCB_REGULAR, LCB_EXCEPTION, ETHER_PLASMANYL, ETHER_PLASMENYL, ETHER, ETHER_UNSPECIFIED, ESTER, AMIDE, NO_FA, UNDEFINED_FA, };
+enum LipidFaBondType { UNDEFINED_FA = 0, ETHER_PLASMANYL = 1, ETHER_PLASMENYL = 2, ETHER = 3, ESTER = 4, LCB_REGULAR = 5, LCB_EXCEPTION = 6,  AMIDE = 7, ETHER_UNSPECIFIED = 8, NO_FA = 9};
+
 
 static const set<LipidFaBondType> LCB_STATES {LCB_REGULAR, LCB_EXCEPTION};
 

diff --git a/src/domain/Headgroup.cpp b/src/domain/Headgroup.cpp
@@ -151,7 +151,7 @@ string Headgroup::get_lipid_string(LipidLevel level){
     }
 
     stringstream headgoup_string;
-            
+
     // adding prefixes to the headgroup
     if (!is_level(level, COMPLETE_STRUCTURE | FULL_STRUCTURE | STRUCTURE_DEFINED)){
         vector<HeadgroupDecorator*> decorators_tmp;
@@ -182,10 +182,9 @@ string Headgroup::get_lipid_string(LipidLevel level){
 
     // adding headgroup
     headgoup_string << hgs;
-
     // ading suffixes to the headgroup
     for (auto hgd : *decorators){
-        if (hgd->suffix){
+        if (hgd != 0 && hgd->suffix){
             headgoup_string << hgd->to_string(level);
         }
     }

diff --git a/src/domain/LipidMolecularSpecies.cpp b/src/domain/LipidMolecularSpecies.cpp
@@ -54,9 +54,9 @@ string LipidMolecularSpecies::build_lipid_subspecies_name(LipidLevel level){
 
     string fa_separator = (level != MOLECULAR_SPECIES || headgroup->lipid_category == SP) ? "/" : "_";
     stringstream lipid_name;
+
     lipid_name << headgroup->get_lipid_string(level);
 
-
     string fa_headgroup_separator = (headgroup->lipid_category != ST) ? " " : "/";
 
     switch (level){