Skip to content

Commit

Permalink
Updated code for numpy 1.20
Browse files Browse the repository at this point in the history
  • Loading branch information
iuliivasilev committed Aug 21, 2024
1 parent 6ee82f9 commit 8a29623
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions survivors/ensemble/base_ensemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -241,11 +241,11 @@ def prepare_for_tolerance(self):
dim = (self.X_train.shape[0], self.bins.shape[0])
else:
dim = (self.X_train.shape[0])
self.oob_prediction = np.zeros(dim, dtype=np.float)
self.oob_prediction = np.zeros(dim, dtype=float)

if self.ens_metric_name in ["LOGLIKELIHOOD", "bic"]:
self.oob_prediction_hf = np.zeros(dim, dtype=np.float)
self.oob_count = np.zeros((self.X_train.shape[0]), dtype=np.int)
self.oob_prediction_hf = np.zeros(dim, dtype=float)
self.oob_count = np.zeros((self.X_train.shape[0]), dtype=int)

def predict_by_i(self, ind_model):
model = self.models[ind_model]
Expand Down
8 changes: 4 additions & 4 deletions survivors/ensemble/base_ensemble_iter.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,11 @@ def update_params(self):
dim = (self.X_train.shape[0], self.bins.shape[0])
else:
dim = (self.X_train.shape[0])
self.oob_prediction = np.zeros(dim, dtype=np.float)
self.oob_prediction = np.zeros(dim, dtype=float)

if self.ens_metric_name in ["LOGLIKELIHOOD", "bic"]:
self.oob_prediction_hf = np.zeros(dim, dtype=np.float)
self.oob_count = np.zeros((self.X_train.shape[0]), dtype=np.int)
self.oob_prediction_hf = np.zeros(dim, dtype=float)
self.oob_count = np.zeros((self.X_train.shape[0]), dtype=int)

cnt.set_seed(10)

Expand All @@ -221,7 +221,7 @@ def add_model(self, model, x_oob):
elif self.ens_metric_name == "roc":
self.oob_prediction[oob_index] += model.predict(x_oob, target=cnt.CENS_NAME)
elif self.ens_metric_name in ["LOGLIKELIHOOD", "bic"]:
self.oob_count = np.ones((self.X_train.shape[0]), dtype=np.int)
self.oob_count = np.ones((self.X_train.shape[0]), dtype=int)
self.oob_prediction_hf += model.predict_at_times(self.X_train, bins=self.bins, mode="hazard")
self.oob_prediction += model.predict_at_times(self.X_train, bins=self.bins, mode="surv")
else:
Expand Down

0 comments on commit 8a29623

Please sign in to comment.