Doctorado-ML/fimdlp
1
1
Fork 0
mirror of https://github.com/Doctorado-ML/FImdlp.git synced 2025-08-18 00:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: ✨ Add version method to cppfimdlp

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2022-12-20 01:11:39 +01:00
parent edd464311f
commit 9db16d9d3c
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.gitignore vendored
View File

@@ -33,8 +33,8 @@ MANIFEST
*.manifest *.manifest
*.spec *.spec
# Installer log2s # Installer logs
pip-log2.txt pip-log.txt
pip-delete-this-directory.txt pip-delete-this-directory.txt
# Unit test / coverage reports # Unit test / coverage reports
@@ -56,7 +56,7 @@ coverage.xml
*.pot *.pot
# Django stuff: # Django stuff:
*.log2 *.log
local_settings.py local_settings.py
db.sqlite3 db.sqlite3
db.sqlite3-journal db.sqlite3-journal
@@ -135,3 +135,4 @@ cmake-build-debug/**
**/lcoverage/** **/lcoverage/**
**/x/* **/x/*
**/*.so **/*.so
**/CMakeFiles

5
src/fimdlp/cfimdlp.pyx
View File

@@ -1,7 +1,7 @@
# distutils: language = c++ # distutils: language = c++
# cython: language_level = 3 # cython: language_level = 3
from libcpp.vector cimport vector from libcpp.vector cimport vector
from libcpp cimport bool from libcpp.string cimport string
cdef extern from "../cppmdlp/CPPFImdlp.h" namespace "mdlp": cdef extern from "../cppmdlp/CPPFImdlp.h" namespace "mdlp":
ctypedef float precision_t ctypedef float precision_t
@@ -9,6 +9,7 @@ cdef extern from "../cppmdlp/CPPFImdlp.h" namespace "mdlp":
CPPFImdlp(int) except + CPPFImdlp(int) except +
CPPFImdlp& fit(vector[precision_t]&, vector[int]&) CPPFImdlp& fit(vector[precision_t]&, vector[int]&)
vector[precision_t] getCutPoints() vector[precision_t] getCutPoints()
string version()
cdef class CFImdlp: cdef class CFImdlp:
@@ -22,4 +23,6 @@ cdef class CFImdlp:
return self return self
def get_cut_points(self): def get_cut_points(self):
return self.thisptr.getCutPoints() return self.thisptr.getCutPoints()
def get_version(self):
return self.thisptr.version()

12
src/fimdlp/mdlp.py
View File

@@ -99,9 +99,15 @@ class FImdlp(TransformerMixin, BaseEstimator):
return self return self
def _fit_discretizer(self, feature): def _fit_discretizer(self, feature):
self.discretizer_[feature] = CFImdlp(proposal=self.proposal) if feature in self.features_:
self.discretizer_[feature].fit(self.X_[:, feature], self.y_) self.discretizer_[feature] = CFImdlp(proposal=self.proposal)
self.cut_points_[feature] = self.discretizer_[feature].get_cut_points() self.discretizer_[feature].fit(self.X_[:, feature], self.y_)
self.cut_points_[feature] = self.discretizer_[
feature
].get_cut_points()
else:
self.discretizer_[feature] = None
self.cut_points_[feature] = []
def _discretize_feature(self, feature, X, result): def _discretize_feature(self, feature, X, result):
if feature in self.features_: if feature in self.features_: