Changeset c4a0a2

Timestamp:

Jun 10, 2008, 11:13:41 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

68fbb5

Parents:

d11f22

Message:

enabled fast parsing (-n)

config::Load(): the repetition and thereby impossible setting of "sequential" makes reading of big configs very slow. Hence, a command line parameter can be specified to skip more instances of Ion_Type...

File:

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

molecuilder/src/config.cpp

@@ -24 +24 @@
   configname[0]='\0';
   
+  FastParsing = false;
   ProcPEGamma=8;
   ProcPEPsi=1;
@@ -642 +643 @@
       atom *neues = new atom();
       // then parse for each atom the coordinates as often as present
-      while (ParseForParameter(verbose,file, keyword, 0, 1, 1, double_type, &neues->x.x[0], repetition, (repetition == 1) ? critical : optional) &&
-        ParseForParameter(verbose,file, keyword, 0, 2, 1, double_type, &neues->x.x[1], repetition, (repetition == 1) ? critical : optional) &&
-        ParseForParameter(verbose,file, keyword, 0, 3, 1, double_type, &neues->x.x[2], repetition, (repetition == 1) ? critical : optional))
-        repetition++;
-      repetition--;
-      //cout << "Found " << repetition << " times of the keyword " << keyword << "." << endl;
+      if (!FastParsing) {
+        while (ParseForParameter(verbose,file, keyword, 0, 1, 1, double_type, &neues->x.x[0], repetition, (repetition == 1) ? critical : optional) &&
+          ParseForParameter(verbose,file, keyword, 0, 2, 1, double_type, &neues->x.x[1], repetition, (repetition == 1) ? critical : optional) &&
+          ParseForParameter(verbose,file, keyword, 0, 3, 1, double_type, &neues->x.x[2], repetition, (repetition == 1) ? critical : optional))
+          repetition++;
+        repetition--;
+        //cout << "Found " << repetition << " times of the keyword " << keyword << "." << endl;
+      }
       ParseForParameter(verbose,file, keyword, 0, 1, 1, double_type, &neues->x.x[0], repetition,critical);
       ParseForParameter(verbose,file, keyword, 0, 2, 1, double_type, &neues->x.x[1], repetition,critical);
@@ -656 +659 @@
       if(!ParseForParameter(verbose,file, keyword, 0, 6, 1, double_type, &neues->v.x[1], repetition,optional))
         neues->v.x[1] = 0.;
-      if(!ParseForParameter(verbose,file, keyword, 0, 7, 1, double_type, &neues->v.x[2], repetition,optional))
+      if(!ParseForParameter(verbose,file, keyword, (int)FastParsing, 7, 1, double_type, &neues->v.x[2], repetition,optional))
         neues->v.x[2] = 0.;
       neues->type = elementhash[i]; // find element type