From: SourceForge.net <no...@so...> - 2010-09-07 13:22:26
|
Patches item #3057165, was opened at 2010-08-31 22:59 Message generated for change (Comment added) made by rajarshi You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=320024&aid=3057165&group_id=20024 Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: master Group: Needs Revision Status: Open Resolution: None Priority: 5 Private: No Submitted By: Rajarshi Guha (rajarshi) Assigned to: Rajarshi Guha (rajarshi) Summary: hybridization ratio descriptor Initial Comment: Implementation of a descriptor to measure molecular complexity in terms of sp3 to sp2 ratio of carbon atoms ---------------------------------------------------------------------- >Comment By: Rajarshi Guha (rajarshi) Date: 2010-09-07 09:22 Message: I've rebased with master and regenerated the patches. The patches attached are the latest and should work cleanly ---------------------------------------------------------------------- Comment By: Egon Willighagen (egonw) Date: 2010-09-07 09:17 Message: Rajarshi, I cannot get the 0001 patch to apply ... and I don't understand why it fails... it complaints about the MqsarmolecularTests bit not matching, but cannot see what is wrong with it: $ git am -3 ~/Desktop/0001-Implementation-of-a-descriptor-to-measure-molecular-.patch Applying: Implementation of a descriptor to measure molecular complexity in terms of sp3 to sp2 ratio of carbon atoms Using index info to reconstruct a base tree... <stdin>:190: trailing whitespace. } <stdin>:255: trailing whitespace. * <stdin>:257: trailing whitespace. * <stdin>:259: trailing whitespace. * <stdin>:264: trailing whitespace. * error: patch failed: src/test/org/openscience/cdk/modulesuites/MqsarmolecularTests.java:90 error: src/test/org/openscience/cdk/modulesuites/MqsarmolecularTests.java: patch does not apply Did you hand edit your patch? It does not apply to blobs recorded in its index. Cannot fall back to three-way merge. Patch failed at 0001 Implementation of a descriptor to measure molecular complexity in terms of sp3 to sp2 ratio of carbon atoms When you have resolved this problem run "git am -3 --resolved". If you would prefer to skip this patch, instead run "git am -3 --skip". To restore the original branch and stop patching run "git am -3 --abort". That file has not changed in over a year, and I have not clue why your patch would fail on it... Clues? This is for master, correct? ---------------------------------------------------------------------- Comment By: Rajarshi Guha (rajarshi) Date: 2010-09-03 11:30 Message: added 2 new patches that addresses most of your commetns. I few things I didn't do * Can't find the reference for use of this descriptor. I'll try and find it later on * @BeforeClass won't work since it requres that setup is static which then can't access the method from the super class * Also, I make a clone of the molecule, since I always assume that nothing is configured. This is what I've done in other descriptors. I'm waiting for dirty flags, which will obviate the need for this type of code ---------------------------------------------------------------------- Comment By: Egon Willighagen (egonw) Date: 2010-09-03 09:40 Message: Neither... it's just a plain text file that looks like a patch, but just has my comments inline... Look for the blobs like: ############################################################################# ############################################################################# - missing period at end of sentence ############################################################################# ############################################################################# ---------------------------------------------------------------------- Comment By: Rajarshi Guha (rajarshi) Date: 2010-09-03 09:36 Message: should your patch be applied on top of mine? Or on top of a fresh checkout of master? ---------------------------------------------------------------------- Comment By: Egon Willighagen (egonw) Date: 2010-09-02 06:17 Message: Looks generally fine... some old template code here and there, and some minor points, and a request for an additional unit test. Will attached the review as patch... ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=320024&aid=3057165&group_id=20024 |