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.

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

p-value calculations added #2271

Merged
merged 4 commits into from Jun 4, 2014
Merged

Conversation

mazumdarparijat
Copy link
Contributor

  • p-value calculations added for nominal, ordinal and continuous dependent variable
  • method for p-value adjustment added
  • comments from previous PR class structure for CHAID added #2264 addressed

Reference

@mazumdarparijat
Copy link
Contributor Author

@iglesias I added just p-value calculations to CHAID today. This PR is on that. I have tried to make it as modular as possible. But, unfortunately, its still quite big PR. The methods are all private so I couldn't supply unittests. So, this PR is just for review and cannot be merged until I add at least training method to this which I plan on doing once this part is all set.
Thanks!

@@ -180,6 +190,76 @@ class CCHAIDTree : public CTreeMachine<CHAIDTreeNodeData>
*/
CLabels* apply_from_current_node(CDenseFeatures<float64_t>* feats, node_t* current);

/** calculates adjusted p-value using Bonferroni adjustments
*
* @param p-value unadjusted p-value
Copy link
Collaborator

Choose a reason for hiding this comment

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

Use underscore as in the argument name. Otherwise, Doxygen will report a warning.

@iglesias
Copy link
Collaborator

It is looking all right. Go ahead!

@mazumdarparijat
Copy link
Contributor Author

@iglesias I have added tree growing method. I will add to this missing values feature, train_machine method along with unittests tomorrow. Until then this is for review only!
I have also addressed your previous comments in this commit.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.15%) when pulling f23491a on mazumdarparijat:CHAID1 into 569c92e on shogun-toolbox:develop.

@mazumdarparijat
Copy link
Contributor Author

@iglesias I have added the remaining parts of tree growing process along with unittests. Please have a look!

/** initializes members of class */
void init();

public:
/** denotes that a feature in a vector is missing MISSING = NOT_A_NUMBER */
/** denotes that a feature in a vector is missing MISSING = MAX_REAL_NUMBER */
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why going from nan to max float?

@iglesias
Copy link
Collaborator

iglesias commented Jun 3, 2014

It is looking good for the moment. See the minor comments (mainly suggestions) above. Although I am in fact curious why you decided to use max float instead of nan for the missing values.

@coveralls
Copy link

Coverage Status

Coverage increased (+0.07%) when pulling 1e535c6 on mazumdarparijat:CHAID1 into 569c92e on shogun-toolbox:develop.

@mazumdarparijat
Copy link
Contributor Author

@iglesias I have addressed your previous comments. Please have a look! I will send in apply methods for CHAID as a next PR.

@iglesias
Copy link
Collaborator

iglesias commented Jun 3, 2014

Please rebase locally and update the PR pushing to your branch. GitHub tells me this cannot be automatically merged.

@iglesias
Copy link
Collaborator

iglesias commented Jun 3, 2014

And write a dummy comment here afterwards ;-)

@mazumdarparijat
Copy link
Contributor Author

@iglesias Please see if the merging problem is solved. Thanks!

@iglesias
Copy link
Collaborator

iglesias commented Jun 3, 2014

Yep, waiting for travis now.

iglesias added a commit that referenced this pull request Jun 4, 2014
@iglesias iglesias merged commit 1bef923 into shogun-toolbox:develop Jun 4, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants