Skip to content

Fixed some merge issues#393

Merged
OlivierBlanvillain merged 1 commit intofeaturecat:nextfrom
zsalch:next_mergefix
Oct 8, 2018
Merged

Fixed some merge issues#393
OlivierBlanvillain merged 1 commit intofeaturecat:nextfrom
zsalch:next_mergefix

Conversation

@zsalch
Copy link
Copy Markdown
Contributor

@zsalch zsalch commented Oct 8, 2018

Fixed some merge issues.

@OlivierBlanvillain
Copy link
Copy Markdown
Contributor

@zsalch LGTM

File startfolder = new File(config.optString("engine-start-location", "."));
String networkFile = config.getString("network-file");
// substitute in the weights file
engineCommand = engineCommand.replaceAll("%network-file", networkFile);
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Why was this removed?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Specifically I mean the %network-file part. I can see the other parts were moved elsewhere so those seem fine.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Seems redundant with what's done in the constructor.

@infinity0
Copy link
Copy Markdown
Contributor

Can your code review standards be a bit stronger? "Fixed some merge issues" is a bad PR description, and LGTM in response to that is not doing proper code review.

@OlivierBlanvillain
Copy link
Copy Markdown
Contributor

@infinity0 Yeah, we're getting there...

For context this project got to this state without any code review, tests or CI. This PR fixes stuff I introduced in 4315383 which was accidentally merge without being review (except for what you pointed out, which I overlooked). If you want to give us a hand feel to review whatever is in the PR queue!

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.

3 participants