Changeset d2be22 for src/Actions

Timestamp:

Dec 19, 2025, 11:29:38 PM (7 weeks ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.1, stable

Children:

25aa214

Parents:

29ba9a

git-author:

Frederik Heber <frederik.heber@…> (11/16/25 11:12:52)

git-committer:

Frederik Heber <frederik.heber@…> (12/19/25 23:29:38)

Message:

Actions relying on BondGraph fail if not bond table is loaded.

• this is to ensure to not stumble over missing optimal bond lengths from the table, like with StretchBondAction.
• TESTFIX: All regression tests that use these actions need to load the bond-table now.

Location:

src/Actions

Files:

• AtomAction/BondifyAction.cpp (modified) (1 diff)
• GraphAction/CreateAdjacencyAction.cpp (modified) (1 diff)
• GraphAction/UpdateMoleculesAction.cpp (modified) (1 diff)
• MoleculeAction/StretchBondAction.cpp (modified) (2 diffs)

src/Actions/AtomAction/BondifyAction.cpp

@@ -214 +214 @@
   // ensure we have one selected atom
   World &world = World::getInstance();
-  const BondGraph &BG = *world.getBondGraph();
+  const BondGraph &BG = *world.getBondGraph();  
 
   // check precondition
+  if (!BG.IsBondLengthTableLoaded()) {
+    STATUS("BondLength table has not been loaded.");
+    return Action::failure;
+  }
   const std::vector<atom *> atoms = world.getSelectedAtoms();
   if (atoms.size() != 1) {

src/Actions/GraphAction/CreateAdjacencyAction.cpp

@@ -66 +66 @@
   BondGraph *BG = World::getInstance().getBondGraph();
   ASSERT(BG != NULL, "GraphCreateAdjacencyAction: BondGraph is NULL.");
+
+  if (!BG->IsBondLengthTableLoaded()) {
+    STATUS("BondLength table has not been loaded.");
+    return Action::failure;
+  }
 
   // count all present bonds

src/Actions/GraphAction/UpdateMoleculesAction.cpp

@@ -43 +43 @@
 #include "CodePatterns/Log.hpp"
 #include "CodePatterns/Verbose.hpp"
-#include "Graph/BondGraph.hpp"
 #include "Graph/DepthFirstSearchAnalysis.hpp"
 #include "molecule.hpp"

src/Actions/MoleculeAction/StretchBondAction.cpp

@@ -47 +47 @@
 #include "Bond/bond.hpp"
 #include "Bond/StretchBond.hpp"
+#include "Graph/BondGraph.hpp"
 #include "Graph/BoostGraphHelpers.hpp"
 #include "World.hpp"
@@ -60 +61 @@
 ActionState::ptr MoleculeStretchBondAction::performCall()
 {
+  BondGraph *BG = World::getInstance().getBondGraph();
+  if (!BG->IsBondLengthTableLoaded()) {
+    STATUS("BondLength table has not been loaded.");
+    return Action::failure;
+  }
+
   const std::vector< atom *> atoms = World::getInstance().getSelectedAtoms();
   StretchBondUtil stretcher(atoms);