Changeset 35 for trunk/lib

Timestamp:

Jan 12, 2006, 5:12:14 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Continued fixing gnuplot.

Location:

trunk/lib

Files:

• Stats.cc (modified) (4 diffs)
• Stats.h (modified) (3 diffs)

trunk/lib/Stats.cc

@@ -20 +20 @@
   Gnuplot Stats::gnuplot_pipe_;
 
-  std::vector<u_int> Stats::accumulated(void) const
+  std::vector<double> Stats::accumulated(void) const
   {
     std::vector<u_int> sum;
     if (map_.empty())
-      return sum;
+      return std::vector<double>();
 
     // sum of all users
@@ -31 +31 @@
 
     // calculate accumulated sum
-    std::vector<u_int> accum(sum.size());
+    std::vector<double> accum(sum.size());
     std::partial_sum(sum.begin(),sum.end(),accum.begin());    
     return accum;
   }
 
-  std::vector<u_int> Stats::accumulated(const std::string& user)
+  std::vector<double> Stats::accumulated(const std::string& user) const
   {
-    std::vector<u_int> vec=map_[user];
-    if (vec.empty())
-      return vec;
-    std::vector<u_int> accum(vec.size());
+    if (!map_.count(user))
+      return std::vector<double>();
+    std::vector<u_int> vec=(map_.find(user))->second;
+
+    std::vector<double> accum(vec.size());
     std::partial_sum(vec.begin(),vec.end(),accum.begin());
     return accum;
@@ -65 +66 @@
   {
     char name[]="svnstatXXXXXX";
-    if (mkstemp(name) == -1) {
+    if (!strlen(mktemp(name))) {
       std::cerr << "Failed to get unique filename: " << name << std::endl;
       exit(-1);
@@ -72 +73 @@
     std::string cmd=std::string("set term png; set output '")+name+".png'";
     gnuplot_pipe_.command(cmd);
-    cmd="plot sin(x) t 'ddd' w lines";
-    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);
+    }
     return std::string(name)+".png";
   }

trunk/lib/Stats.h

@@ -29 +29 @@
     void add(const std::string& user, const u_int& revision); 
 
-    std::string plot(void) const;
-
     ///
     /// @bief print statistics
@@ -46 +44 @@
     Stats& operator+=(const Stats&);
 
+    ///
+    /// Jari, this is public. Naughty!
+    ///
+    /// @todo Make this non-public. The issues that gnuplot is started
+    /// in cwd, but the main program makes a 'chdir' to another, and
+    /// we cannot get gnuplot to change directory if it is
+    /// private. Some redesign is needed.
+    ///
+    static Gnuplot gnuplot_pipe_;
+
   private:
     ///
@@ -55 +63 @@
     /// @return accumulated vector of total
     ///
-    std::vector<u_int> accumulated(void) const;
+    std::vector<double> accumulated(void) const;
 
     ///
     /// @return accumulated vector of stats_[user]
     ///
-    std::vector<u_int> accumulated(const std::string& user);
+    std::vector<double> accumulated(const std::string& user) const;
 
-    static Gnuplot gnuplot_pipe_;
+    std::string plot(void) const;
+
     // Peter, if the vector is sparse make it a map
     typedef std::map<std::string, std::vector<u_int> > Map_;