Fixed bug. indv -> inds

jaredgk · Nov 19, 2020 · 9a526cd · 9a526cd
1 parent ad2eaf8
commit 9a526cd
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/pgpipe/model.py b/pgpipe/model.py
@@ -373,7 +373,7 @@ def to_json (self):
 
             pop_json[pop] = OrderedDict()
 
-            pop_json[pop]['indv'] = self.ind_dict[pop]
+            pop_json[pop]['inds'] = self.ind_dict[pop]
 
         model_json['pops'] = pop_json
 

diff --git a/tests/exp_output/model_creator.example_1.model b/tests/exp_output/model_creator.example_1.model
@@ -4,7 +4,7 @@
         "tree": "",
         "pops": {
             "Paniscus": {
-                "indv": [
+                "inds": [
                     "Pan_paniscus-9731_LB502"
                 ]
             }

diff --git a/tests/exp_output/model_creator.example_2.model b/tests/exp_output/model_creator.example_2.model
@@ -4,7 +4,7 @@
         "tree": "",
         "pops": {
             "Paniscus": {
-                "indv": [
+                "inds": [
                     "Pan_paniscus-9731_LB502",
                     "Pan_paniscus-A914_Hortense",
                     "Pan_paniscus-A915_Kosana",
@@ -21,7 +21,7 @@
                 ]
             },
             "Troglodytes": {
-                "indv": [
+                "inds": [
                     "Pan_troglodytes_troglodytes-A957_Vaillant",
                     "Pan_troglodytes_troglodytes-A958_Doris",
                     "Pan_troglodytes_troglodytes-A959_Julie",

diff --git a/tests/exp_output/model_creator.example_3.model b/tests/exp_output/model_creator.example_3.model
@@ -4,7 +4,7 @@
         "tree": "",
         "pops": {
             "Paniscus": {
-                "indv": [
+                "inds": [
                     "Pan_paniscus-9731_LB502",
                     "Pan_paniscus-A914_Hortense",
                     "Pan_paniscus-A915_Kosana",
@@ -27,7 +27,7 @@
         "tree": "",
         "pops": {
             "Paniscus": {
-                "indv": [
+                "inds": [
                     "Pan_paniscus-9731_LB502",
                     "Pan_paniscus-A914_Hortense",
                     "Pan_paniscus-A915_Kosana",
@@ -44,7 +44,7 @@
                 ]
             },
             "Schweinfurthii": {
-                "indv": [
+                "inds": [
                     "Pan_troglodytes_schweinfurthii-100037_Vincent",
                     "Pan_troglodytes_schweinfurthii-100040_Andromeda",
                     "Pan_troglodytes_schweinfurthii-9729_Harriet",
@@ -60,7 +60,7 @@
         "tree": "",
         "pops": {
             "Paniscus": {
-                "indv": [
+                "inds": [
                     "Pan_paniscus-9731_LB502",
                     "Pan_paniscus-A914_Hortense",
                     "Pan_paniscus-A915_Kosana",
@@ -77,15 +77,15 @@
                 ]
             },
             "Troglodytes": {
-                "indv": [
+                "inds": [
                     "Pan_troglodytes_troglodytes-A957_Vaillant",
                     "Pan_troglodytes_troglodytes-A958_Doris",
                     "Pan_troglodytes_troglodytes-A959_Julie",
                     "Pan_troglodytes_troglodytes-A960_Clara"
                 ]
             },
             "Schweinfurthii": {
-                "indv": [
+                "inds": [
                     "Pan_troglodytes_schweinfurthii-100037_Vincent",
                     "Pan_troglodytes_schweinfurthii-100040_Andromeda",
                     "Pan_troglodytes_schweinfurthii-9729_Harriet",

diff --git a/tests/exp_output/model_creator.example_4.model b/tests/exp_output/model_creator.example_4.model
@@ -4,7 +4,7 @@
         "tree": "",
         "pops": {
             "Paniscus": {
-                "indv": [
+                "inds": [
                     "Pan_paniscus-A914_Hortense",
                     "Pan_paniscus-A915_Kosana",
                     "Pan_paniscus-A917_Dzeeta",
@@ -27,7 +27,7 @@
         "tree": "",
         "pops": {
             "Paniscus": {
-                "indv": [
+                "inds": [
                     "Pan_paniscus-A914_Hortense",
                     "Pan_paniscus-A915_Kosana",
                     "Pan_paniscus-A917_Dzeeta",
@@ -44,7 +44,7 @@
                 ]
             },
             "Troglodytes": {
-                "indv": [
+                "inds": [
                     "Pan_troglodytes_troglodytes-A957_Vaillant",
                     "Pan_troglodytes_troglodytes-A958_Doris",
                     "Pan_troglodytes_troglodytes-A959_Julie",
@@ -58,7 +58,7 @@
         "tree": "",
         "pops": {
             "Paniscus": {
-                "indv": [
+                "inds": [
                     "Pan_paniscus-A914_Hortense",
                     "Pan_paniscus-A915_Kosana",
                     "Pan_paniscus-A917_Dzeeta",
@@ -75,15 +75,15 @@
                 ]
             },
             "Troglodytes": {
-                "indv": [
+                "inds": [
                     "Pan_troglodytes_troglodytes-A957_Vaillant",
                     "Pan_troglodytes_troglodytes-A958_Doris",
                     "Pan_troglodytes_troglodytes-A959_Julie",
                     "Pan_troglodytes_troglodytes-A960_Clara"
                 ]
             },
             "Schweinfurthii": {
-                "indv": [
+                "inds": [
                     "Pan_troglodytes_schweinfurthii-100037_Vincent",
                     "Pan_troglodytes_schweinfurthii-100040_Andromeda",
                     "Pan_troglodytes_schweinfurthii-9729_Harriet",