Changeset a83171

Timestamp:

Mar 3, 2010, 2:53:07 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

328418d, 3d575e

Parents:

bd506d

git-author:

Frederik Heber <heber@…> (03/03/10 14:46:13)

git-committer:

Frederik Heber <heber@…> (03/03/10 14:53:07)

Message:

Default molecule name can be set via command line, BUGFIX: molecule::DepthFirstSearchAnalysis() seg'faulted on no atoms.

Allow '-I' on empty configs:

• molecule::DepthFirstSearchAnalysis(): check whether AtomCount==0
• molecule::molecule(): name is now not 'none' but copied from World::DefaultName
• MoleculeListClass::DissectMoleculeIntoConnectedSubgraphs():
  • Check for false from BondGraph::ConstructBondGraph()
  • Check for Subgraphs or its successor being NULL
• ParseCommandLineOptions(): first molecule only set active if molecules is not empty.

new case 'X' for setting default molecule name:

• new member variable World::DefaultName
• constructor of molecule uses this default name
• case 'X' in ParseCommandLineOptions() added for setting default name

Location:

molecuilder/src

Files:

• World.cpp (modified) (3 diffs)
• World.hpp (modified) (1 diff)
• builder.cpp (modified) (3 diffs)
• molecule.cpp (modified) (1 diff)
• molecule_graph.cpp (modified) (1 diff)
• moleculelist.cpp (modified) (2 diffs)

molecuilder/src/World.cpp

@@ -6 +6 @@
  */
 
+#include <string>
+
 #include "World.hpp"
 
 double *World::cell_size = 0;
+char *World::DefaultName = 0;
 
 /** Constructor of World.
@@ -16 +19 @@
 {
   cell_size = new double[6];
+  DefaultName = new char[6];
+  strncpy(DefaultName, "none", 4);
 };
 
@@ -24 +29 @@
 {
   delete[](cell_size);
+  delete[](DefaultName);
 };
 

molecuilder/src/World.hpp

@@ -32 +32 @@
 
   static double *cell_size;
+  static char *DefaultName;
 
 private:

molecuilder/src/builder.cpp

@@ -1480 +1480 @@
             Log() << Verbose(0) << "\t-v\t\tsets verbosity (more is more)." << endl;
             Log() << Verbose(0) << "\t-V\t\tGives version information." << endl;
+            Log() << Verbose(0) << "\t-X\t\tset default name of a molecule." << endl;
             Log() << Verbose(0) << "Note: config files must not begin with '-' !" << endl;
             return (1);
@@ -1518 +1519 @@
             Log() << Verbose(0) << "I won't parse trajectories." << endl;
             configuration.FastParsing = true;
+            break;
+          case 'X':
+            {
+              char **name = &(World::get()->DefaultName);
+              delete[](*name);
+              const int length = strlen(argv[argptr]);
+              *name = new char[length+2];
+              strncpy(*name, argv[argptr], length);
+              Log() << Verbose(0) << "Default name of new molecules set to " << *name << "." << endl;
+            }
             break;
           default:   // no match? Step on
@@ -1709 +1720 @@
                   }
               }
-              if (mol == NULL) {
+              if ((mol == NULL) && (!molecules->ListOfMolecules.empty())) {
                 mol = *(molecules->ListOfMolecules.begin());
-                mol->ActiveFlag = true;
+                if (mol != NULL)
+                  mol->ActiveFlag = true;
               }
               break;

molecuilder/src/molecule.cpp

@@ -46 +46 @@
   for(int i=MAX_ELEMENTS;i--;)
     ElementsInMolecule[i] = 0;
-  strcpy(name,"none");
+  strcpy(name,World::get()->DefaultName);
 };
 

molecuilder/src/molecule_graph.cpp

@@ -495 +495 @@
   bond *Binder = NULL;
 
+  if (AtomCount == 0)
+    return SubGraphs;
   Log() << Verbose(0) << "Begin of DepthFirstSearchAnalysis" << endl;
   DepthFirstSearchAnalysis_Init(DFS, this);

molecuilder/src/moleculelist.cpp

@@ -786 +786 @@
 
   // 1. dissect the molecule into connected subgraphs
-  configuration->BG->ConstructBondGraph(mol);
+  if (configuration->BG->ConstructBondGraph(mol)) {
+    delete (mol);
+    eLog() << Verbose(1) << "There are no bonds." << endl;
+    return;
+  }
 
   // 2. scan for connected subgraphs
@@ -793 +797 @@
   Subgraphs = mol->DepthFirstSearchAnalysis(BackEdgeStack);
   delete(BackEdgeStack);
+  if ((Subgraphs == NULL) || (Subgraphs->next == NULL)) {
+    delete (mol);
+    eLog() << Verbose(1) << "There are no atoms." << endl;
+    return;
+  }
 
   // 3. dissect (the following construct is needed to have the atoms not in the order of the DFS, but in