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

Minor refactoring in Time as discussed in PR #685 #706

Merged
merged 1 commit into from Jun 29, 2017

Conversation

Projects
None yet
5 participants
@jakobj
Contributor

jakobj commented Apr 12, 2017

This PR implements the changes proposed during review of #685.
I suggest @heplesser @apeyser or @gtrensch as reviewers

@heplesser

@jakobj Thanks! I added a suggestion which I believe will make the code even more readable.

Show outdated Hide outdated nestkernel/nest_time.h
Show outdated Hide outdated nestkernel/nest_time.h

@heplesser heplesser requested a review from apeyser Apr 18, 2017

@jakobj

This comment has been minimized.

Show comment
Hide comment
@jakobj

jakobj Jun 12, 2017

Contributor

Thanks @heplesser for the suggestion. I implemented that now.

Contributor

jakobj commented Jun 12, 2017

Thanks @heplesser for the suggestion. I implemented that now.

@heplesser

Just another little detail ...

Show outdated Hide outdated nestkernel/nest_time.cpp
@jakobj

This comment has been minimized.

Show comment
Hide comment
@jakobj

jakobj Jun 13, 2017

Contributor

@heplesser just fixed the last detail ;)

Contributor

jakobj commented Jun 13, 2017

@heplesser just fixed the last detail ;)

@heplesser

This comment has been minimized.

Show comment
Hide comment
@heplesser

heplesser Jun 13, 2017

Contributor

@jakobj This looks fine, but I am a bit confused by the fact that there is only a single commit visible in Github for this PR, dated 12 April, even though you have made changes during the review. Did you amend that commit or squash commits?

Contributor

heplesser commented Jun 13, 2017

@jakobj This looks fine, but I am a bit confused by the fact that there is only a single commit visible in Github for this PR, dated 12 April, even though you have made changes during the review. Did you amend that commit or squash commits?

Show outdated Hide outdated nestkernel/nest_time.h
@jakobj

This comment has been minimized.

Show comment
Hide comment
@jakobj

jakobj Jun 14, 2017

Contributor

@heplesser yes, I squashed all commits since the form one logical unit. this is why only one commit appears.

Contributor

jakobj commented Jun 14, 2017

@heplesser yes, I squashed all commits since the form one logical unit. this is why only one commit appears.

@heplesser

This comment has been minimized.

Show comment
Hide comment
@heplesser

heplesser Jun 14, 2017

Contributor

I think merging #685 introduced some conflicts.

Contributor

heplesser commented Jun 14, 2017

I think merging #685 introduced some conflicts.

@jakobj

This comment has been minimized.

Show comment
Hide comment
@jakobj

jakobj Jun 20, 2017

Contributor

Fixed the conflicts and added a comment on the use of <= over ==.

Contributor

jakobj commented Jun 20, 2017

Fixed the conflicts and added a comment on the use of <= over ==.

@gtrensch

Looks fine to me!

@heplesser heplesser added this to the NEST 2.12.1 milestone Jun 29, 2017

@jougs

This comment has been minimized.

Show comment
Hide comment
@jougs

jougs Jun 29, 2017

Contributor

@apeyser: are the changes OK with you now? If yes, please click the 'approve' button. Thanks!

Contributor

jougs commented Jun 29, 2017

@apeyser: are the changes OK with you now? If yes, please click the 'approve' button. Thanks!

@apeyser apeyser merged commit 368bee6 into nest:master Jun 29, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment