Changeset 1208

Timestamp:

Oct 7, 2010, 5:33:36 AM (13 years ago)

Author:

Peter Johansson

Message:

Changed value type of SparseVector? to be (signed) int. Use
Vector::iterator when printing Vector's data instead of using
operator[]
refs #475

Location:

trunk

Files:

• lib/Stats.cc (modified) (1 diff)
• lib/Vector.cc (modified) (1 diff)
• lib/Vector.h (modified) (1 diff)
• test/stats.cc (modified) (1 diff)

trunk/lib/Stats.cc

@@ -556 +556 @@
     for (A2VConstIter i(m.begin()); i!=m.end(); ++i){
       os << i->first << "\n";
-      if (i->second[0])
-        os << 0 << " " << i->second[0] << " ";
-      // FIXME: ise Vector::iterator
-      for (size_t j=1; j<i->second.size(); ++j) {
-        // only print if stats changes in this rev
-        if (i->second[j] != i->second[j-1]) {
-          os << j << " " << i->second[j] - i->second[j-1] << " ";
+      const SumVector& vec = i->second;
+      if (vec.size()) {
+        SumVector::const_iterator v = vec.begin();
+        if (v->second)
+          os << v->first << " " << v->second << " ";
+        ++v;
+        SumVector::const_iterator prev = vec.begin();
+        while (v != vec.end()) {
+          assert(vec[v->first - 1] == prev->second);
+          // FIXME: this if should not be needed if SumVector was
+          // truly sparse and collapsed when possible.
+          if (v->second != prev->second)
+            os << v->first << " " << v->second - prev->second << " ";
+          ++v;
+          ++prev;
         }
       }

trunk/lib/Vector.cc

@@ -29 +29 @@
   {
     result.clear();
-    unsigned int value = 0;
-    for (SumVector::const_iterator iter = vec.begin(); iter!=vec.end();++iter) {
+    int value = 0;
+    for (SparseVector::const_iterator iter = vec.begin(); 
+         iter!=vec.end();++iter) {
       value += iter->second;
+      assert(value>=0);
       result.set(iter->first, value);
     }

trunk/lib/Vector.h

@@ -211 +211 @@
   };
 
-  typedef Vector<unsigned int, SparsePolicy<unsigned int> > SparseVector;
+  typedef Vector<int, SparsePolicy<int> > SparseVector;
 
   template<typename T>

trunk/test/stats.cc

@@ -194 +194 @@
     stats2.print(out2);
     
-    if (out.str()!=out2.str()) {
+    if ( test::diff(out.str(),out2.str()) ) {
       std::cout << "test_cache() failed\n";
       return false;