Changes in src/Actions/BondAction/BondRemoveAction.cpp [88afc9:26b4d62]

File:

• src/Actions/BondAction/BondRemoveAction.cpp (modified) (3 diffs)

src/Actions/BondAction/BondRemoveAction.cpp

@@ -57 +57 @@
 ActionState::ptr BondRemoveAction::performCall() {
   // check preconditions
-  World& world = World::getInstance();
-  if (world.countSelectedAtoms() <= 1) {
-    STATUS("At least two atoms must be selected for BondAction Remove.");
+  if (World::getInstance().countSelectedAtoms() != 2) {
+    STATUS("Exactly two atoms must be selected for BondAction Remove.");
     return Action::failure;
   }
-
-  bondPairIds_t bondPairIds;
-  for (World::AtomSelectionConstIterator firstiter = world.beginAtomSelection();
-      firstiter != world.endAtomSelection(); ++firstiter) {
-    for (World::AtomSelectionConstIterator seconditer = firstiter;
-        seconditer != world.endAtomSelection(); ++seconditer) {
-      if (firstiter == seconditer)
-        continue;
-      if ((firstiter->second)->IsBondedTo(WorldTime::getTime(), seconditer->second))
-        bondPairIds.push_back(
-            std::make_pair((firstiter->second)->getId(), (seconditer->second)->getId()));
-    }
-  }
-  if (bondPairIds.empty()) {
-    STATUS("No bonds are present.");
+  const std::vector<atom *> selected_atoms = World::getInstance().getSelectedAtoms();
+  if (!selected_atoms[0]->IsBondedTo(WorldTime::getTime(), selected_atoms[1])) {
+    STATUS("There is no bond in between the two selected atoms.");
     return Action::failure;
   }
 
   // create undo
-  BondRemoveState *UndoState = new BondRemoveState(bondPairIds, params);
+  BondRemoveState *UndoState = new BondRemoveState(selected_atoms[0]->getId(), selected_atoms[1]->getId(), params);
 
   // execute action
-  for (bondPairIds_t::const_iterator iter = bondPairIds.begin();
-      iter != bondPairIds.end(); ++iter) {
-    atom *firstatom = world.getAtom(AtomById(iter->first));
-    atom *secondatom = world.getAtom(AtomById(iter->second));
-    ASSERT((firstatom != NULL) && (secondatom != NULL),
-        "BondAddAction::performCall() - at least one of the ids "
-        +toString(iter->first)+" or "+toString(iter->second)+" is not present.");
-    firstatom->removeBond(WorldTime::getTime(), secondatom);
-    ASSERT( !firstatom->IsBondedTo(WorldTime::getTime(), secondatom),
-      "BondAddAction::performCall() - adding bond in between "
-      +toString(*firstatom)+" and "+toString(*secondatom)+" failed.");
-  }
+  selected_atoms[0]->removeBond(WorldTime::getTime(), selected_atoms[1]);
+  ASSERT( !selected_atoms[0]->IsBondedTo(WorldTime::getTime(), selected_atoms[1]),
+      "BondRemoveAction::performCall() - removing bond in between "
+      +toString(*selected_atoms[0])+" and "+toString(*selected_atoms[1])+" failed.");
 
   return ActionState::ptr(UndoState);
@@ -103 +82 @@
   BondRemoveState *state = assert_cast<BondRemoveState*>(_state.get());
 
-  World& world = World::getInstance();
-  for (bondPairIds_t::const_iterator iter = state->bondPairIds.begin();
-      iter != state->bondPairIds.end(); ++iter) {
-    atom * const firstatom = world.getAtom(AtomById(iter->first));
-    atom * const secondatom = world.getAtom(AtomById(iter->second));
-    ASSERT((firstatom != NULL) && (secondatom != NULL),
-        "BondAddAction::performCall() - at least one of the ids "
-        +toString(iter->first)+" or "+toString(iter->second)+" is not present.");
-    if (!firstatom->IsBondedTo(WorldTime::getTime(), secondatom)) {
-      firstatom->addBond(WorldTime::getTime(), secondatom);
-    } else {
-      ELOG(2, "There is already a bond in between "+toString(iter->first)
-          +" and "+toString(iter->second)+".");
-    }
+  // check whether bond already existed
+  atom * const first = World::getInstance().getAtom(AtomById(state->firstId));
+  atom * const second = World::getInstance().getAtom(AtomById(state->secondId));
+  ASSERT((first != NULL) && (second != NULL),
+      "BondRemoveAction::performUndo() - at least one of the ids "
+      +toString(state->firstId)+" or "+toString(state->secondId)+" is not present.");
+  if (!first->IsBondedTo(WorldTime::getTime(), second)) {
+    first->addBond(WorldTime::getTime(), second);
+  } else {
+    ELOG(2, "There is already a bond in between "+toString(state->firstId)
+        +" and "+toString(state->secondId)+".");
   }
 
@@ -125 +101 @@
   BondRemoveState *state = assert_cast<BondRemoveState*>(_state.get());
 
-  World& world = World::getInstance();
-  for (bondPairIds_t::const_iterator iter = state->bondPairIds.begin();
-      iter != state->bondPairIds.end(); ++iter) {
-    atom *firstatom = world.getAtom(AtomById(iter->first));
-    atom *secondatom = world.getAtom(AtomById(iter->second));
-    ASSERT((firstatom != NULL) && (secondatom != NULL),
-        "BondAddAction::performCall() - at least one of the ids "
-        +toString(iter->first)+" or "+toString(iter->second)+" is not present.");
-    if (firstatom->IsBondedTo(WorldTime::getTime(), secondatom)) {
-      firstatom->removeBond(WorldTime::getTime(), secondatom);
-    } else {
-      ELOG(2, "There is no bond in between "+toString(iter->first)
-          +" and "+toString(iter->second)+".");
-    }
+  // check whether bond already existed
+  atom * const first = World::getInstance().getAtom(AtomById(state->firstId));
+  atom * const second = World::getInstance().getAtom(AtomById(state->secondId));
+  ASSERT((first != NULL) && (second != NULL),
+      "BondRemoveAction::performRedo() - at least one of the ids "
+      +toString(state->firstId)+" or "+toString(state->secondId)+" is not present.");
+  if (first->IsBondedTo(WorldTime::getTime(), second)) {
+    first->removeBond(WorldTime::getTime(), second);
+  } else {
+    ELOG(2, "There is no bond in between "+toString(state->firstId)
+        +" and "+toString(state->secondId)+".");
   }