Merge pull request #237 from diffblue/waveform-width

ebmc: fix for column width in waveform

Author: tautschnig

regression/ebmc/traces/waveform1.desc

@@ -5,8 +5,9 @@ waveform1.smv
 ^SIGNAL=0$
 ^\[smv::main::spec1\] .* FAILURE$
 ^Counterexample:$
-^                   0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20$
-^smv::main::var::x  0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20$
-^smv::main::var::y  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0  0$
+^                   0  1  2  3  4  5  6  7  8  9  10  11  12  13  14  15  16  17  18  19  20$
+^smv::main::var::x  0  1  2  3  4  5  6  7  8  9  10  11  12  13  14  15  16  17  18  19  20$
+^smv::main::var::y  0 10 20 30 40 50 60 70 80 90 100 110 120 130 140 150 160 170 180 190 200$
+^smv::main::var::z  0  0  0  0  0  0  0  0  0  0   0   0   0   0   0   0   0   0   0   0   0$
 --
 ^warning: ignoring

regression/ebmc/traces/waveform1.smv

@@ -1,12 +1,15 @@
 MODULE main
 
 VAR x: 0..20;
-VAR y: 0..20;
+VAR y: 0..200;
+VAR z: 0..20;
 
 INIT x=0
 INIT y=0
+INIT z=0
 
 ASSIGN next(x):=x + 1;
-ASSIGN next(y):=y;
+ASSIGN next(y):=y + 10;
+ASSIGN next(z):=z;
 
 SPEC AG x!=20

src/ebmc/waveform.cpp

@@ -97,8 +97,7 @@ void show_waveform(const trans_tracet &trace, const namespacet &ns)
           value_map[std::make_pair(identifier, timeframe)] = as_string;
           auto &width = column_width[timeframe];
           width = std::max(width, as_string.size());
-          if(width < 2)
-            width = 2;
+          width = std::max(width, std::size_t(2));
         }
       }
     }
@@ -141,7 +140,7 @@ void show_waveform(const trans_tracet &trace, const namespacet &ns)
       consolet::out() << ' ';
       if(consolet::is_terminal() && consolet::use_SGR())
         consolet::out() << ((x % 2) ? "\x1b[47m" : "");
-      consolet::out().width(std::min(std::size_t(2), column_width[x]));
+      consolet::out().width(column_width[x]);
       consolet::out() << value_map[std::make_pair(y, x)];
       consolet::out() << consolet::reset;
     }