Changeset 371

Timestamp:

Jun 19, 2007, 8:54:41 PM (16 years ago)

Author:

Peter Johansson

Message:

fixes #201 plot legend is sorted with respect to contributed lines

Location:

trunk/lib

Files:

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

trunk/lib/Stats.cc

@@ -187 +187 @@
     double yrange_max=1.03*total.back()+1;
     gp->yrange(yrange_max);
-    size_t plotno=1;
+
+
+    typedef std::vector<std::pair<std::string, std::vector<u_int> > > vec_type;
+    vec_type author_cont;
+    author_cont.reserve(stat->size());
+    for (MapConstIter_ i= stat->begin(); i != stat->end(); ++i) {
+      author_cont.push_back(std::make_pair(i->first,
+                                           accumulated(*stat,i->first)));
+    }
+
+    LessReversed<std::vector<u_int> > lr;
+    PairSecondCompare<std::string, std::vector<u_int>, 
+      LessReversed<std::vector<u_int> > > compare(lr);
+    std::sort(author_cont.begin(), author_cont.end(), compare);
+
+    size_t plotno=author_cont.size();
     std::stringstream ss;
-    for (MapConstIter_ i= stat->begin(); i != stat->end(); ++i) {
+    vec_type::iterator end(author_cont.end());
+    for (vec_type::iterator i(author_cont.begin()); i!=end; ++i) {
       ss.str("");
       ss << "set key height " << 2*plotno;
       gp->command(ss.str());
-      std::vector<u_int> x=accumulated(*stat, i->first);
       ss.str("");
-      ss << x.back() << " " << i->first;
+      ss << i->second.back() << " " << i->first;
       gp->yrange(yrange_max);
       gp->linetitle(ss.str());
       ss.str("");
-      ss << "steps " << ++plotno;
+      ss << "steps " << --plotno+2;
       gp->linestyle(ss.str());
-      gp->plot(x);
+      gp->plot(i->second, ss.str());
     }
     ss.str("");

trunk/lib/utility.h

@@ -144 +144 @@
 
 
-  template <class T>
+  template <typename T>
   std::string match(std::string::const_iterator& first,
                     const std::string::const_iterator& last,
@@ -184 +184 @@
   };
 
+
   class not2Char
   {
@@ -211 +212 @@
 
   ///
+  /// Functor to be used on contaioners and works as standard less,
+  /// but on the reversed container.
+  ///
+  /// Requirements on T is that has rend and rbegin. T::value_type
+  /// must be comparable (i.e. have operator<)
+  /// 
+  template <typename T>
+  struct LessReversed
+  {
+    ///
+    /// using std::lexicographical_compare on the reversed container
+    ///
+    inline bool operator()(const T& x, const T& y) const
+    { return std::lexicographical_compare(x.rbegin(),x.rend(),
+                                          y.rbegin(),y.rend()); }
+  };
+
+
+  ///
   /// @brief Functor comparing pairs using second.
   ///
@@ -217 +237 @@
   /// comparison object in generic functions such as the STL sort.
   ///
-  template <class T1,class T2>
+  template <typename T1, typename T2>
   struct pair_value_compare
   {
@@ -231 +251 @@
   };
 
-  template <class T1,class T2, class T3>
+  
+  ///
+  /// Functor working on pair.second, using a user passed functor.
+  ///
+  template <typename T1, typename T2, typename T3>
   struct PairSecondCompare
   {
@@ -242 +266 @@
 
     ///
-    /// @return true if x.second<y.second or (x.second==y.second and
-    /// x.first<y.first)
+    /// @return compare(x.second, y.second) where compare is a
+    /// internal comparison functor.
     ///
     inline bool operator()(const std::pair<T1,T2>& x,
@@ -253 +277 @@
 
   };
-
+  
   ///
   /// Calculating sum of two vectors.