Changeset 1276 for branches/0.9-stable

Timestamp:

Nov 5, 2010, 1:24:26 PM (13 years ago)

Author:

Peter Johansson

Message:

Let Graph class hold information about last point (rev_max_) rather
than defining via the size of Vector. Not resizing the Vectors means
we can avoid some copying in Stats class. But it also means we need to
handle the case of empty Vector in Stats::max_element. Made the
function Node::svn_info(void) public. In svndigest.cc set rev_min also
when not using dates as well as setting the new static variable rev_max.
closes #485

Location:

branches/0.9-stable

Files:

• bin/svndigest.cc (modified) (3 diffs)
• lib/AddStats.cc (modified) (1 diff)
• lib/ClassicStats.cc (modified) (1 diff)
• lib/Graph.cc (modified) (4 diffs)
• lib/Graph.h (modified) (2 diffs)
• lib/Node.h (modified) (2 diffs)
• lib/Stats.cc (modified) (2 diffs)

branches/0.9-stable/bin/svndigest.cc

@@ -44 +44 @@
 #include "yat/OptionArg.h"
 
+#include <algorithm>
 #include <cassert>
 #include <cstdlib>
@@ -203 +204 @@
 
 
-void set_dates(const svndigest::SVNlog& log, svn_revnum_t last_rev)
-{
-  assert(!log.commits().empty());
-  // all plots uses the same xmin
-  Graph::rev_min(log.commits().begin()->revision());
-
+void set_dates(const svndigest::SVNlog& log)
+{
   // Fill in dates for revisions in log.
-  std::vector<time_t> dates(last_rev+1, 0);
+  std::vector<time_t> dates(log.latest_commit().revision()+1, 0);
   for (SVNlog::container::const_iterator iter=log.commits().begin();
        iter!=log.commits().end(); ++iter) {
@@ -240 +237 @@
   }
   
+  if (option.verbose())
+    std::cout << "Retrieving log information" << std::endl;
+  assert(!tree.log().commits().empty());
+  Graph::rev_min(tree.log().commits().begin()->revision());
+  Graph::rev_max(tree.log().latest_commit().revision());
   if (!option.revisions()) {
-    if (option.verbose())
-      std::cout << "Retrieving dates" << std::endl;
-    // Note that last_changed_rev might be larger than lastest rev in log
-    set_dates(tree.log(), tree.last_changed_rev());
+    set_dates(tree.log());
   }
 

branches/0.9-stable/lib/AddStats.cc

@@ -103 +103 @@
   unsigned int AddStats::max_element(const SumVector& v) const 
   {
-    assert(v.size());
+    if (v.size()==0)
+      return 0;
     return v.back();
   }

branches/0.9-stable/lib/ClassicStats.cc

@@ -81 +81 @@
   ClassicStats::max_element(const SumVector& v) const 
   {
-    assert(v.size());
+    if (v.size()==0)
+      return 0;
     return v.back();
   }

branches/0.9-stable/lib/Graph.cc

@@ -32 +32 @@
 namespace svndigest {
 
+  svn_revnum_t Graph::rev_max_=0;
   svn_revnum_t Graph::rev_min_=0;
   std::vector<time_t> Graph::xticks_;
@@ -93 +94 @@
       assert(!date_xticks() || rev_min_<xticks_.size());
       assert(!date_xticks() || xticks_[rev_min_]);
-      xmin_= date_xticks() ? xticks_[rev_min_] : 0;
-      xmax_= date_xticks() ? xticks_.back() : y.size();
+      assert(rev_min_<xticks_.size() || !date_xticks());
+      xmin_= date_xticks() ? xticks_[rev_min_] : rev_min_;
+      assert(rev_max_<xticks_.size() || !date_xticks());
+      xmax_= date_xticks() ? xticks_[rev_max_] : rev_max_;
       xrange_=xmax_-xmin_;
       yrange_=ymax_-ymin_;
@@ -126 +129 @@
       y0 = iter->second;
     }
-    svn_revnum_t xlast=date_xticks() ? xticks_.size() : y.size();
-    --xlast;
-    staircase(x0, y0, xlast, y0);
+    staircase(x0, y0, rev_max_, y0);
 
     legend_data legend;
@@ -166 +167 @@
 
 
+  void Graph::rev_max(svn_revnum_t rev)
+  {
+    rev_max_ = rev;
+  }
+
+
   void Graph::rev_min(svn_revnum_t rev)
   {

branches/0.9-stable/lib/Graph.h

@@ -100 +100 @@
 
     /**
+       Sets the right end of xrange to correspond to revision \a rev.
+     */
+    static void rev_max(svn_revnum_t rev);
+
+    /**
        Sets the left end of xrange to correspond to revision \a rev.
      */
@@ -152 +157 @@
     plstream pls_;
     static svn_revnum_t rev_min_;
+    static svn_revnum_t rev_max_;
     std::string timeformat_;
     std::string title_;

branches/0.9-stable/lib/Node.h

@@ -207 +207 @@
     std::string url(void) const;
     
+    inline const SVNinfo& svn_info(void) const { return svninfo_; }
+
   protected:
     ///
@@ -212 +214 @@
     ///
     void path_anchor(std::ostream& os) const; 
-
-    inline const SVNinfo& svn_info(void) const { return svninfo_; }
 
     unsigned int level_;

branches/0.9-stable/lib/Stats.cc

@@ -440 +440 @@
     assert(stat->size());
     assert(stat->find("all")!=stat->end());
-    // FIXME: try keep a const& to avoid copying
-    SumVector total=get_vector(*stat, "all");   
-    total.resize(revision()+1);
+    const SumVector& total=get_vector(*stat, "all");    
     double yrange_max=1.03 * max_element(total) +1.0;
     gp.ymax(yrange_max);
@@ -452 +450 @@
          i != authors_.end(); ++i) {
       assert(stat->find(*i)!=stat->end());
-      // FIXME: avoid this copying?
-      SumVector vec = get_vector(*stat,*i);
-      vec.resize(revision()+1);
+      const SumVector& vec = get_vector(*stat,*i);
       if (max_element(vec)) {
         author_cont.push_back(std::make_pair(*i,vec));