Changeset 703

Timestamp:

Nov 24, 2008, 4:58:58 AM (15 years ago)

Author:

Peter Johansson

Message:

fixed some issues that addresses #338. Want to add some tests before allowing --ignore-cache and closing ticket:338.

Location:

trunk/lib

Files:

• AddStats.cc (modified) (2 diffs)
• BlameStats.cc (modified) (1 diff)
• ClassicStats.cc (modified) (1 diff)
• Stats.cc (modified) (2 diffs)
• Stats.h (modified) (3 diffs)
• StatsCollection.cc (modified) (1 diff)

trunk/lib/AddStats.cc

@@ -62 +62 @@
                    std::mem_fun_ref(&Commitment::revision));
     for (RevSet::iterator rev_iter=revs.begin();
-         rev_iter!=revs.end() && *rev_iter>rev; ++rev_iter){
+         rev_iter!=revs.end() && *rev_iter>=rev; ++rev_iter){
       SVNblame svn_blame(path, *rev_iter);
       LineTypeParser parser(path);
@@ -74 +74 @@
       }
     }
-    
     accumulate_stats(rev);
   }

trunk/lib/BlameStats.cc

@@ -83 +83 @@
                    std::mem_fun_ref(&Commitment::revision));
     for (RevSet::reverse_iterator rev_iter=revs.rbegin();
-         rev_iter!=revs.rend() && *rev_iter>first_rev; ++rev_iter){
+         rev_iter!=revs.rend() && *rev_iter>=first_rev; ++rev_iter){
       SVNblame svn_blame(path, *rev_iter);
       LineTypeParser parser(path);

trunk/lib/ClassicStats.cc

@@ -61 +61 @@
   void ClassicStats::do_parse(const std::string& path, svn_revnum_t rev)
   {
-    // we only call blame once so we can ignore rev here
     LineTypeParser parser(path);
     SVNblame svn_blame(path);
     while (svn_blame.valid()) {
-      add(svn_blame.author(), svn_blame.revision(), 
-          parser.parse(svn_blame.line()));
+      if (svn_blame.revision()>=rev) {
+        add(svn_blame.author(), svn_blame.revision(), 
+            parser.parse(svn_blame.line()));
+      }
       svn_blame.next_line();
     }
-    accumulate_stats();
-
+    accumulate_stats(rev);
   }
 

trunk/lib/Stats.cc

@@ -67 +67 @@
                          svn_revnum_t rev) const
   {
+    assert(rev>0);
     if (vec.empty()){
       // just to allow call to vec.back() below
       vec.resize(1,0);
     }
-    else if (vec.begin()+rev < vec.end())
-      std::partial_sum(vec.begin()+rev,vec.end(),vec.begin()+rev);
+    else if (vec.begin()+rev-1 < vec.end())
+      std::partial_sum(vec.begin()+rev-1,vec.end(),vec.begin()+rev-1);
     // static_cast to remove annoying compiler warning
     if (vec.size() < static_cast<size_t>(revision()+1))
@@ -81 +82 @@
   void Stats::accumulate_stats(svn_revnum_t rev)
   {
+    if (!rev)
+      rev = 1;
     for (std::set<std::string>::const_iterator iter(authors().begin());
          iter!=authors().end(); ++iter) {

trunk/lib/Stats.h

@@ -99 +99 @@
 
     /**
-       Do the parsing for \a path. The function will only parse out
-       stats for revisions larger than \a rev.
+       Do the parsing for \a path. Revisions from \a rv will be parsed.
     */
     void parse(const std::string& path, svn_revnum_t rev=0);
@@ -148 +147 @@
     typedef Author2Vector::const_iterator A2VConstIter;
 
-    void accumulate_stats(svn_revnum_t rev=0);
+    /**
+       Calculate accumalated statistics for fundamental statistics,
+       i.e., code, comment, empty, and copyright for each author.
+       \see accumulate
+     */
+    void accumulate_stats(svn_revnum_t rev=1);
     void add_author(std::string);
     void add_authors(std::set<std::string>::const_iterator, 
@@ -198 +202 @@
                                          std::string user) const;
   private:
+    /**
+       \a vec is resized to revision().
+       vec is accumulated such that
+       vec[rev] = vec[rev-1] + vec[rev]
+       vec[rev+1] = vec[rev] + vec[rev+1]
+       et cetera
+     */
     void accumulate(std::vector<unsigned int>& vec,
-                    svn_revnum_t rev=0) const;
+                    svn_revnum_t rev=1) const;
     void add(std::vector<unsigned int>& vec, unsigned int rev, bool x,
              unsigned int n);
 
-    virtual void do_parse(const std::string&, svn_revnum_t)=0;
+    /**
+       Parse statistics for fundamental categories, i.e., code,
+       comment, empty, and copyright for each author. Ignore revisions
+       earlier than \a first_rev.
+     */
+    virtual void do_parse(const std::string&, svn_revnum_t first_rev)=0;
     
     // Change this string if cache format is changed in such a way

trunk/lib/StatsCollection.cc

@@ -67 +67 @@
         if (!cache_rev)
           i->second->reset();
-        i->second->parse(path_, cache_rev);
+        i->second->parse(path_, cache_rev+1);
       }
     }