Skip to content

Commit 3892b1b

Browse files
authored
Refactor SymbolicSolver class and bond patterns
1 parent 5b6b6fb commit 3892b1b

1 file changed

Lines changed: 12 additions & 13 deletions

File tree

  • opencompass/datasets/moleculariq/moleculariq_core/solver

opencompass/datasets/moleculariq/moleculariq_core/solver/solver.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,21 @@
1919
except Exception:
2020
Chem, rdmd, Descriptors, BRICS, Lipinski, AllChem = None, None, None, None, None, None
2121

22-
# ---------------------------------------------------------------------------------------
23-
# Class definitions
2422

25-
STRICT_ROTATABLE_BOND_SMARTS = (
26-
"[!$(*#*)&!D1&!$(C(F)(F)F)&!$(C(Cl)(Cl)Cl)&!$(C(Br)(Br)Br)"
27-
"&!$(C([CH3])([CH3])[CH3])&!$([CD3](=[N,O,S])-!@[#7,O,S!D1])"
28-
"&!$([#7,O,S!D1]-!@[CD3]=[N,O,S])&!$([CD3](=[N+])-!@[#7!D1])"
29-
"&!$([#7!D1]-!@[CD3]=[N+])]-,:;!@[!$(*#*)&!D1&!$(C(F)(F)F)"
30-
"&!$(C(Cl)(Cl)Cl)&!$(C(Br)(Br)Br)&!$(C([CH3])([CH3])[CH3])]"
31-
)
32-
STRICT_ROTATABLE_BOND_PATTERN = Chem.MolFromSmarts(
33-
STRICT_ROTATABLE_BOND_SMARTS
34-
)
23+
class SymbolicSolver:
24+
25+
STRICT_ROTATABLE_BOND_SMARTS = (
26+
"[!$(*#*)&!D1&!$(C(F)(F)F)&!$(C(Cl)(Cl)Cl)&!$(C(Br)(Br)Br)"
27+
"&!$(C([CH3])([CH3])[CH3])&!$([CD3](=[N,O,S])-!@[#7,O,S!D1])"
28+
"&!$([#7,O,S!D1]-!@[CD3]=[N,O,S])&!$([CD3](=[N+])-!@[#7!D1])"
29+
"&!$([#7!D1]-!@[CD3]=[N+])]-,:;!@[!$(*#*)&!D1&!$(C(F)(F)F)"
30+
"&!$(C(Cl)(Cl)Cl)&!$(C(Br)(Br)Br)&!$(C([CH3])([CH3])[CH3])]"
31+
)
3532

33+
STRICT_ROTATABLE_BOND_PATTERN = Chem.MolFromSmarts(
34+
STRICT_ROTATABLE_BOND_SMARTS
35+
)
3636

37-
class SymbolicSolver:
3837
def __init__(self):
3938
self.functional_group_solver = FunctionalGroupSolver()
4039
self.reaction_solver = TemplateBasedReactionSolver()

0 commit comments

Comments
 (0)