Changeset 35bab2 for util/src/average.cpp

Timestamp:

Apr 14, 2010, 1:36:24 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

5a84ee

Parents:

4283d0

Message:

rewritten statistical tool average.

• average has been very specific to pcp (included ecut parameter).
• is now general: parses a column, may skip some initial rows, and evaluates average and mean deviation.

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

File:

• util/src/average.cpp (modified) (3 diffs)

util/src/average.cpp

@@ -13 +13 @@
         double avg, dev;
         double tmp;
-        int j, zaehler;
-  int firstcol, lastcol;
-        double ecut;
+        int zaehler;
+  int col;
         int flag;
+        int skiplines=0;
         string zeile;
         stringstream line;
@@ -22 +22 @@
         cout << ESPACKVersion << endl;
 
-        if (argc < 4) {
-                cout << "Usage: " << argv[0] << " <firstCol> <lastCol> <X> <File>\n";
+        if (argc <= 2) {
+                cout << "Usage: " << argv[0] << " <column (zero-based)> <data file> [#skip initial lines]\n";
                 return(1);
         }
-        line.str(argv[1]);
-  line >> firstcol;
-  line.clear();
-  line.str(argv[2]);
-  line >> lastcol;
-  line.clear();
-  line.str(argv[3]);
-  line >> ecut;
-  cout << "Going from " << firstcol << " to " << lastcol << " with Ecut of " << ecut << "." << endl;
+        {
+    line.str(argv[1]);
+    line >> col;
+    cout << "Using column " << col << "." << endl;
+    line.clear();
+        }
+        if (argc > 3) {
+    line.str(argv[3]);
+    line >> skiplines;
+    cout << "Will skip first " << skiplines << " lines." << endl;
+    line.clear();
+        }
 
         // get average
         avg = 0.;
         zaehler=0;
-        ifstream test(argv[4]);
-        if (test == NULL) { cout << "Can't open File " << argv[4] << "\n"; return(255); }
+        ifstream test(argv[2]);
+        if (test == NULL) { cout << "Can't open File " << argv[2] << "\n"; return(255); }
         flag=1;
-        //cout << "Looking for " << ecut << " \n";
         while (getline(test, zeile, '\n')) {
-                //cout << zeile;
-                istringstream input(zeile);
-                input >> ws >> tmp;                     
-                if (tmp==(double)ecut) {        // found correct line!
-                        for (j=2;j<=lastcol;j++)
-                                if (!input.eof()) {
-                                        input >> ws >> tmp;
-          if (j >= firstcol) {
-            avg += tmp;
-            zaehler++;
-          }
-        } 
-                } 
+          if (skiplines) {
+            skiplines--;
+            continue;
+          }
+    line.clear();
+    line.str(zeile);
+    for (int j=0;j<=col;j++)
+      if (!line.eof()) {
+        line >> ws >> tmp;
+      } else {
+        flag=0;
+      }
+    if (flag) {
+      avg += tmp;
+      zaehler++;
+    }
         }
-  test.clear();
-        test.seekg(ios::beg);
-        if (zaehler != 0) avg /= zaehler;       
+        if (!flag) {
+    cerr << "File does not contain " << col << " column(s)." << endl;
+    exit(1);
+        } else
+          if (zaehler != 0) avg /= zaehler;
+        // goto to beginning again
+        test.clear();
+  test.seekg(ios::beg);
 
         // get deviation
@@ -66 +76 @@
         zaehler=0;
         flag=1;
-        while (getline(test, zeile, '\n')) {
-                istringstream input(zeile);
-                input >> ws >> tmp;                     
-                if (tmp==(double)ecut) {        // found correct line!
-                        for (j=2;j<=lastcol;j++)
-                                if (!input.eof()) {
-                                        input >> ws >> tmp;
-          if (j >= firstcol) {
-            dev += (tmp - avg)*(tmp - avg);
-            zaehler++;
-          }
-        }
-                }
-        }
+  while (getline(test, zeile, '\n')) {
+    if (skiplines) {
+      skiplines--;
+      continue;
+    }
+    line.clear();
+    line.str(zeile);
+    for (int j=0;j<=col;j++)
+      line >> ws >> tmp;
+    if (!line.eof()) {
+      dev += (tmp - avg)*(tmp - avg);
+      zaehler++;
+    }
+  }
         test.close();
-        //dev = 1/(zaehler)*dev;
-        if (dev != 0) dev /= zaehler;
+        if (zaehler != 0) dev /= zaehler;
                         
         cout << setprecision(8) << avg << "\t" << setprecision(8) << sqrt(dev) << "\n";