merge two tests parallel-sequential

This commit is contained in:
Ricardo Montañana Gómez 2022-02-26 11:30:12 +01:00
parent 877c24f3f4
commit dda3517090
Signed by: rmontanana
GPG Key ID: 46064262FD9A7ADE

View File

@ -192,33 +192,25 @@ class Odte_test(unittest.TestCase):
tclf = Odte( tclf = Odte(
base_estimator=Stree(), base_estimator=Stree(),
random_state=self._random_state, random_state=self._random_state,
n_estimators=3, n_estimators=5,
n_jobs=1, n_jobs=1,
) )
X, y = load_dataset(self._random_state, n_features=16, n_samples=500) tclf_p = Odte(
tclf.fit(X, y)
self.assertAlmostEqual(6.333333333333333, tclf.depth_)
self.assertAlmostEqual(10.0, tclf.leaves_)
self.assertAlmostEqual(19.0, tclf.nodes_)
nodes, leaves = tclf.nodes_leaves()
self.assertAlmostEqual(10.0, leaves)
self.assertAlmostEqual(19, nodes)
def test_nodes_leaves_depth_parallel(self):
tclf = Odte(
base_estimator=Stree(), base_estimator=Stree(),
random_state=self._random_state, random_state=self._random_state,
n_estimators=3, n_estimators=5,
n_jobs=-1, n_jobs=-1,
) )
X, y = load_dataset(self._random_state, n_features=16, n_samples=500) X, y = load_dataset(self._random_state, n_features=16, n_samples=500)
tclf.fit(X, y) tclf.fit(X, y)
self.assertAlmostEqual(6.333333333333333, tclf.depth_) tclf_p.fit(X, y)
self.assertAlmostEqual(10.0, tclf.leaves_) for clf in [tclf, tclf_p]:
self.assertAlmostEqual(19.0, tclf.nodes_) self.assertAlmostEqual(5.8, clf.depth_)
nodes, leaves = tclf.nodes_leaves() self.assertAlmostEqual(9.4, clf.leaves_)
self.assertAlmostEqual(10.0, leaves) self.assertAlmostEqual(17.8, clf.nodes_)
self.assertAlmostEqual(19, nodes) nodes, leaves = clf.nodes_leaves()
self.assertAlmostEqual(9.4, leaves)
self.assertAlmostEqual(17.8, nodes)
def test_nodes_leaves_SVC(self): def test_nodes_leaves_SVC(self):
tclf = Odte( tclf = Odte(