Revision: 21555 http://sourceforge.net/p/jmol/code/21555 Author: hansonr Date: 2017-04-26 05:19:28 +0000 (Wed, 26 Apr 2017) Log Message: ----------- CIP validation
Modified Paths: -------------- trunk/Jmol-datafiles/cip/checkCIP.spt Added Paths: ----------- trunk/Jmol-datafiles/cip/RS/mata2005Fig8VIb.mol Removed Paths: ------------- trunk/Jmol-datafiles/cip/CompleteDraft(1).pdf Deleted: trunk/Jmol-datafiles/cip/CompleteDraft(1).pdf =================================================================== (Binary files differ) Added: trunk/Jmol-datafiles/cip/RS/mata2005Fig8VIb.mol =================================================================== --- trunk/Jmol-datafiles/cip/RS/mata2005Fig8VIb.mol (rev 0) +++ trunk/Jmol-datafiles/cip/RS/mata2005Fig8VIb.mol 2017-04-26 05:19:28 UTC (rev 21555) @@ -0,0 +1,172 @@ +c:/jmol-dev/bobtest/mata2005Fig8VIb.mol +__Jmol-14_04251712353D 1 1.00000 0.00000 0 +Jmol version 14.15.1 2017-04-25 07:17 EXTRACT: ({0:83}) + 84 83 0 0 0 0 1 V2000 + -6.67640 2.91780 2.06170 C 0 0 0 0 0 0 + -5.84500 3.89520 1.21000 C 0 0 0 0 0 0 + -4.32080 3.88340 1.58450 C 0 0 0 0 0 0 + -3.24510 3.84560 0.36720 C 0 0 0 0 0 0 + -1.71870 3.83410 0.94110 C 0 0 0 0 0 0 + -0.28820 3.86920 0.16180 C 0 0 0 0 0 0 + 0.94180 3.59210 1.18910 C 0 0 0 0 0 0 + 2.39690 3.38640 0.62170 C 0 0 0 0 0 0 + 3.12370 2.15390 1.19250 C 0 0 0 0 0 0 + -3.29010 5.19130 -0.52020 C 0 0 0 0 0 0 + -3.70590 5.17730 -2.02760 C 0 0 0 0 0 0 + -5.12760 4.81780 -2.35150 Cl 0 0 0 0 0 0 + -0.04630 5.33730 -0.49370 C 0 0 0 0 0 0 + -0.23570 6.65700 0.35680 C 0 0 0 0 0 0 + 0.91740 7.18410 1.23440 C 0 0 0 0 0 0 + -3.51090 2.44170 -0.41081 C 0 0 0 0 0 0 + -4.62090 2.32660 -1.52060 C 0 0 0 0 0 0 + -4.08820 1.71011 -2.82400 C 0 0 0 0 0 0 + -0.44220 2.63330 -0.88530 C 0 0 0 0 0 0 + 0.25241 1.22060 -0.66370 C 0 0 0 0 0 0 + -0.01370 0.52990 0.93610 Cl 0 0 0 0 0 0 + -2.78370 4.59130 -3.12040 C 0 0 0 0 0 0 + -2.10880 6.13940 -0.11090 C 0 0 0 0 0 0 + -0.29180 5.03480 -1.58750 C 0 0 0 0 0 0 + -0.68450 8.04840 -0.63600 Cl 0 0 0 0 0 0 + -6.15950 1.53440 -1.16500 Cl 0 0 0 0 0 0 + -2.04270 1.64650 -0.75210 C 0 0 0 0 0 0 + -2.04200 2.74790 -1.49910 C 0 0 0 0 0 0 + -0.14090 0.01521 -1.55200 C 0 0 0 0 0 0 + -6.01482 3.77543 -0.54334 Cl 0 0 0 0 0 0 + 2.30747 3.48231 -1.14044 Cl 0 0 0 0 0 0 + -1.58800 2.74560 1.33830 O 0 0 0 0 0 0 + -4.14420 2.75900 3.21760 C 0 0 0 0 0 0 + 0.47860 4.79350 2.30891 C 0 0 0 0 0 0 + -7.67602 2.80294 1.61722 H 0 0 0 0 0 0 + -6.77284 3.31268 3.08384 H 0 0 0 0 0 0 + -6.17424 1.93959 2.09244 H 0 0 0 0 0 0 + -6.33637 4.83846 1.49077 H 0 0 0 0 0 0 + -3.94390 4.87640 1.87069 H 0 0 0 0 0 0 + -1.77638 4.80025 1.46381 H 0 0 0 0 0 0 + 1.08092 2.59748 1.63786 H 0 0 0 0 0 0 + 3.09384 4.16254 0.97080 H 0 0 0 0 0 0 + 3.38157 2.33564 2.24629 H 0 0 0 0 0 0 + 4.04276 1.97075 0.61650 H 0 0 0 0 0 0 + 2.46582 1.27511 1.12235 H 0 0 0 0 0 0 + -4.25342 5.63883 -0.23432 H 0 0 0 0 0 0 + -3.55607 6.26458 -2.10094 H 0 0 0 0 0 0 + 0.86105 5.95917 -0.49171 H 0 0 0 0 0 0 + -1.01785 6.28141 1.03295 H 0 0 0 0 0 0 + 0.55972 8.02897 1.84124 H 0 0 0 0 0 0 + 1.74437 7.51900 0.59100 H 0 0 0 0 0 0 + 1.27081 6.38040 1.89709 H 0 0 0 0 0 0 + -4.07449 1.87178 0.34256 H 0 0 0 0 0 0 + -4.86994 3.39501 -1.60106 H 0 0 0 0 0 0 + -4.81132 1.88430 -3.63440 H 0 0 0 0 0 0 + -3.94542 0.62813 -2.68635 H 0 0 0 0 0 0 + -3.12659 2.17663 -3.08413 H 0 0 0 0 0 0 + 0.30696 2.75007 -1.68224 H 0 0 0 0 0 0 + 1.27138 1.56167 -0.89897 H 0 0 0 0 0 0 + -3.06116 5.01143 -4.09841 H 0 0 0 0 0 0 + -2.89518 3.49727 -3.14639 H 0 0 0 0 0 0 + -1.73823 4.84802 -2.89438 H 0 0 0 0 0 0 + -1.15092 5.62540 -0.27905 H 0 0 0 0 0 0 + -2.20173 6.40275 0.95306 H 0 0 0 0 0 0 + -2.14547 7.05482 -0.71973 H 0 0 0 0 0 0 + -1.32330 4.65639 -1.64061 H 0 0 0 0 0 0 + 0.40438 4.24890 -1.91569 H 0 0 0 0 0 0 + -0.18909 5.91249 -2.24257 H 0 0 0 0 0 0 + -1.51336 1.43419 0.18850 H 0 0 0 0 0 0 + -1.41658 2.28956 -1.38806 H 0 0 0 0 0 0 + -2.25039 0.70242 -1.27706 H 0 0 0 0 0 0 + -2.17371 3.71797 -2.00072 H 0 0 0 0 0 0 + -2.75985 2.66349 -0.66990 H 0 0 0 0 0 0 + -2.21730 1.93566 -2.21989 H 0 0 0 0 0 0 + -1.18738 -0.26007 -1.35426 H 0 0 0 0 0 0 + 0.51272 -0.83898 -1.32142 H 0 0 0 0 0 0 + -0.02752 0.28805 -2.61157 H 0 0 0 0 0 0 + -2.39031 2.48876 1.87713 H 0 0 0 0 0 0 + -3.20034 3.00006 3.72850 H 0 0 0 0 0 0 + -4.14614 1.69640 2.93320 H 0 0 0 0 0 0 + -4.98852 2.95911 3.89367 H 0 0 0 0 0 0 + 0.68161 5.78794 1.88479 H 0 0 0 0 0 0 + 1.05152 4.66788 3.23948 H 0 0 0 0 0 0 + -0.59596 4.69923 2.52438 H 0 0 0 0 0 0 + 1 2 1 0 0 0 + 2 3 1 0 0 0 + 3 4 1 0 0 0 + 4 5 1 0 0 0 + 5 6 1 0 0 0 + 6 7 1 0 0 0 + 7 8 1 0 0 0 + 8 9 1 0 0 0 + 10 11 1 0 0 0 + 11 12 1 0 0 0 + 4 10 1 0 0 0 + 13 14 1 0 0 0 + 14 15 1 0 0 0 + 6 13 1 0 0 0 + 16 17 1 0 0 0 + 17 18 1 0 0 0 + 4 16 1 0 0 0 + 19 20 1 0 0 0 + 20 21 1 0 0 0 + 6 19 1 0 0 0 + 11 22 1 0 0 0 + 10 23 1 0 0 0 + 13 24 1 0 0 0 + 14 25 1 0 0 0 + 17 26 1 0 0 0 + 16 27 1 0 0 0 + 19 28 1 0 0 0 + 20 29 1 0 0 0 + 2 30 1 0 0 0 + 8 31 1 0 0 0 + 5 32 1 0 0 0 + 3 33 1 0 0 0 + 7 34 1 0 0 0 + 35 1 1 0 0 0 + 36 1 1 0 0 0 + 37 1 1 0 0 0 + 38 2 1 0 0 0 + 39 3 1 0 0 0 + 40 5 1 0 0 0 + 41 7 1 0 0 0 + 42 8 1 0 0 0 + 43 9 1 0 0 0 + 44 9 1 0 0 0 + 45 9 1 0 0 0 + 46 10 1 0 0 0 + 47 11 1 0 0 0 + 48 13 1 0 0 0 + 49 14 1 0 0 0 + 50 15 1 0 0 0 + 51 15 1 0 0 0 + 52 15 1 0 0 0 + 53 16 1 0 0 0 + 54 17 1 0 0 0 + 55 18 1 0 0 0 + 56 18 1 0 0 0 + 57 18 1 0 0 0 + 58 19 1 0 0 0 + 59 20 1 0 0 0 + 60 22 1 0 0 0 + 61 22 1 0 0 0 + 62 22 1 0 0 0 + 63 23 1 0 0 0 + 64 23 1 0 0 0 + 65 23 1 0 0 0 + 66 24 1 0 0 0 + 67 24 1 0 0 0 + 68 24 1 0 0 0 + 69 27 1 0 0 0 + 70 27 1 0 0 0 + 71 27 1 0 0 0 + 72 28 1 0 0 0 + 73 28 1 0 0 0 + 74 28 1 0 0 0 + 75 29 1 0 0 0 + 76 29 1 0 0 0 + 77 29 1 0 0 0 + 78 32 1 0 0 0 + 79 33 1 0 0 0 + 80 33 1 0 0 0 + 81 33 1 0 0 0 + 82 34 1 0 0 0 + 83 34 1 0 0 0 + 84 34 1 0 0 0 +M END Modified: trunk/Jmol-datafiles/cip/checkCIP.spt =================================================================== --- trunk/Jmol-datafiles/cip/checkCIP.spt 2017-04-26 05:00:18 UTC (rev 21554) +++ trunk/Jmol-datafiles/cip/checkCIP.spt 2017-04-26 05:19:28 UTC (rev 21555) @@ -4,16 +4,15 @@ // sample execution requires that cip/ directory be in the current Jmol directory // as indicated with the CD command. +// checkR.spt -- test suite for Jmol CIPChirality.java +// Bob Hanson hans...@stolaf.edu 4/18/2017 7:44:43 AM + nOK = 0; +thisN = 0; - function checkRS(m, n, key) { - if (_argCount < 3) { - key = n - n = 1 - } - if (!n) n = 1 - var doCheck = (!!key) + function checkRS(m, key) { + var doCheck = (_argCount == 2) var a = 0; if (m.find("//")) { key = m.split("//")[2] @@ -24,9 +23,13 @@ } doCheck = key; } - print "loading " + m + " " + n + if (thisN && (nOK + 1) != thisN) { + nOK++; + return; + } + print "loading " + (nOK + 1) + ": " + m set useMinimizationThread false - load @m @n filter "2D" + load @m filter "2D" if (!{_H}) calculate hydrogens set labelfor {_C} "%[atomname]" refresh @@ -43,10 +46,7 @@ var rs = {selected}.label("%[chirality]").join("") print " " + doCheck + " key=" + key + " found=" + rs if (doCheck) { - var ref = (docheck == key ? "" : _M.molData.chiral_atoms.replace("\n","").replace(" ","")) - if (!ref && docheck != key) { - ref = checkSDF() - } + var ref = (docheck == key ? "" : _M.molData["chiral_atoms"].replace("\n","").replace(" ","")) if (ref) { key = ref; rs = {selected}.label("%i%[chirality]").join("") @@ -70,7 +70,7 @@ function checkRdir(name, type) { x = load(name + ".txt").lines for (var f in x) { - f = f.trim() + f = f.trim(); if (f == "#QUIT") break if (!f || f.find("#") == 1) continue if (f.find("$") != 1) @@ -82,47 +82,20 @@ } } -//set debug +//checkrs("cip/RS/Mata_fig7_I_R.mol","?") +//checkrs("testn2.mol","?") -function checksdf(){ - ref = _M.molData.stereounits - if (ref) { - var tokens = ("end " + ref).split(true) - ref = "" - var atlist = [] - var s = "" - for (var i = tokens.length; i > 0; i--) { - var token = tokens[i] - if (token.find(":")) continue - var itoken = 0 + token - if (token == "0" || itoken) { - atlist.push(itoken + 1) - } else { - for (var j = 1; j <= atlist.length; j++) { - ref = "" + atlist[j] + s + ref - } - atlist = [] - if (token == "end") break - s = token - } - } - } - print ref - return ref -} - -/** - * -//checkrs("cip/EZ/deb.mol"); +checkRdir("cip/RS", "?"); checkRdir("cip/SP", "?"); -checkRdir("cip/RS", "?"); checkRdir("cip/EZ", "?"); checkRdir("cip/R", "R"); checkRdir("cip/S", "S"); print "DONE: " + nOK - /** +/** + +checkrs("cip/EZ/deb.mol"); checkrs("$(R)-3-hydroxy-1,4-heptadiyne", "R") checkRS("$(R)-glycidol", "R") checkRS("$glucose", "RSRR") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot _______________________________________________ Jmol-commits mailing list Jmol-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/jmol-commits