Fix bug where the models were not initialized properly

random_survival_forest/Node.py

@@ -5,15 +5,6 @@
 
 class Node:
 
-    score = 0
-    split_val = None
-    split_var = None
-    lhs = None
-    rhs = None
-    chf = None
-    chf_terminal = None
-    terminal = False
-
     def __init__(self, x, y, tree, f_idxs, n_features, timeline, unique_deaths=3, min_leaf=3, random_state=None):
         """
         A Node of the Survival Tree.
@@ -36,6 +27,14 @@ def __init__(self, x, y, tree, f_idxs, n_features, timeline, unique_deaths=3, mi
         self.unique_deaths = unique_deaths
         self.random_state = random_state
         self.min_leaf = min_leaf
+        self.score = 0
+        self.split_val = None
+        self.split_var = None
+        self.lhs = None
+        self.rhs = None
+        self.chf = None
+        self.chf_terminal = None
+        self.terminal = False
         self.grow_tree()
 
     def grow_tree(self):

random_survival_forest/RandomSurvivalForest.py

@@ -7,12 +7,6 @@
 
 
 class RandomSurvivalForest:
-    bootstrap_idxs = None
-    bootstraps = []
-    oob_idxs = None
-    oob_score = None
-    trees = []
-    random_states = []
 
     def __init__(self, timeline, n_estimators=100, min_leaf=3, unique_deaths=3, n_jobs=None, random_state=None):
         """
@@ -31,6 +25,12 @@ def __init__(self, timeline, n_estimators=100, min_leaf=3, unique_deaths=3, n_jo
         self.unique_deaths = unique_deaths
         self.n_jobs = n_jobs
         self.random_state = random_state
+        self.bootstrap_idxs = None
+        self.bootstraps = []
+        self.oob_idxs = None
+        self.oob_score = None
+        self.trees = []
+        self.random_states = []
 
     def fit(self, x, y):
         """

random_survival_forest/SurvivalTree.py

@@ -5,8 +5,6 @@
 
 class SurvivalTree:
 
-    prediction_possible = None
-
     def __init__(self, x, y, f_idxs, n_features, timeline, unique_deaths=3, min_leaf=3, random_state=None):
         """
         A Survival Tree to predict survival.
@@ -34,6 +32,7 @@ def __init__(self, x, y, f_idxs, n_features, timeline, unique_deaths=3, min_leaf
         self.lhs = None
         self.rhs = None
         self.chf = None
+        self.prediction_possible = None
         self.grow_tree()
 
     def grow_tree(self):

random_survival_forest/__init__.py

@@ -8,3 +8,5 @@
 """
 
 from random_survival_forest.RandomSurvivalForest import RandomSurvivalForest
+from random_survival_forest.scoring import concordance_index
+from random_survival_forest.SurvivalTree import SurvivalTree

setup.py

@@ -6,7 +6,7 @@
 setup(
   name='random_survival_forest',         # How you named your package folder (MyLib)
   packages=['random_survival_forest'],   # Chose the same as "name"
-  version='0.6.2',      # Start with a small number and increase it with every change you make
+  version='0.7',      # Start with a small number and increase it with every change you make
   license="MIT License",        # Chose a license from here: https://help.github.com/articles/licensing-a-repository
   long_description=readme,
   long_description_content_type="text/markdown",