Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement Shared Weights + Tests #33

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Implement Shared Weights + Tests #33

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2c9ce5a
fixing issues I causes while attempting to resolve merge conflicts
Mar 14, 2020
fcbce8d
Merge branch 'master' into shared_weights
morgsmss7 Mar 23, 2020
988627d
fix issues from resolving merge conflicts
Mar 23, 2020
ffb9402
split tests and updated calculations in comments
jheiko1 Mar 30, 2020
b082510
split up test
jheiko1 Mar 30, 2020
a9bcb5a
fixed calulations for random.
jheiko1 Mar 30, 2020
6819fc9
final calculation fixes and random fix.
jheiko1 Mar 30, 2020
e495621
oblique random fit
jheiko1 Mar 30, 2020
e658126
diff random state fix
jheiko1 Mar 30, 2020
e16e2eb
formatted with black
jheiko1 Mar 30, 2020
cf8d33a
delete unsed import
jheiko1 Mar 30, 2020
351bbf4
trying to add all sklearn code again
Jun 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions sklearn/tree/_criterion.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,11 @@ cdef class Criterion:
cdef double impurity_improvement(self, double impurity) nogil
cdef double proxy_impurity_improvement(self) nogil

<<<<<<< HEAD
cdef double node_impurity2(self, double* pred_weights)
cdef void children_impurity2(self, double* impurity_left,
double* impurity_right, double* pred_weights)
cdef double proxy_impurity_improvement2(self, double* pred_weights) nogil
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@morgsmss7 is this used?


=======
>>>>>>> master
cdef class ClassificationCriterion(Criterion):
"""Abstract criterion for classification."""

Expand All @@ -83,4 +80,8 @@ cdef class RegressionCriterion(Criterion):
"""Abstract regression criterion."""

cdef double sq_sum_total
cdef object random_state # Random state for predictor weights (Projection-Based Splitters)

cdef class ObliqueProjection(RegressionCriterion):
pass
cdef class AxisProjection(RegressionCriterion):
pass
Loading