Commit Graph

126 Commits

Author SHA1 Message Date
Greg Landrum
2738c35178 Fixes #1903 (#1971)
* Fixes #1903

* update SWIG bindings too
2018-07-25 09:14:17 +02:00
Greg Landrum
77078eac66 Add an auto-populated file with cmake config options (#1874)
* this is a rough first pass, needs to be finished and is a strong argument for changing the names of some of the #defines that are currently used

* rationalize the rest of the #defines
add something to the release notes about this
2018-06-09 05:41:28 +02:00
Paolo Tosco
c08ea49bda - enable building DLLs on Windows (#1861)
* - enable building DLLs on Windows

* - export.h and test.h are now auto-generated by CMake
2018-05-16 08:42:41 +02:00
Matt Swain
a6354d1501 Make svg xmlns prefix use more consistent (#1866)
Set svg as the default xmlns, so no prefix is needed for every svg tag. Also remove all code in python wrappers that stripped these prefixes.
2018-05-14 17:07:55 +02:00
Greg Landrum
26f1f4cf01 builds on ubuntu 18.04 (#1858) 2018-05-10 05:04:39 +02:00
Greg Landrum
5f6650306e Fixes #1837 (#1839)
* Fixes #1837

* do not expose the takeOwnership forms of addAtom and addBond
2018-04-26 16:02:21 -04:00
Greg Landrum
404df80b8a make sure that the global EmbedParameter objects are not writeable from Java (#1824) 2018-04-17 13:37:04 +02:00
greg landrum
f051e329fd changes to get wrapper builds working on windows with VS2017 2018-04-11 15:28:58 +02:00
Greg Landrum
b8738361f1 Fixes #1776 (#1780)
* add wrapper for reaction fingerprints.
Fixes #1776

* Move definitions of default fingerprint params to .cpp file.

* just a kick to get travis to run
2018-03-20 10:10:40 -04:00
Greg Landrum
42eecc664d Integrate Coordgen (#1708)
* first pass, does not yet actually work

* pass2, same problems

* pass2, same problems

* another test

* new tests; bugfix

* move the code out to a header

* add a double bond example

* enable auto-downloads of the code

* move the function to its own namespace

* first pass at a basic python wrapper

* change coordgen commit used

* try supporting bond stereo; does not currently work

* cis/trans seems to now work.

* first pass at templates; needs testing

* use the fixed flag too

* need mol align

* expand test

* initial pass at python wrapper for template

* simplify tests

* add an option to directly use a substructure match for alignment

* scaling

* add #define

* Define a cache setting for RDK_COORDGEN_LIBS to allow these to be used in other packages

* return the conformer id from addCoords

* Make CoordGen the default when it’s available.
This is a backup commit… the tests don’t even come close to passing.

* add some debugging options for a bit

* add alignment step to testing when using non-fixed coords

* Add global to allow use of CoordGen to be disabled
get the basic depictor tests working

* make coordgen the default when it is available

* make sure things continue to work when coordgen is disabled

* get windows builds working

* mods to get this building on windows.
something is screwy with the fileParsersTest1

* no need to generate coords for the 1K C string

* fix java wrappers

* works on linux

* update the (stupid) way dependencies were handled on windows.
this allows a lot of cleanup of cmake files (still more to do)
the linux build is unlikely to work due to the way _statics aren't handled

* docs

* extend forceRDKit applicability

* switch coordgen version

* try using templates

* try to get the template dir finding reasonably robust w.r.t. conda install

* continuing to iterate on the way the template file is installed

* fix a problem caused by the merge

* remove test that should never have been checked in

* update expected results for cartridge tests

* switch back to using the RDKit as the default coordinate generator
2018-02-15 05:36:03 +01:00
Greg Landrum
2fd0b672bd dependency problems with swig 2017-11-25 09:35:48 +01:00
Paolo Tosco
5649405444 Fixes Java wrapper build error with Boost 1.64 (#1613) 2017-11-15 06:36:15 +01:00
Greg Landrum
1efa8e696e another clang-format run 2017-10-12 06:42:15 +02:00
Greg Landrum
e38d42ca11 Fix problems in the SWIG wrappers caused by #1546 (#1558)
* fix a couple problems in the java wrappers created by the changes

* more tests
2017-09-11 16:08:47 +02:00
Steve Roughley
d03e9b512b Added IsInRing methods to Bond in Java wrapper(addresses #1535) (#1536) 2017-08-18 12:01:15 -04:00
Greg Landrum
b9450b7ba7 add prepareMolForDrawing to SWIG wrapper; add a test for that too (#1523) 2017-08-12 15:34:50 -04:00
Brian Kelley
e70599a12e Dev/pickle properties (#1277)
* Adds pickling of properties (optional)

* Ignores RDKit::Dict::Pairs - previously private

* Fixes AllProps definition

* Fixes BondProps seperation

* Fixes reaction pickling - Adds ability to pickle atom + QueryAtom

* Bumps pickle version

* Removes fugly post-increments

* Changes Default to NoProps

* Tests more options for pickling

* Runs clang format

* Adds get/setDefaultPropertyPickleOptions, exposes to python

* turns tests back on.

* Fixes enum (clang was allowing c++11 semantics)

* Adds global settings test

* Code/GraphMol/testPicklerGlobalSettings.cpp
2017-02-09 16:06:01 +01:00
Greg Landrum
ae774c4f24 add support the new sequence readers to wrappers (#1181) (#1221)
* Fixes #1181
needs more testing

* improved docs and a couple tests

* add the new sequence support to the java wrappers too
2016-12-21 04:42:17 +01:00
Matt Swain
abbac22a8c Fix Java Trajectory Test 2016-11-15 14:51:05 +00:00
Brian Kelley
8c41e248e4 Fix/java win64 memoryleak (#1159)
* Fixes memory leak

* Fixes java windows 64 builds
2016-11-11 04:44:22 +01:00
Steve Roughley
3680644ebf Added getAlignmentTransform to ROMol.i to expose in Java SWIG wrapper (#1155)
* Added getAlignmentTransform to ROMol.i to expose in Java SWIG wrapper

* Added missing argument

Added missing argument to call to getAlignmentTransform causing build failure

* Added test case for getAlignmentTransform

* Update AlignTests.java

* Update AlignTests.java

* Update AlignTests.java
2016-11-10 21:44:03 +01:00
Greg Landrum
051a4deb12 add tests for the new param objects from java 2016-11-05 20:03:25 +01:00
Greg Landrum
4315388f77 Add a parameters structure for controlling the embedding options. (#1121)
* initial version; no actual testing yet

* start on tests

* rename seed->randomSeed; add tests

* add support in java wrapper

* add support in python wrapper

* initial version; no actual testing yet

* start on tests

* rename seed->randomSeed; add tests

* add support in java wrapper

* add support in python wrapper

* yapf

* document the parameter object;
introduce pre-defined const objects for ETDG, ETKDG, and KDG

* this is why we write tests

* swig did not like the initialization in the header file
2016-11-01 11:39:03 +01:00
Brian Kelley
13c3eef7c4 Dev/expose filtermatch to swig (#1117)
* Exposes FilterMatch and getFilterMatches to java

* Updates java test

* Fixes typo in test
2016-10-21 20:43:00 -04:00
Brian Kelley
092ab6ff12 Fixes csharp build for 64 bit systems (#1098)
* Fixes csharp build for 64 bit systems

* Need to support make and make install stages

* switch to an alternate strategy and get it working for the java wrappers too
this now builds for me on 64bit win10 with MSVC14

* add missing files from that last commit

* Hopefully fixes unix and osx builds while maintaining msvc builds

* Fixes mono builds, removes python check
2016-10-14 15:40:05 +02:00
Greg Landrum
74635c5fe1 Fix leak with renumberAtoms() in the SWIG wrappers (#1064)
* fix a leak with renumberAtoms() in Java

* add a test to show that leak
2016-09-13 12:24:08 -04:00
Greg Landrum
cb710340a1 Support ETKDG from within the SWIG wrappers (#1010)
* add test files

* add seed to the mol name so that it is obvious

* add support (and tests) for ETKDG to Java
2016-08-08 11:08:55 +02:00
Greg Landrum
df0036cb12 try and resolve intermittent travis build problems
There seems to be a problem in some travis builds where some java wrapper files aren't finished writing before the next step of the build happens. This is an attempt to resolve that.
2016-08-02 17:19:03 +02:00
Paolo Tosco
a286112cbe Java wrappers for Trajectory/Snapshot objects (#977)
* - started SWIG wrapping of Trajectory code
* - work in progress
* - wip
* - wip
* - WIP on TrajectoryTests.java
* - WIP
* - WIP
* - TrajectoryTests.java completed
* - reverted file modified my accident
2016-07-20 22:51:01 -04:00
Brian Kelley
2debdfde0d Adds RDAny (smaller generic holder) Updates all used dictionaries (#896)
* Adds RDAny (smaller generic holder) Updates all used dictionaries

This is an API compliant version of the current rdany system,
but uses a lot less memory in practice.

* Removes code duplication

* Converts CHECK_INVARIANT to TEST_ASSERT

* Fixes DoubleTag issue

* Adds Bool to DoubleMagic implementation

* Removes reference to property pickler
2016-05-29 17:04:21 +01:00
Greg Landrum
db0db2e4e4 expose FPS functions to java; add tests for that (#897) 2016-05-02 14:39:48 -04:00
Paolo Tosco
15f358bb56 - fixed a build failure on CentOS 7 (which has Java 8, but whose javadoc does not seem to support the -Xdoclint:none flag
while the Java documentation builds fine in its absence)
2016-04-21 22:30:03 +01:00
Greg Landrum
76a338c1be Fixes #859 - add automatic downloads of the junit.jar code too
* download junit.jar automatically when it is needed

* do not need to download junit anymore

* doc update

* try a different maven url to see if that solves the MD5 problems
2016-04-13 09:54:03 -04:00
Brian Kelley
e647af599d Updates NumRotatableBondsOptions to be an enum 2016-03-21 20:37:52 -04:00
Brian Kelley
f26b53067e Exposes NumRotatableBondsOptions to java, adds tests 2016-03-17 10:14:20 -04:00
Brian Kelley
f1ca9e6115 Merge pull request #791 from greglandrum/feat/lazy_picker_for_java
Add a bit more control over the lazy MaxMin picker to the java layer
2016-03-01 23:47:40 -05:00
Brian Kelley
a779d5bcfd Add test for addDummyAtoms==false flag 2016-02-27 13:26:35 -05:00
Brian Kelley
8c2aca2dcd Exposes reduceProductToSideChains to Java 2016-02-27 09:53:56 -05:00
Greg Landrum
6002415bd2 add the useCache option to the java wrappers;
add tests for the MaxMin picker to the java wrappers
2016-02-26 08:07:03 +01:00
Greg Landrum
a2278045da Gets Java wrappers building with modern C++ compilers and recent versions of boost 2016-02-18 06:24:42 +01:00
Greg Landrum
1c730b489e fix a typo, cleanup some (but not all) whitespace 2016-02-17 18:09:59 +01:00
Greg Landrum
27a267bd6c Fixes #781 2016-02-17 16:19:01 +01:00
Josep Arús
54cca7dad1 removed doclint fix on java archive command 2016-02-11 12:11:13 +01:00
Greg Landrum
2fef24656f try to get this working with multiple java versions 2015-11-19 14:32:05 +01:00
Greg Landrum
678e771a71 this works for java8, but not java6. Need java version detection 2015-11-19 08:34:33 +01:00
Greg Landrum
3db6d874ba fix SWIG wrappers for the resonance mol suppliers 2015-11-04 05:29:50 +01:00
Paolo Tosco
ffa524c87b - added SWIG Java wrappers for ResonanceMolSupplier and
getResonanceSubstructMatches()
- added a few tests
2015-11-02 22:45:41 +00:00
Greg Landrum
1aec53181d add Int_List to SWIG wrappers 2015-10-12 07:34:57 +02:00
Greg Landrum
2cb414e639 Merge pull request #612 from bp-kelley/dev/filter-catalog-java-wrapper
Dev/filter catalog java wrapper
2015-09-26 05:38:49 -04:00
Brian Kelley
fe3bbb8944 Merge branch 'dev/filter-catalog-java-wrapper' of https://github.com/bp-kelley/rdkit into dev/filter-catalog-java-wrapper 2015-09-24 11:11:25 -04:00