Changeset 5eb05a for molecuilder/src/builder.cpp

Timestamp:

May 26, 2008, 10:52:00 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

71dc4e

Parents:

ccd028

Message:

molecule::CreateAdjacencyList() now needs IsAngstroem as parameter

This is necessary, as the database values (covalent radii et al) are in Angstroem, hence don't match if we use Bohrradii as length unit instead. CreateAdjacencyList() converts units and now finds correct bond structure and fragments properly.

File:

• molecuilder/src/builder.cpp (modified) (3 diffs)

molecuilder/src/builder.cpp

@@ -931 +931 @@
                 cout << Verbose(0) << "Creating connection matrix..." << endl;
                 start = clock();
-                mol->CreateAdjacencyList((ofstream *)&cout, atof(argv[argptr++]));
+                mol->CreateAdjacencyList((ofstream *)&cout, atof(argv[argptr++]), configuration.GetIsAngstroem());
                 cout << Verbose(0) << "Fragmenting molecule with current connection matrix ..." << endl;
                 if (mol->first->next != mol->last) {
@@ -1116 +1116 @@
           }
           if (mol->first->next != mol->last) // if connect matrix is present already, redo it
-            mol->CreateAdjacencyList((ofstream *)&cout, mol->BondDistance);
+            mol->CreateAdjacencyList((ofstream *)&cout, mol->BondDistance, configuration.GetIsAngstroem());
           // free memory
           delete[](Elements);
@@ -1159 +1159 @@
         cin >> tmp1;
         start = clock();
-        mol->CreateAdjacencyList((ofstream *)&cout, tmp1);
+        mol->CreateAdjacencyList((ofstream *)&cout, tmp1, configuration.GetIsAngstroem());
         //mol->CreateListOfBondsPerAtom((ofstream *)&cout);
         Subgraphs = mol->DepthFirstSearchAnalysis((ofstream *)&cout, false, MinimumRingSize);