search

ragavvenkatesan / yann

This toolbox is support material for the book on CNN (http://www.convolution.network).
http://www.yann.network
Other
41 stars 27 forks source link

Test-Dev Merge #17

Closed ragavvenkatesan closed 7 years ago

ragavvenkatesan commented 7 years ago

I have accepted the PR to the test branch, but I haven't added to the dev branch. The reason is because the dev and the master branches seem ahead of the test branch and there are some conflicts.

codecov-io commented 7 years ago

Codecov Report

Merging #17 into dev will decrease coverage by -0.67%. The diff coverage is n/a.

@@            Coverage Diff             @@
##              dev      #17      +/-   ##
==========================================
- Coverage   71.52%   70.86%   -0.67%     
==========================================
  Files           6        6              
  Lines         151      151              
==========================================
- Hits          108      107       -1     
- Misses         43       44       +1
Impacted Files Coverage Δ
tests/init.py 85.71% <ø> (-14.29%) :x:

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 64a5280...02a647d. Read the comment docs.

ragavvenkatesan commented 7 years ago

@JordanRushing, Can you look into these conflicts?

JordanRushing commented 7 years ago

@ragavvenkatesan, Taking a look now

JordanRushing commented 7 years ago

@ragavvenkatesan I have investigated the conflicts and created a new pull request to resolve them

JordanRushing commented 7 years ago

I am addressing the still remaining conflict - I apologize for the confusion

JordanRushing commented 7 years ago

@ragavvenkatesan I believe that I resolved the conflict with #19 but if I am mistaken then I am absolutely open to guidance on how you think I should best address the issue. I apologize for creating a version mess and I'm not quite sure how I ended up doing so

ragavvenkatesan commented 7 years ago

I had still a couple of conflicts that I resolved and merged.

JordanRushing commented 7 years ago

@ragavvenkatesan, Thank you again and sorry for the confusion. I believe I have determined how to avoid such conflicts on my part in the future.

ragavvenkatesan commented 7 years ago

Yea sure. Just make sure you are up to date with the dec branch

On Mon, Feb 20, 2017 at 19:51 Jordan Rushing notifications@github.com wrote:

@ragavvenkatesan https://github.com/ragavvenkatesan, Thank you again and sorry for the confusion. I believe I have determined how to avoid such conflicts on my part in the future.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/ragavvenkatesan/yann/pull/17#issuecomment-281230941, or mute the thread https://github.com/notifications/unsubscribe-auth/AKcb80kXpFNJyjwW2URahAej6rovtue2ks5relEkgaJpZM4MF5D1 .

-- Ragav Venkatesan Visual Representation and Processing Group Arizona State University