Changeset 527

Timestamp:

Dec 25, 2007, 6:11:09 AM (16 years ago)

Author:

Peter Johansson

Message:

removing valid variable - starting to refactor Stats class.

Location:

trunk/lib

Files:

• Stats.cc (modified) (7 diffs)
• Stats.h (modified) (2 diffs)

trunk/lib/Stats.cc

@@ -51 +51 @@
 
   Stats::Stats(const std::string& path)
-    : valid_(true)
   {
     // Make sure latest revision is set properly
@@ -115 +114 @@
     last_changed_rev_ = std::max(last_changed_rev_, rhs.last_changed_rev_);
     add_authors(rhs.authors().begin(), rhs.authors().end());
-    valid_ &= rhs.valid();
-    // if cache not valid no need to update it
-    if (valid()) {
-      base_add(rhs.code_.begin(), rhs.code_.end(), code_);
-      base_add(rhs.comments_.begin(), rhs.comments_.end(), comments_);
-      base_add(rhs.other_.begin(), rhs.other_.end(), other_);
-      base_add(rhs.total_.begin(), rhs.total_.end(), total_);
-    }
+    base_add(rhs.code_.begin(), rhs.code_.end(), code_);
+    base_add(rhs.comments_.begin(), rhs.comments_.end(), comments_);
+    base_add(rhs.other_.begin(), rhs.other_.end(), other_);
+    base_add(rhs.total_.begin(), rhs.total_.end(), total_);
   }
 
@@ -147 +142 @@
                                               std::string user) const
   {
-    // Peter, we should avoid calling this function prior all
-    // statistics are calculated. If, for some reason, this is not
-    // possible call update_stats() first, however, that function is
-    // not const so some redesign is needed (e.g. making cache mutable
-    // or making them pointers)
-    assert(valid() && "trying to access invalid cache of statistics");
     v_map::const_iterator iter(m.find(std::string(user)));
     if (iter==m.end()) 
@@ -189 +178 @@
   u_int Stats::lines(const std::string& user) const
   {
-    assert(valid()); return get_vector(total_, "all").back();
+    return get_vector(total_, "all").back();
   }
 
@@ -195 +184 @@
   void Stats::parse(const std::string& path)
   {
-    valid_=false;
     // First we let inherited class do parsing
     do_parse(path);
@@ -225 +213 @@
   void Stats::plot_summary(const std::string& filename) const
   {
-    assert(valid());
     plot_init(filename);
     GnuplotFE* gp=GnuplotFE::instance();
@@ -308 +295 @@
     VectorPlus<u_int> vp;
     total_["all"] = vp(vp(code_["all"], comments_["all"]), other_["all"]);
-    valid_=true;
   }
 

trunk/lib/Stats.h

@@ -152 +152 @@
     ///
     void plot_init(const std::string& output) const;
-    inline bool valid(void) const {return valid_;}
+
   private:
     virtual bool do_load_cache(std::istream&)=0;
@@ -169 +169 @@
     v_map comments_;
     v_map other_;
-    bool valid_;
+
     svn_revnum_t revision_; // Should be the latest revision for whole project
     svn_revnum_t last_changed_rev_; // Should be the latest revision for file