Merge branch 'master' of github.com:doctorado-ml/odte

This commit is contained in:
Ricardo Montañana Gómez 2022-01-11 12:57:15 +01:00
commit cdaf7ecff2
Signed by: rmontanana
GPG Key ID: 46064262FD9A7ADE
5 changed files with 16 additions and 4 deletions

View File

@ -23,6 +23,7 @@ from sklearn.utils.validation import ( # type: ignore
)
from joblib import Parallel, delayed # type: ignore
from stree import Stree # type: ignore
from ._version import __version__
class Odte(BaseEnsemble, ClassifierMixin):
@ -49,6 +50,10 @@ class Odte(BaseEnsemble, ClassifierMixin):
self.max_samples = max_samples # size of bootstrap
self.be_hyperparams = be_hyperparams
@staticmethod
def version() -> str:
return __version__
def _initialize_random(self) -> np.random.mtrand.RandomState:
if self.random_state is None:
self.random_state = random.randint(0, sys.maxsize)

View File

@ -1,8 +1,7 @@
from .Odte import Odte
from ._version import __version__
__version__ = "0.3.1"
__author__ = "Rica.rdo Montañana Gómez"
__author__ = "Ricardo Montañana Gómez"
__copyright__ = "Copyright 2020-2021, Ricardo Montañana Gómez"
__license__ = "MIT License"
__author_email__ = "ricardo.montanana@alu.uclm.es"

1
odte/_version.py Normal file
View File

@ -0,0 +1 @@
__version__ = "0.3.1"

View File

@ -9,6 +9,7 @@ from sklearn.svm import SVC
from odte import Odte
from stree import Stree
from .utils import load_dataset
from .._version import __version__
class Odte_test(unittest.TestCase):
@ -252,3 +253,7 @@ class Odte_test(unittest.TestCase):
for estimator in tclf.estimators_:
for key, value in hyperparams.items():
self.assertEqual(value, estimator.get_params()[key])
def test_version(self):
tclf = Odte()
self.assertEqual(__version__, tclf.version())

View File

@ -1,4 +1,5 @@
import setuptools
import os
def readme():
@ -8,7 +9,8 @@ def readme():
def get_data(field):
item = ""
with open("odte/__init__.py") as f:
file_name = "_version.py" if field == "version" else "__init__.py"
with open(os.path.join("odte", file_name)) as f:
for line in f.readlines():
if line.startswith(f"__{field}__"):
delim = '"' if '"' in line else "'"