* Fixes#8379
* check in some working tests
* test passes
* test passes
* test passes
* test passes
* test passes
* ensure that the invariants flush the streams on failure
* tests pass
* test passes
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* tests pass
* Fixes#8391
* tests pass
* fix a test with legacy
not clear why this was not causing problems before
* make a test work
* Fixes#8396
* gcc builds work
* fingerprint tests pass
* mention backwards incompatible change
* fix a problem with FindMolChiralCenters
* more testing details
* enable the test status output
* Fixes#8432
fix a bug in double-bond stereo handling for template matching
* all depictor tests pass
* use the new-stereo chiral ranks in the depiction code
* always assign new-stereo chiral ranks
* make _ChiralAtomRank a computed property
This is analogous to _CIPRank
* tweak to the way the atom ordering is computed for 2D coordinate generation
* update two expected results
* backup
* response to review
* tests pass
* tests pass
---------
Co-authored-by: = <=>
* Option to use standard atom colours under highlights.
* Update hash codes for catch_tests.cpp.
* Update hash codes for test1.cpp and rxn_test1.cpp.
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
* Option to put padding round elements of reaction.
* Rename the option to componentPadding.
* Missed one.
* Correct filename.
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
* Fix bond smoothing - apply atom index offset to products.
Update Hash codes.
Tweak side_by_side_images.py.
* Added hash code for new file. Doh!
* Option to remove brackets from atom lists.
* Python wrapper.
* Change option name after review.
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
* Fix bond smoothing - apply atom index offset to products.
Update Hash codes.
Tweak side_by_side_images.py.
* Added hash code for new file. Doh!
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
* Move atom labels round if they clash.
* Tidy.
* Re-work orientation logic.
Remove virtual fns from AtomSymbol.
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
* atropisomer handling added
* fixed non-used variables, linking directives
* BOOST LIB start/stop fixes, linking fix
* Fixes for RDKIT CI errors
* minimalLib fix
* changed vector<enum> for java builds
* check for extra chars in CIP labeling
* removed wrong deprecated message
* fix ostrstream output error?
* restored _ChiralAtomRank to lowercase first letter
* changes for merged master
* Fixed catch label for new Catch package
* update expected psql results
* get swig wrappers building
* restore MolFileStereochem to FileParsers
* fix java wrapper for reapplyMolBlockWedging
* test changes
* some suggestions
* move a couple functions out of Bond
* Merge branch 'master' into pr/atropisomers2
* merged master
* Renamed setStereoanyFromSquiggleBond
* atropisomers in cdxml, rationalize atrop wedging, stereoGroups in drawMol
* Merge branch 'master' into pr/specialQueries
* changes from previous PR
* Iclude false chiral
* rigorous enhnced stereo canoncalization
* Added more tests and clenup
* removed commented out code
* corrected init of SmilesWriteParams
* added MolFileStereoChem.h to the header files
* Renamed Rxn parser to MrvBlockToChemicalReaction
* To make catch2 work, and match the checksum
* Fixed Structchecker errors
* fix CI for DetermineBonds catch test
* error in catch_test for CI
* Allow custom smileWriteParams in GetMolLayers
* misnamed entry point
* ReactionFromMrvString change name
* remove adding writeParams to GetMolLayers
* make rigorous enhanced stereo the default, and fix tests
* only one abs group no longer needs Rigorous Enhanced treatment
* changed string_view to string in catch test
* Canonicalize Enhnaced Stereo only resturne unique smiles
* Now allows or and and groups together
* internal routines inside detail scope
* fix test error
* changed string back to string_view and fixed a CHECK
* Fixes for PR review tests
* Fix RDKit_Book.rst failure on build test
* fix xqm sql test
* updated expected files for cxsmiles_test
* Fixed removal of atom attrs
* Fixed tests after merge of master
* More efficient version of Stereo Groups Canonicalization
* Fixes for ctests
* removed debug code
* readded cipLabel test
* fix generalizedSubstruct/catch_tests.cpp error
* hueristics to improve speed
* Rationaized control of abs groups
* removed unused routine
* added rigorous stereo group treatment to test
* some suggested changes
* Changes per PR review and removed some changes to smiles
* Fixed CI errors
* changes per PR review
* more PR review vhanges and cleanup
* Fixed PSql PKL change
* changes as per PR review
* Restored error type for bad mols for canonicalizeStereoGroups and added a test
* Merge master and fix test in MolDraw2D
* Fix for randomize test error and other PR review comments
* Removed unsued variable to fix mac CI
* do not force aromatization in canonicalizeStereoGroups
* changes as per PR review
---------
Co-authored-by: greg landrum <greg.landrum@gmail.com>
* fix aliasing bug in MultithreadedSDMolSupplier
* update GeneralFileReader to v2 API
* add backwards incompatibility note
* v1 of this
* The helper function needs to be inline
* forgot the tests
* allow non-threadsafe builds
* MultithreadedMolSuppliers can now be destroyed without being used.
This was previously not possible
* add callbacks to the multithreaded readers
* document the new functions
* switch to storing the queues in unique_ptrs
* does not work
* only do those tests when in MT mode
* more generalfilereader cleanup
* tests pass
* passes tests
* extremely basic python wrapper
* better wrapper
* does not work
* tests pass
* test data
* fix failing test on ARM macs
we need to followup on why the wedging is different here
* move some stuff to the cpp file
the idea is to have the windows DLL builds not break
* fix(?) win64 linkage problems
* remove a warning in non-multi-threaded builds
* fix non-multi-threaded work
* well, at least local windows builds work
* remove duplicated code
* refactoring
simplification?
* simplify mutext handling
* review suggestions
* Make atom symbols black if atom is highlighted.
* Only do it for circle and continuous highlights.
* A lot of hash codes changed.
* Check hash code for new file.
* Change the highlighted atom to the same as carbon to accommodate dark mode, for example.
* Change the highlighted atom to the same as carbon to accommodate dark mode, for example. But get the logic right this time.
* Safer map lookup.
* Stackoverflow says this is better for >= C++17 as only one lookup.
* Don't do the fancy merging of solid wedges and bond lines for triple bonds.
* Changes after review.
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
* - When depictions are made using the useMolBlockWedging flag, make sure that kekulization is done after original wedging has been applied to reduce the odds that bond wedges are placed on double bonds
- Refactored MinimalLib code to avoid code duplication
- get_molblock() should reapplyMolBlockWedging on a copy of the passed molecule rather than on the original
- Added unit tests
* Update Code/MinimalLib/jswrapper.cpp
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
---------
Co-authored-by: ptosco <paolo.tosco@novartis.com>
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
* support wedging in double and aromatic bonds
This is a first pass and the testing isn't really there.
* add expected test results (from windows...)
switch to not using freetype for the tests
* response to review
* Fixes#7140
deprecates the old version and creates a new one in Chirality.h
adds it to the python wrappers
* changes in response to review
* backup
* support custom labels with templates
* Before making a wedged bond meet a single bond, check if they're co-linear and skip if so.
* Write the file before the test so we can still look at it if the test fails.
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
* atropisomer handling added
* fixed non-used variables, linking directives
* BOOST LIB start/stop fixes, linking fix
* Fixes for RDKIT CI errors
* minimalLib fix
* changed vector<enum> for java builds
* check for extra chars in CIP labeling
* removed wrong deprecated message
* fix ostrstream output error?
* restored _ChiralAtomRank to lowercase first letter
* changes for merged master
* Fixed catch label for new Catch package
* update expected psql results
* get swig wrappers building
* restore MolFileStereochem to FileParsers
* fix java wrapper for reapplyMolBlockWedging
* some suggestions
* move a couple functions out of Bond
* Merge branch 'master' into pr/atropisomers2
* merged master
* Renamed setStereoanyFromSquiggleBond
* atropisomers in cdxml, rationalize atrop wedging, stereoGroups in drawMol
* fix for CI build
* attempt to fix java build in CI
* attempt to fix java build in CI #2
* New routine to remove non-explicit 3D-geneated chirality
* changed to use pair for atrop atoms and related bonds
* Changes as per PR reviews
* PR review respnses
* PR review reponse - more
* Fix merge from master
* fixing java ci after merge
* Updated the help doc for atripisomers
* update the atropisomer docs
* improve the images
* add the source CXSMILES
---------
Co-authored-by: greg landrum <greg.landrum@gmail.com>
* Diatomic tests working.
* Working with simple multi-atom tests.
* Most tests not working.
* Minor tidy.
* Almost working. Failure in lasso_highlights_6.svg.
* Intersecting circles looks ok for same radius.
* All seems to be working.
* Better tests.
* Tidy up.
* More tidying.
* Fix warnings.
* Fix warnings.
* Change REQUIRE to CHECK.
* Changes after review.
* Better separation of lines.
* Only put atoms in colour list once.
* Test.
* Hash codes.
* Response to review.
* First attempt at fixing stray line.
* Tidier.
* Squared distances.
* Make reaction drawings deal with padding properly.
* Move large lambdas into anonymous namespace.
Correct totWidth after scaling plusWidth.
* Update some hashcodes.
* Take out debugging setting. Bugger.
* Padding on height as well.
* Hash codes.
* Delay padding use in flexiCanvas.
* More centring.
* Light grey background in side_by_side table.
* Tweak agents layout for testReactionCoords.
* Fully ignore missing reagents and products.
* Hash codes.
* Const references.
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
* enable Werror on Mac and Linux
* do not fail on boost multiprecision pessimizing move
* fix eigen array_bounds warning
* Fix unused arg in Rascal MCS
* fix range-loop-construct warning in Rascal MCES
* fix sign mismatched comparison
* drop unused lambda capture
* allow FMCS timeout test more time under Debug (not a warning!)
* fix fwd declaration of struct RascalClusterOptions
* fix deallocator mismatch
* fix two minor leaks
* fix a real leak
* more minor leaks
* fix another real leak, plus some potential ones
* fix std::move preventing copy ellision
* allow longer run time for debug builds
* make maxBondMatchPairs and getLargestFragSize unsigned int
* make snake case camel case
* update to current master, fix new warnings
* update again and more fixes
* add #include <optional>
* fix char array deallocation
* update and fixes in Marvin writer
* unsigned int
* more copy ellision fixes
* more copy ellision fixes, and typos
* and some more
* First working lasso.
* Adjust lasso radii in non-overlapping sets of atoms.
* Move MultiColourHighlightStyle enum out of MolDrawOptions class.
Add Python wrappers.
* Update copyright notices.
* Fix bug where order of lines off arc wasn't clockwise, so circle wasn't trimmed properly.
* Use highlight_bond_map in lassos.
* Fix bug in colour selection for multi-coloured lasso bonds.
* Response to review.
* Attempt to add new option to JSON input.
* Fix bug with larger radii.
* Fix yet another bug with the arc tidying.
* Remove separate colouring of bond highlights in Lasso.
* Fix intersection between line and arc not on end of line.
* Another pernickety fix.
* Tidy.
* I should know better than to use the web editor
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
* Fix bug where large padding gave a legend font size of 0.
The padding is now implemented by making a smaller, offset drawing area within the width_ and height_, dimensions drawWidth_, drawHeight_. The previous drawHeight_ has been replaced by molHeight_.
* Update test results.
* Update hash codes.
* Update test results.
* Update test results for no freetype.
* Update hash codes for no freetype.
* Update hash codes for freetype.
* Update hash codes for no freetype.
* Update hash codes for freetype.
* Update expected test results.
* Update hash codes.
* Fix contour plots not being lined up with atoms.
* Fix shrinkToFit.
* Update expected test result.
* Fix typo in test name.
* Update expected test result.
* Update expected test result.
---------
Co-authored-by: David Cosgrove <david@cozchemix.co.uk>
Co-authored-by: Greg Landrum <greg.landrum@gmail.com>
