From fa751fa3b3417ccabd54c5025f075048efbc6c1b Mon Sep 17 00:00:00 2001 From: Umesh Timalsina Date: Tue, 27 Jul 2021 10:43:36 -0500 Subject: [PATCH] WIP- Remove layered_dihedral property --- gmso/core/topology.py | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/gmso/core/topology.py b/gmso/core/topology.py index d39e2ff23..a6f181718 100644 --- a/gmso/core/topology.py +++ b/gmso/core/topology.py @@ -154,9 +154,7 @@ def __init__(self, name="Topology", box=None): self._bonds = IndexedSet() self._angles = IndexedSet() self._dihedrals = IndexedSet() - self._layered_dihedrals = IndexedSet() self._impropers = IndexedSet() - self._layered_impropers = IndexedSet() self._subtops = IndexedSet() self._atom_types = {} self._atom_types_idx = {} @@ -344,20 +342,11 @@ def dihedrals(self): """Return all dihedrals in the topology.""" return tuple(self._dihedrals) - @property - def layered_dihedrals(self): - return tuple(self._layered_dihedrals) - @property def impropers(self): """Return all impropers in the topology.""" return tuple(self._impropers) - @property - def layered_impropers(self): - """Return all layered impropers in the topology.""" - return tuple(self._layered_impropers) - @property def atom_types(self): """Return all atom_types in the topology.""" @@ -529,16 +518,10 @@ def add_connection(self, connection, update_types=True): self._bonds.add(connection) if isinstance(connection, Angle): self._angles.add(connection) - if isinstance(connection, Dihedral): - self._dihedrals.add(connection) - if isinstance(connection, LayeredDihedral): + if isinstance(connection, BaseDihedral): self._dihedrals.add(connection) - self._layered_dihedrals.add(connection) - if isinstance(connection, Improper): - self._impropers.add(connection) - if isinstance(connection, LayeredImproper): + if isinstance(connection, BaseImproper): self._impropers.add(connection) - self._layered_impropers.add(connection) if update_types: self.update_connection_types()