search

jeanluct / braidlab

Matlab package for analyzing data using braids
GNU General Public License v3.0
23 stars 9 forks source link

C++ cross2gen doesn't detect coincident projection #109

Closed jeanluct closed 9 years ago

jeanluct commented 9 years ago

See devel/iss109.m. The MEX function doesn't see the coincident projection for particles 1 and 2. The Matlab one does.

mbudisic commented 9 years ago

Argh. Merged iss109 branch and forgot to use --no-ff flag. Now it all looks like I've been developing in develop. I guess not a huge deal but just wanted to point this out...

jeanluct commented 9 years ago

No biggie...

On Mon, Dec 29, 2014 at 7:27 PM, Marko Budisic notifications@github.com wrote:

Argh. Merged iss109 branch and forgot to use --no-ff flag. Now it all looks like I've been developing in develop. I guess not a huge deal but just wanted to point this out...

— Reply to this email directly or view it on GitHub https://github.com/jeanluct/braidlab/issues/109#issuecomment-68321951.

jeanluct commented 9 years ago

A comment about the way you fixed this: this bugfix applies to 3.0.1. Therefore, the right way to proceed should have been to branch off master at 3.0.1, fix the bug, then merge into 3.0.2 and develop. The way you did it (unless I missed something) is by branching off develop. Since so much stuff has changed in develop since 3.0.1, it is pretty hard now to merge your changes into 3.0.2.

Not a big deal, since it's a minor bug and we may skip 3.0.2 altogether.