diff --git a/uncoverml/geoio.py b/uncoverml/geoio.py index b7663f20..49b98646 100644 --- a/uncoverml/geoio.py +++ b/uncoverml/geoio.py @@ -403,7 +403,7 @@ def write(self, x, subchunk_index): yend = self.sub_ends[subindex] # this is Y if node != 0: data = np.zeros(shape=(self.shape[0], yend - ystart, self.shape[-1]), dtype=np.float32) - mask = np.ones(shape=(self.shape[0], yend - ystart, self.shape[-1]), dtype=np.bool) + mask = np.ones(shape=(self.shape[0], yend - ystart, self.shape[-1]), dtype=bool) mpiops.comm.Recv(data, source=node, tag=1) mpiops.comm.Recv(mask, source=node, tag=2) data = np.ma.masked_array(data=data, mask=mask, dtype=np.float32, fill_value=self.nodata_value) diff --git a/uncoverml/optimise/models.py b/uncoverml/optimise/models.py index 377ec53d..0733f9ec 100644 --- a/uncoverml/optimise/models.py +++ b/uncoverml/optimise/models.py @@ -174,7 +174,7 @@ class TransformedForestRegressor(TransformPredictDistMixin, def __init__(self, target_transform='identity', n_estimators=10, - criterion="mse", + criterion='squared_error', max_depth=None, min_samples_split=2, min_samples_leaf=1, @@ -565,7 +565,6 @@ def __init__( reg_lambda: float = 0., random_state: Optional[Union[int, np.random.RandomState]] = None, n_jobs: int = -1, - silent: Union[bool, str] = 'warn', importance_type: str = 'split', **kwargs ): @@ -594,7 +593,6 @@ def __init__( reg_lambda=reg_lambda, random_state=random_state, n_jobs=n_jobs, - silent=silent, importance_type=importance_type, **kwargs )