adjust descriptor results to new lazar lib

1 files changed, 100 insertions, 100 deletions

diff --git a/test/data/test_03_post_descriptor_file.result b/test/data/test_03_post_descriptor_file.result
index 13dff4f..b47f702 100644
--- a/test/data/test_03_post_descriptor_file.result
+++ b/test/data/test_03_post_descriptor_file.result
@@ -2,151 +2,151 @@
   {
     "SMILES": "CC=O",
     "Openbabel.logP": "0.2052",
-    "Cdk.AtomCount.nAtom": "7.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "1.0",
-    "Cdk.CarbonTypes.C2SP2": "0.0",
-    "Cdk.CarbonTypes.C3SP2": "0.0",
-    "Cdk.CarbonTypes.C1SP3": "1.0",
-    "Cdk.CarbonTypes.C2SP3": "0.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "7",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "1",
+    "Cdk.CarbonTypes.C2SP2": "0",
+    "Cdk.CarbonTypes.C3SP2": "0",
+    "Cdk.CarbonTypes.C1SP3": "1",
+    "Cdk.CarbonTypes.C2SP3": "0",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": "0.7679"
   },
   {
     "SMILES": "CC(=O)Nc1ccc2c(c1)Cc1c2cccc1",
     "Openbabel.logP": "3.2892",
-    "Cdk.AtomCount.nAtom": "30.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "1.0",
-    "Cdk.CarbonTypes.C2SP2": "8.0",
-    "Cdk.CarbonTypes.C3SP2": "4.0",
-    "Cdk.CarbonTypes.C1SP3": "1.0",
-    "Cdk.CarbonTypes.C2SP3": "1.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "30",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "1",
+    "Cdk.CarbonTypes.C2SP2": "8",
+    "Cdk.CarbonTypes.C3SP2": "4",
+    "Cdk.CarbonTypes.C1SP3": "1",
+    "Cdk.CarbonTypes.C2SP3": "1",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": "5.3165"
   },
   {
     "SMILES": "NC(=O)/C(=C\\c1ccc(o1)[N+](=O)[O-])/c1ccco1",
     "Openbabel.logP": "3.0302",
-    "Cdk.AtomCount.nAtom": "26.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "3.0",
-    "Cdk.CarbonTypes.C2SP2": "7.0",
-    "Cdk.CarbonTypes.C3SP2": "1.0",
-    "Cdk.CarbonTypes.C1SP3": "0.0",
-    "Cdk.CarbonTypes.C2SP3": "0.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "26",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "3",
+    "Cdk.CarbonTypes.C2SP2": "7",
+    "Cdk.CarbonTypes.C3SP2": "1",
+    "Cdk.CarbonTypes.C1SP3": "0",
+    "Cdk.CarbonTypes.C2SP3": "0",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": "3.6734"
   },
   {
     "SMILES": "Nc1n[nH]cn1",
     "Openbabel.logP": "-0.0319",
-    "Cdk.AtomCount.nAtom": "10.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "0.0",
-    "Cdk.CarbonTypes.C2SP2": "0.0",
-    "Cdk.CarbonTypes.C3SP2": "0.0",
-    "Cdk.CarbonTypes.C1SP3": "0.0",
-    "Cdk.CarbonTypes.C2SP3": "0.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "10",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "0",
+    "Cdk.CarbonTypes.C2SP2": "0",
+    "Cdk.CarbonTypes.C3SP2": "0",
+    "Cdk.CarbonTypes.C1SP3": "0",
+    "Cdk.CarbonTypes.C2SP3": "0",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": "0.7337"
   },
   {
     "SMILES": "[O-][Br](=O)=O.[K+]",
     "Openbabel.logP": "0.4892",
-    "Cdk.AtomCount.nAtom": "2.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "0.0",
-    "Cdk.CarbonTypes.C2SP2": "0.0",
-    "Cdk.CarbonTypes.C3SP2": "0.0",
-    "Cdk.CarbonTypes.C1SP3": "0.0",
-    "Cdk.CarbonTypes.C2SP3": "0.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "2",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "0",
+    "Cdk.CarbonTypes.C2SP2": "0",
+    "Cdk.CarbonTypes.C3SP2": "0",
+    "Cdk.CarbonTypes.C1SP3": "0",
+    "Cdk.CarbonTypes.C2SP3": "0",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": "-5.9945"
   },
   {
     "SMILES": "[Cl-].[Cl-].[Cd+2]",
     "Openbabel.logP": "-5.9945",
-    "Cdk.AtomCount.nAtom": "3.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "0.0",
-    "Cdk.CarbonTypes.C2SP2": "0.0",
-    "Cdk.CarbonTypes.C3SP2": "0.0",
-    "Cdk.CarbonTypes.C1SP3": "0.0",
-    "Cdk.CarbonTypes.C2SP3": "0.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "3",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "0",
+    "Cdk.CarbonTypes.C2SP2": "0",
+    "Cdk.CarbonTypes.C3SP2": "0",
+    "Cdk.CarbonTypes.C1SP3": "0",
+    "Cdk.CarbonTypes.C2SP3": "0",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": "-0.2597"
   },
   {
     "SMILES": "[O-]S(=O)(=O)[O-].[Cd+2]",
     "Openbabel.logP": "-0.2597",
-    "Cdk.AtomCount.nAtom": "6.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "0.0",
-    "Cdk.CarbonTypes.C2SP2": "0.0",
-    "Cdk.CarbonTypes.C3SP2": "0.0",
-    "Cdk.CarbonTypes.C1SP3": "0.0",
-    "Cdk.CarbonTypes.C2SP3": "0.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "6",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "0",
+    "Cdk.CarbonTypes.C2SP2": "0",
+    "Cdk.CarbonTypes.C3SP2": "0",
+    "Cdk.CarbonTypes.C1SP3": "0",
+    "Cdk.CarbonTypes.C2SP3": "0",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": "5.0725"
   },
   {
     "SMILES": "OC(=O)CSc1nc(cc(n1)Cl)Nc1cccc(c1C)C",
     "Openbabel.logP": "3.7401",
-    "Cdk.AtomCount.nAtom": "35.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "3.0",
-    "Cdk.CarbonTypes.C2SP2": "5.0",
-    "Cdk.CarbonTypes.C3SP2": "2.0",
-    "Cdk.CarbonTypes.C1SP3": "3.0",
-    "Cdk.CarbonTypes.C2SP3": "0.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "35",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "3",
+    "Cdk.CarbonTypes.C2SP2": "5",
+    "Cdk.CarbonTypes.C3SP2": "2",
+    "Cdk.CarbonTypes.C1SP3": "3",
+    "Cdk.CarbonTypes.C2SP3": "0",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": "2.2807"
   },
   {
     "SMILES": "COCCl",
     "Openbabel.logP": "0.8291",
-    "Cdk.AtomCount.nAtom": "9.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "0.0",
-    "Cdk.CarbonTypes.C2SP2": "0.0",
-    "Cdk.CarbonTypes.C3SP2": "0.0",
-    "Cdk.CarbonTypes.C1SP3": "0.0",
-    "Cdk.CarbonTypes.C2SP3": "0.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "9",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "0",
+    "Cdk.CarbonTypes.C2SP2": "0",
+    "Cdk.CarbonTypes.C3SP2": "0",
+    "Cdk.CarbonTypes.C1SP3": "0",
+    "Cdk.CarbonTypes.C2SP3": "0",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": "2.5399"
   },
   {
     "SMILES": "C=CC(=C)Cl",
     "Openbabel.logP": "1.9249",
-    "Cdk.AtomCount.nAtom": "10.0",
-    "Cdk.CarbonTypes.C1SP1": "0.0",
-    "Cdk.CarbonTypes.C2SP1": "0.0",
-    "Cdk.CarbonTypes.C1SP2": "2.0",
-    "Cdk.CarbonTypes.C2SP2": "2.0",
-    "Cdk.CarbonTypes.C3SP2": "0.0",
-    "Cdk.CarbonTypes.C1SP3": "0.0",
-    "Cdk.CarbonTypes.C2SP3": "0.0",
-    "Cdk.CarbonTypes.C3SP3": "0.0",
-    "Cdk.CarbonTypes.C4SP3": "0.0",
+    "Cdk.AtomCount.nAtom": "10",
+    "Cdk.CarbonTypes.C1SP1": "0",
+    "Cdk.CarbonTypes.C2SP1": "0",
+    "Cdk.CarbonTypes.C1SP2": "2",
+    "Cdk.CarbonTypes.C2SP2": "2",
+    "Cdk.CarbonTypes.C3SP2": "0",
+    "Cdk.CarbonTypes.C1SP3": "0",
+    "Cdk.CarbonTypes.C2SP3": "0",
+    "Cdk.CarbonTypes.C3SP3": "0",
+    "Cdk.CarbonTypes.C4SP3": "0",
     "Joelib.LogP": null
   }
 ]