Changeset 39 for trunk/lib

Timestamp:

Jan 13, 2006, 4:02:31 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Gnuplot working.

Location:

trunk/lib

Files:

• Gnuplot.cc (modified) (1 diff)
• Gnuplot.h (modified) (3 diffs)
• Stats.cc (modified) (3 diffs)
• utility.h (modified) (1 diff)

trunk/lib/Gnuplot.cc

@@ -14 +14 @@
 
   Gnuplot::Gnuplot(void)
-    : linestyle_("lines"), pipe_(NULL)
+    : linestyle_("steps"), pipe_(NULL)
   {
     acquire_program_path("gnuplot");

trunk/lib/Gnuplot.h

@@ -18 +18 @@
   ///
   struct GnuplotException : public std::runtime_error
-  { inline GnuplotException(const std::string &msg) : runtime_error(msg) {} };
+  { inline GnuplotException(const std::string& msg) : runtime_error(msg) {} };
 
   ///
@@ -61 +61 @@
     /// @note The \a style is not checked to be valid.
     ///
-    inline void linestyle(std::string style) { linestyle_=style; }
+    inline void linestyle(const std::string& style) { linestyle_=style; }
 
     ///
@@ -68 +68 @@
     /// called again.
     ///
-    inline void linetitle(std::string title) { linetitle_=title; }
+    inline void linetitle(const std::string& title) { linetitle_=title; }
 
     ///

trunk/lib/Stats.cc

@@ -10 +10 @@
 #include <map>
 #include <numeric>
+#include <sstream>
 #include <string>
 #include <utility>
@@ -72 +73 @@
     std::string cmd=std::string("set term png; set output '")+name+".png'";
     gnuplot_pipe_.command(cmd);
-    gnuplot_pipe_.plot(accumulated());
-    for (MapConstIter_ i= map_.begin(); i != map_.end(); i++)
-      gnuplot_pipe_.replot(accumulated(i->first));
+    gnuplot_pipe_.command("set key left Left reverse");
+    std::vector<double> x=accumulated();
+    std::stringstream sa;
+    sa << x.back() << " total";
+    gnuplot_pipe_.linetitle(sa.str());
+    gnuplot_pipe_.plot(x);
+    for (MapConstIter_ i= map_.begin(); i != map_.end(); i++) {
+      x=accumulated(i->first);
+      std::stringstream s;
+      s << x.back() << " " << i->first;
+      gnuplot_pipe_.linetitle(s.str());
+      gnuplot_pipe_.replot(x);
+    }
 
     // Jari, must rewrite output once since the replots above are not
@@ -86 +97 @@
   void Stats::print(std::ostream& os) const
   {
-    std::vector<std::pair<std::string, std::vector<u_int> > > accum;
-    for (MapConstIter_ i= map_.begin(); i != map_.end(); i++){
-      std::pair<std::string, std::vector<u_int> > element(*i);
-      std::partial_sum(element.second.begin(),element.second.end(),
-                       element.second.begin());
-      accum.push_back(element);
-    }
-    sort(accum.begin(),accum.end(), CodingMore());
-    os << "<table>\n";
-    for (size_t i = 0; i<accum.size(); i++){
-      os << "<tr><td>\n" << accum[i].first << "</td><td>" 
-         << accum[i].second.back() << "</td></tr>"; 
-    }
-    os << "</table>\n";
-
     os << "<p><img src='" << plot() << "' alt='[svnstat plot]' border=0></p>\n";
   }

trunk/lib/utility.h

@@ -58 +58 @@
 
   ///
+  /// Jari, is this obsolete? And thus erasable?
+  ///
   struct CodingMore :
     public std::binary_function<std::pair<std::string,std::vector<u_int> >,