From 755517d0e9b6b80d50e40ea673620ec32a78c0dd Mon Sep 17 00:00:00 2001 From: Primoz Godec Date: Tue, 3 May 2022 16:04:29 +0200 Subject: [PATCH] Fix few deprecations --- orangecontrib/text/ontology.py | 2 +- orangecontrib/text/tests/test_guardian.py | 2 +- orangecontrib/text/vectorization/bagofwords.py | 4 ++-- orangecontrib/text/vectorization/simhash.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/orangecontrib/text/ontology.py b/orangecontrib/text/ontology.py index 32ba92c15..f734e3216 100644 --- a/orangecontrib/text/ontology.py +++ b/orangecontrib/text/ontology.py @@ -185,7 +185,7 @@ def generate_ontology( for i in range(population_size) ]) fitness = fitness / fitness.sum() - new_generation = np.zeros(generation.shape, dtype=np.int32) + new_generation = np.zeros(generation.shape, dtype=int) parents_to_keep = np.argsort(fitness)[-keep_next_gen:] new_generation[:keep_next_gen, :] = generation[parents_to_keep, :] for i in range(keep_next_gen, population_size): diff --git a/orangecontrib/text/tests/test_guardian.py b/orangecontrib/text/tests/test_guardian.py index a0f46eaff..1713d93c5 100644 --- a/orangecontrib/text/tests/test_guardian.py +++ b/orangecontrib/text/tests/test_guardian.py @@ -19,7 +19,7 @@ def test_valid(self, mock_get): def test_equal(self): credentials = guardian.TheGuardianCredentials(API_KEY) - self.assertEquals(credentials, credentials) + self.assertEqual(credentials, credentials) def skip_limit_exceeded(fun): diff --git a/orangecontrib/text/vectorization/bagofwords.py b/orangecontrib/text/vectorization/bagofwords.py index 972f021ad..a1277b004 100644 --- a/orangecontrib/text/vectorization/bagofwords.py +++ b/orangecontrib/text/vectorization/bagofwords.py @@ -46,8 +46,8 @@ class BowVectorizer(BaseVectorizer): wlocals = OrderedDict(( (COUNT, lambda tf: tf), - (BINARY, lambda tf: np.greater(tf, 0, dtype=np.int) if tf.size - else np.array([], dtype=np.int)), + (BINARY, lambda tf: np.greater(tf, 0).astype(int) if tf.size + else np.array([], dtype=int)), (SUBLINEAR, lambda tf: 1 + np.log(tf)), )) diff --git a/orangecontrib/text/vectorization/simhash.py b/orangecontrib/text/vectorization/simhash.py index e34cd6d79..374960981 100644 --- a/orangecontrib/text/vectorization/simhash.py +++ b/orangecontrib/text/vectorization/simhash.py @@ -47,7 +47,7 @@ def _transform(self, corpus, source_dict): Corpus with `simhash` variable """ - X = np.array([self.int2binarray(self.compute_hash(doc)) for doc in corpus.tokens], dtype=np.float) + X = np.array([self.int2binarray(self.compute_hash(doc)) for doc in corpus.tokens], dtype=float) corpus = corpus.extend_attributes( X, feature_names=[