Agrego suit de test. Solo ejecutar test_calgary.sh dentro del dir y el laburo

[z.facultad/75.06/jacu.git] / util / charstat.cpp

diff --git a/util/charstat.cpp b/util/charstat.cpp
index 369cffe417b464cb4c9b42c6e7b529bcb5b66d49..ae961359f43f611a7a022d53256c10a88ac71ac3 100644 (file)
--- a/util/charstat.cpp
+++ b/util/charstat.cpp
@@ -23,17 +23,18 @@ public:
                os.width(4);
                os.fill(' ');
                if (isgraph(p.first)) {
-                       os << p.first;
-               } else {
-                       std::ostringstream oss;
-                       oss << "0x";
-                       oss.width(2);
-                       oss.fill('0');
-                       oss.setf(std::ios::hex, std::ios::basefield);
-                       oss << int(p.first);
-                       os << oss.str();
+                       os << p.first << " [";
                }
-               os << " (" << double(p.second) / total * 100 << "%)\n";
+               std::ostringstream oss;
+               oss << "0x";
+               oss.width(2);
+               oss.fill('0');
+               oss.setf(std::ios::hex, std::ios::basefield);
+               oss << int(p.first);
+               os << oss.str() << ":" << unsigned(p.first);
+               if (isgraph(p.first)) os << "]";
+               os << " (" << double(p.second) / total * 100 << "% : "
+                       << unsigned((double(p.second) / total) * 4294967296ull) << ")\n";
        }
 };