Skip to content

Commit 13384ac

Browse files
committed
new chebi data class for new readers
1 parent 36102f8 commit 13384ac

2 files changed

Lines changed: 56 additions & 0 deletions

File tree

chebai_graph/preprocessing/datasets/__init__.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
from .chebi import (
22
ChEBI50_Atom_WGNOnly_GraphProp,
3+
ChEBI50_GN_WithAllNodes_FG_WithAtoms_FGE,
4+
ChEBI50_GN_WithAllNodes_FG_WithAtoms_NoFGE,
5+
ChEBI50_GN_WithAtoms_FG_WithAtoms_FGE,
6+
ChEBI50_GN_WithAtoms_FG_WithAtoms_NoFGE,
37
ChEBI50_NFGE_NGN_GraphProp,
48
ChEBI50_NFGE_WGN_GraphProp,
59
ChEBI50_StaticGNI,
@@ -23,4 +27,8 @@
2327
"ChEBI50_WFGE_WGN_GraphProp",
2428
"ChEBI50_StaticGNI",
2529
"ChEBI50_WFGE_WGN_AsPerNodeType",
30+
"ChEBI50_GN_WithAllNodes_FG_WithAtoms_FGE",
31+
"ChEBI50_GN_WithAllNodes_FG_WithAtoms_NoFGE",
32+
"ChEBI50_GN_WithAtoms_FG_WithAtoms_FGE",
33+
"ChEBI50_GN_WithAtoms_FG_WithAtoms_NoFGE",
2634
]

chebai_graph/preprocessing/datasets/chebi.py

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
AtomFGReader_WithFGEdges_WithGraphNode,
3131
AtomReader_WithGraphNodeOnly,
3232
AtomsFGReader_NoFGEdges_NoGraphNode,
33+
GN_WithAllNodes_FG_WithAtoms_FGE,
34+
GN_WithAllNodes_FG_WithAtoms_NoFGE,
35+
GN_WithAtoms_FG_WithAtoms_FGE,
36+
GN_WithAtoms_FG_WithAtoms_NoFGE,
3337
GraphPropertyReader,
3438
GraphReader,
3539
RandomNodeInitializationReader,
@@ -595,6 +599,50 @@ class ChEBI50_WFGE_WGN_GraphProp(AugGraphPropMixIn_WithGraphNode, ChEBIOver50):
595599
READER = AtomFGReader_WithFGEdges_WithGraphNode
596600

597601

602+
class ChEBI50_GN_WithAllNodes_FG_WithAtoms_FGE(
603+
AugGraphPropMixIn_WithGraphNode, ChEBIOver50
604+
):
605+
"""
606+
ChEBIOver50 with FG nodes (connected to their respective atom nodes) with functional group
607+
edges, and adds a graph-level node connected to all nodes (fg + atoms).
608+
"""
609+
610+
READER = GN_WithAllNodes_FG_WithAtoms_FGE
611+
612+
613+
class ChEBI50_GN_WithAllNodes_FG_WithAtoms_NoFGE(
614+
AugGraphPropMixIn_WithGraphNode, ChEBIOver50
615+
):
616+
"""
617+
ChEBIOver50 with FG nodes (connected to their respective atom nodes) without functional group
618+
edges, and adds a graph-level node connected to all nodes (fg + atoms).
619+
"""
620+
621+
READER = GN_WithAllNodes_FG_WithAtoms_NoFGE
622+
623+
624+
class ChEBI50_GN_WithAtoms_FG_WithAtoms_FGE(
625+
AugGraphPropMixIn_WithGraphNode, ChEBIOver50
626+
):
627+
"""
628+
ChEBIOver50 with FG nodes (connected to their respective atom nodes) with functional group
629+
edges, and adds a graph-level node connected to all atom nodes.
630+
"""
631+
632+
READER = GN_WithAtoms_FG_WithAtoms_FGE
633+
634+
635+
class ChEBI50_GN_WithAtoms_FG_WithAtoms_NoFGE(
636+
AugGraphPropMixIn_WithGraphNode, ChEBIOver50
637+
):
638+
"""
639+
ChEBIOver50 with FG nodes (connected to their respective atom nodes) without functional group
640+
edges, and adds a graph-level node connected to all atom nodes.
641+
"""
642+
643+
READER = GN_WithAtoms_FG_WithAtoms_NoFGE
644+
645+
598646
class ChEBI50_NFGE_WGN_GraphProp(AugGraphPropMixIn_WithGraphNode, ChEBIOver50):
599647
"""ChEBIOver50 with FG nodes but without FG edges, with graph node."""
600648

0 commit comments

Comments
 (0)