Changeset 36 for trunk/lib/Stats.cc

Timestamp:

Jan 13, 2006, 2:05:53 AM (16 years ago)

Author:

Jari Häkkinen

Message:

Changed Gnuplot interface. Fixed sever bug in Stats::accumulated(void).

File:

• trunk/lib/Stats.cc (modified) (4 diffs)

trunk/lib/Stats.cc

@@ -2 +2 @@
 
 #include "Stats.h"
+#include "Gnuplot.h"
 #include "utility.h"
 
@@ -22 +23 @@
   std::vector<double> Stats::accumulated(void) const
   {
-    std::vector<u_int> sum;
     if (map_.empty())
       return std::vector<double>();
 
-    // sum of all users
-    std::accumulate(map_.begin(), map_.end(), sum, 
-        PairValuePlus<std::string,u_int>());
+    // sum of all users
+    std::vector<u_int> sum;
+    sum=std::accumulate(map_.begin(), map_.end(), sum,
+                        PairValuePlus<std::string,u_int>());
 
     // calculate accumulated sum
@@ -60 +61 @@
       vec[rev]++;
     map_[user]=vec;
-
   }
 
@@ -70 +70 @@
       exit(-1);
     }
-    // Jari, temporary empty files are created that needs to be removed.
     std::string cmd=std::string("set term png; set output '")+name+".png'";
     gnuplot_pipe_.command(cmd);
-    std::vector<double> x=accumulated();
-    gnuplot_pipe_.plot_y(x);
-    for (MapConstIter_ i= map_.begin(); i != map_.end(); i++) {
-      x=accumulated(i->first);
-      gnuplot_pipe_.plot_y(x);
-    }
+    gnuplot_pipe_.plot(accumulated());
+    for (MapConstIter_ i= map_.begin(); i != map_.end(); i++)
+      gnuplot_pipe_.replot(accumulated(i->first));
+
+    // Jari, must rewrite output once since the replots above are not
+    // added to the plot. Rather, the plot only contains the result
+    // from the first 'plot' call.
+    gnuplot_pipe_.command(cmd);
+    gnuplot_pipe_.command("replot");
     return std::string(name)+".png";
   }