Changeset 31ccb6

Timestamp:

Mar 18, 2010, 11:37:26 AM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

800dc3

Parents:

6d0fcaa

git-author:

Frederik Heber <heber@…> (03/18/10 11:34:39)

git-committer:

Frederik Heber <heber@…> (03/18/10 11:37:26)

Message:

molecule::StoreAdjacencyToFile() and molecule::StoreBondsToFile() now take additional filename.

• since ParseCommandLineOptions() has cases j and J which use the above functions, we have to generalize these functions to work also without a given path and with arbritrary filename.

Signed-off-by: Frederik Heber <heber@…>

Location:

molecuilder/src

Files:

• molecule.hpp (modified) (1 diff)
• molecule_fragmentation.cpp (modified) (1 diff)
• molecule_graph.cpp (modified) (4 diffs)

molecuilder/src/molecule.hpp

@@ -269 +269 @@
   int FragmentMolecule(int Order, config *configuration);
   bool CheckOrderAtSite(bool *AtomMask, Graph *GlobalKeySetList, int Order, int *MinimumRingSize, char *path = NULL);
-  bool StoreBondsToFile(char *path);
-  bool StoreAdjacencyToFile(char *path);
+  bool StoreBondsToFile(char *path, char *filename);
+  bool StoreAdjacencyToFile(char *path, char *filename);
   bool CheckAdjacencyFileAgainstMolecule(char *path, atom **ListOfAtoms);
   bool ParseOrderAtSiteFromFile(char *path);

molecuilder/src/molecule_fragmentation.cpp

@@ -703 +703 @@
 
     // store Adjacency file
-    StoreAdjacencyToFile(configuration->configpath);
+    char *filename = Malloc<char> (MAXSTRINGSIZE, "molecule::FragmentMolecule - *filename");
+    strcpy(filename, FRAGMENTPREFIX);
+    strcat(filename, ADJACENCYFILE);
+    StoreAdjacencyToFile(configuration->configpath, filename);
+    Free(&filename);
 
     // store Hydrogen saturation correction file

molecuilder/src/molecule_graph.cpp

@@ -978 +978 @@
 /** Storing the bond structure of a molecule to file.
  * Simply stores Atom::nr and then the Atom::nr of all bond partners per line.
- * \param *out output stream for debugging
  * \param *path path to file
+ * \param *filename name of file
  * \return true - file written successfully, false - writing failed
  */
-bool molecule::StoreAdjacencyToFile(char *path)
+bool molecule::StoreAdjacencyToFile(char *path, char *filename)
 {
   ofstream AdjacencyFile;
@@ -988 +988 @@
   bool status = true;
 
-  line << path << "/" << FRAGMENTPREFIX << ADJACENCYFILE;
+  if (path != NULL)
+    line << path << "/" << filename;
+  else
+    line << filename;
   AdjacencyFile.open(line.str().c_str(), ios::out);
   Log() << Verbose(1) << "Saving adjacency list ... ";
@@ -1007 +1010 @@
 /** Storing the bond structure of a molecule to file.
  * Simply stores Atom::nr and then the Atom::nr of all bond partners, one per line.
- * \param *out output stream for debugging
  * \param *path path to file
+ * \param *filename name of file
  * \return true - file written successfully, false - writing failed
  */
-bool molecule::StoreBondsToFile(char *path)
+bool molecule::StoreBondsToFile(char *path, char *filename)
 {
   ofstream BondFile;
@@ -1017 +1020 @@
   bool status = true;
 
-  line << path << "/" << FRAGMENTPREFIX << ADJACENCYFILE;
+  if (path != NULL)
+    line << path << "/" << filename;
+  else
+    line << filename;
   BondFile.open(line.str().c_str(), ios::out);
   Log() << Verbose(1) << "Saving adjacency list ... ";