Skip to content

Style fixes - Part 2#1019

Merged
zoq merged 9 commits intomlpack:masterfrom
zoq:style_fixes_0
Jun 6, 2017
Merged

Style fixes - Part 2#1019
zoq merged 9 commits intomlpack:masterfrom
zoq:style_fixes_0

Conversation

@zoq
Copy link
Copy Markdown
Member

@zoq zoq commented Jun 5, 2017

I've noticed that the style check only checked the source files in src/mlpack/core, this was fixed in mlpack/jenkins-conf@b63e8ae.

@zoq
Copy link
Copy Markdown
Member Author

zoq commented Jun 5, 2017

Okay, great so +409 issues, I think I fixed most of the issues, but the question is, is a single commit fine, or should we split the fixes e.g. one commit for each file/method, etc.?

@rcurtin
Copy link
Copy Markdown
Member

rcurtin commented Jun 5, 2017

One commit is fine with me, mostly I'm just going to scroll through the combined PR diff in Github and see if anything seems out of place.

@zoq
Copy link
Copy Markdown
Member Author

zoq commented Jun 5, 2017

Okay, I'm not sure what the issues are with core.hpp, I guess unless anybody else has an idea, we can whitelist the file. Which I think is fine, since we check the style anyway and if somebody changes something in core.hpp which is rare we are probably able to point out the issues.

@zoq
Copy link
Copy Markdown
Member Author

zoq commented Jun 5, 2017

Not sure what we should do with the rand issue, we can filter it out.

Copy link
Copy Markdown
Member

@rcurtin rcurtin left a comment

Choose a reason for hiding this comment

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

Just a few comments, looks good otherwise.

public:
template <typename LayerType>
LayerTypes operator () (LayerType* ) const;
LayerTypes operator () (LayerType*) const;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think in other places for operators we've done, e.g., operator=(args& args...), so I would expect here it might be operator()(LayerType*); is this a gray area in the style check rules?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

hm, good point, I'll take a look into the config.

"set of points. You may specify a separate set of reference points and "
"query points, or just a reference set which will be used as both the "
"reference and query set. You must specify the rank approximation (in \%) "
"reference and query set. You must specify the rank approximation (in %%) "
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Since this isn't being given to printf, I think that just % is fine here.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Right, will change that.

f << "@attribute @@@@flfl numeric" << endl;
f << endl;
f << "\% comment" << endl;
f << "%% comment" << endl;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Same here, I think one % is fine.

@zoq zoq merged commit 09d8793 into mlpack:master Jun 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants