Resolve conflicts

Author: pbashyal-nmdp

grim/conf/__init__.py

@@ -25,4 +25,4 @@
 
 __author__ = """Martin Maiers"""
 __email__ = '[email protected]'
-__version__ = '0.0.6'
+__version__ = '0.0.7'

grim/imputation/__init__.py

@@ -22,4 +22,4 @@
 
 __author__ = """Martin Maiers"""
 __email__ = '[email protected]'
-__version__ = '0.0.6'
+__version__ = '0.0.7'

grim/imputation/graph_generation/__init__.py

@@ -22,4 +22,4 @@
 
 __author__ = """Martin Maiers"""
 __email__ = '[email protected]'
-__version__ = '0.0.6'
+__version__ = '0.0.7'

grim/imputation/imputegl/__init__.py

@@ -24,4 +24,4 @@
 
 __author__ = """Martin Maiers"""
 __email__ = '[email protected]'
-__version__ = '0.0.6'
+__version__ = '0.0.7'

grim/imputation/imputegl/impute.py

@@ -119,12 +119,7 @@ def clean_up_gl(gl):
 
 
 class Imputation(object):
-    __slots__ = 'logger', 'verbose', 'populations', 'netGraph', 'priorMatrix', 'full_hapl', 'index_dict', 'full_loci', \
-                'factor', '_factor_missing_data', 'cypher', 'cypher_plan_b', 'matrix_planb', 'count_by_prob', \
-                'number_of_options_threshold', 'plan', 'option_1', 'option_2', \
-                'haplotypes_number_in_phase', 'save_space_mode', 'nodes_for_plan_A', 'unk_priors'
-
-    def __init__(self, net=None,config=None,  count_by_prob=None, verbose=False):
+    def __init__(self, net=None, config=None, count_by_prob=None, verbose=False):
         """Constructor
         Intialize an instance of `Imputation` with a py2neo graph
         and a `CypherQuery` object.

grim/imputation/imputegl/networkx_graph.py

@@ -18,7 +18,7 @@ def __init__(self, config):
         self.full_loci = config["full_loci"]
         self.nodes_plan_a, self.nodes_plan_b = [], []
         if config["nodes_for_plan_A"]:
-            path = '/'.join(config["node_file"].split('/')[:-1])
+            path = ("/").join(config["node_file"].split("/")[:-1])
 
             # bug: dies if file doesn't exist
             # bug: list_f doesn't exist

grim/validation/__init__.py

@@ -22,4 +22,4 @@
 
 __author__ = """Martin Maiers"""
 __email__ = '[email protected]'
-__version__ = '0.0.6'
+__version__ = '0.0.7'