search

leaflabs / WaspNet.jl

GNU General Public License v2.0
13 stars 6 forks source link

Adding inhibitory neuron wrapper #18

Closed GuillaumeLam closed 3 years ago

SBuercklin commented 3 years ago

This looks great, I think it's a nice addition to WaspNet.jl. Did it solve the inhibitory neuron problem well?

GuillaumeLam commented 3 years ago

Yes, this solution works the same as before. But has the added bonus of better design and scalable to other neuron models!

SBuercklin commented 3 years ago

There's a conflict that needs to be resolved. I'm traveling at the moment but I'll clear up the conflict and get this merged in the coming week

SBuercklin commented 3 years ago

Hey Guillaume, there's one remaining issue we need to clear up before I can merge this. Some of these changes can't just be merged into master, we need to rebase first onto the proper commit from master. The following should fix it:

git checkout inhib-neuron
git rebase 132fd5d
git push -f origin inhib-neuron

This checks out the branch for this PR, replays all of those changes onto the latest commit on master for WaspNet.jl, and then force pushes (-f) to inhib-neuron so it will go through even though it's not consistent with the existing history.

At that point, it should be good to merge. You can read more about the process here. This will keep us from deleting commits from master since you made this branch, but then it should be good to merge

SBuercklin commented 3 years ago

I ended up being able to handle the conflicts on my end and merging manually on my machine. This is now merged, I'll work on getting the other one incorporated as well!