Changeset 133 for trunk/lib

Timestamp:

Aug 2, 2006, 9:52:39 PM (17 years ago)

Author:

Jari Häkkinen

Message:

Fixes ticket:31. Changed GnuplotFE plot and replot to make sure that data vectors have the same length.

Location:

trunk/lib

Files:

• GnuplotFE.cc (modified) (3 diffs)
• GnuplotFE.h (modified) (1 diff)

trunk/lib/GnuplotFE.cc

@@ -25 +25 @@
 #include "Gnuplot.h"
 
+#include <cassert>
 #include <string>
 #include <sstream>
@@ -36 +37 @@
 
 
-  void GnuplotFE::plot(const std::vector<u_int>& y, const std::string& format)
+  void GnuplotFE::plot(std::vector<u_int>& y, const std::string& format)
   {
     if (!date_.empty()) {
+      assert(date_.size()>=y.size());
+      if (date_.size()!=y.size()) {
+        y.reserve(date_.size());
+        for (size_t i=y.size(); i<date_.size(); ++i)
+          y.push_back(*y.rbegin());
+      }
       command(std::string("set xdata time"));
       command("set timefmt '" + date_input_format_ + "'");
@@ -50 +57 @@
 
 
-  void GnuplotFE::replot(const std::vector<u_int>& y)
+  void GnuplotFE::replot(std::vector<u_int>& y)
   {
     if (!date_.empty()) {
+      assert(date_.size()>=y.size());
+      if (date_.size()!=y.size()) {
+        y.reserve(date_.size());
+        for (size_t i=y.size(); i<date_.size(); ++i)
+          y.push_back(*y.rbegin());
+      }
       command(std::string("set xdata time"));
       Gnuplot::replot(y,date_);

trunk/lib/GnuplotFE.h

@@ -60 +60 @@
 
     ///
+    /// Plot the data \a y. If a date vector is set with set_dates
+    /// function before calling this function, the date vector will be
+    /// used as x values using \a format as date format
+    /// description. If no date vector is set then the \a y data will
+    /// be plot as a function of subversion revision.
     ///
+    /// @see Gnuplot documentation for date formats.
     ///
-    void plot(const std::vector<u_int>& y,const std::string& format="%y-%b");
+    /// @note \a y may change in this call: In some cases the date and
+    /// \a y data vectors may have different length. This is an effect
+    /// from subversions treatment of revisions, i.e., subversion
+    /// controlled items may have different revisions but still up to
+    /// date (at the items last changed revision). The date vector
+    /// typically contains all revisions of the repository and thus a
+    /// clash of different sized vectors may occur in gnuplot. This
+    /// situation is resolved by adding elements to \a y such that the
+    /// vector sizes match. The date vector is never expected to be
+    /// shorter than \a y vector.
+    ///
+    void plot(std::vector<u_int>& y,const std::string& format="%y-%b");
 
     ///
+    /// Plot the data \a y as a function of \a x using the Gnuplot
+    /// 'replot' command, see plot documentation for information on x
+    /// axis data and possible modifications of \a y.
     ///
-    ///
-    void replot(const std::vector<u_int>& y);
+    void replot(std::vector<u_int>& y);
 
     ///