An Adapted Similarity Kernel and Generalized Convex Hull for Molecular Crystal Structure Prediction