Changeset d982bb for molecuilder/src/parser.cpp

Timestamp:

Apr 28, 2008, 11:36:11 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

8efbfc

Parents:

34d37c

Message:

All filenames (const char *) have been transferred to defs.hpp

Filenames have been transformed into #define's into order to centralise these values. Parser.hpp had these already and they were streamlined to match defs.hpp (which is now included in parser.hpp)

File:

• molecuilder/src/parser.cpp (modified) (8 diffs)

molecuilder/src/parser.cpp ¶

@@ -43 +43 @@
   stringstream line;
 
-  line << argv[1] << FactorsFile;
+  line << argv[1] << FRAGMENTPREFIX << TEFACTORSFILE;
   return FilePresent(line.str().c_str());
 };
@@ -106 +106 @@
   // count the number of matrices
   MatrixCounter = -1; // we count one too much
-  line << name << FactorsFile;
+  line << name << FRAGMENTPREFIX << TEFACTORSFILE;
   input.open(line.str().c_str(), ios::in);
   if (input == NULL) {
@@ -127 +127 @@
     FragmentNumber = FixedDigitNumber(MatrixCounter, i);
     if (i != MatrixCounter)  
-      line << name << FragmentPrefix << FragmentNumber << "/" << prefix << suffix;
+      line << name << FRAGMENTPREFIX << FragmentNumber << "/" << prefix << suffix;
     else
       line << name << prefix << suffix;
@@ -329 +329 @@
     stringstream line;
     FragmentNumber = FixedDigitNumber(MatrixCounter, i);
-    line << name << FragmentPrefix << FragmentNumber << "/" << prefix;
+    line << name << FRAGMENTPREFIX << FragmentNumber << "/" << prefix;
     Free((void **)&FragmentNumber, "*FragmentNumber");
     output.open(line.str().c_str(), ios::out);
@@ -424 +424 @@
   cout << "Parsing force indices." << endl;
   Indices = (int **) Malloc(sizeof(int *)*(MatrixCounter+1), "ForceMatrix::ParseIndices: **Indices");
-  line << name << ForcesFile;
+  line << name << FRAGMENTPREFIX << FORCESFILE;
   input.open(line.str().c_str(), ios::in);
   //cout << "Opening " << line.str() << " ... "  << input << endl;
@@ -439 +439 @@
     Indices[i] = (int *) Malloc(sizeof(int)*RowCounter[i], "ForceMatrix::ParseIndices: *Indices[]");
     FragmentNumber = FixedDigitNumber(MatrixCounter, i);
-    cout << FragmentPrefix << FragmentNumber << "[" << RowCounter[i] << "]:";
+    cout << FRAGMENTPREFIX << FragmentNumber << "[" << RowCounter[i] << "]:";
     Free((void **)&FragmentNumber, "ForceMatrix::ParseIndices: *FragmentNumber");
     for(int j=0;(j<RowCounter[i]) && (!line.eof());j++) {
@@ -521 +521 @@
   cout << "Parsing key sets." << endl;
   KeySets = (int **) Malloc(sizeof(int *)*FragmentCounter, "KeySetsContainer::ParseKeySets: **KeySets");
-  line << name << KeySetsFile;
+  line << name << FRAGMENTPREFIX << KEYSETFILE;
   input.open(line.str().c_str(), ios::in);
   if (input == NULL) {
@@ -535 +535 @@
     KeySets[i] = (int *) Malloc(sizeof(int)*AtomCounter[i], "KeySetsContainer::ParseKeySets: *KeySets[]");
     FragmentNumber = FixedDigitNumber(FragmentCounter, i);
-    cout << FragmentPrefix << FragmentNumber << "[" << AtomCounter[i] << "]:";
+    cout << FRAGMENTPREFIX << FragmentNumber << "[" << AtomCounter[i] << "]:";
     Free((void **)&FragmentNumber, "KeySetsContainer::ParseKeySets: *FragmentNumber");
     input.getline(filename, 1023);