In print_table() don't print trailing whitespace.

darius · darius · commit 4138da5cdadb · 2011-10-26T20:04:25.000Z
diff --git a/mdp.py b/mdp.py
@@ -149,14 +149,14 @@ def policy_evaluation(pi, U, mdp, k=20):
 [['>', '>', '>', '.'], ['^', None, '^', '.'], ['^', '>', '^', '<']]
 
 >>> print_table(Fig[17,1].to_arrows(pi))
->   >      >   .  
-^   None   ^   .  
-^   >      ^   <  
+>   >      >   .
+^   None   ^   .
+^   >      ^   <
 
 >>> print_table(Fig[17,1].to_arrows(policy_iteration(Fig[17,1])))
->   >      >   .  
-^   None   ^   .  
-^   >      ^   <  
+>   >      >   .
+^   None   ^   .
+^   >      ^   <
 """
 
 __doc__ += random_tests("""
diff --git a/search.py b/search.py
@@ -789,14 +789,14 @@ def do(searcher, problem):
 def compare_graph_searchers():
     """Prints a table of results like this:
 >>> compare_graph_searchers()
-Searcher                      Romania(A, B)        Romania(O, N)        Australia            
-breadth_first_tree_search     <  21/  22/  59/B>   <1158/1159/3288/N>   <   7/   8/  22/WA>  
-breadth_first_graph_search    <  11/  12/  28/B>   <  33/  34/  76/N>   <   6/   7/  19/WA>  
-depth_first_graph_search      <   9/  10/  23/B>   <  16/  17/  39/N>   <   4/   5/  13/WA>  
-iterative_deepening_search    <  11/  33/  31/B>   < 656/1815/1812/N>   <   3/  11/  11/WA>  
-depth_limited_search          <  54/  65/ 185/B>   < 387/1012/1125/N>   <  50/  54/ 200/WA>  
-astar_search                  <   3/   4/   9/B>   <   8/   9/  22/N>   <   2/   3/   6/WA>  
-recursive_best_first_search   < 200/ 201/ 601/B>   <  71/  72/ 213/N>   <  11/  12/  43/WA>  """
+Searcher                      Romania(A, B)        Romania(O, N)        Australia          
+breadth_first_tree_search     <  21/  22/  59/B>   <1158/1159/3288/N>   <   7/   8/  22/WA>
+breadth_first_graph_search    <  11/  12/  28/B>   <  33/  34/  76/N>   <   6/   7/  19/WA>
+depth_first_graph_search      <   9/  10/  23/B>   <  16/  17/  39/N>   <   4/   5/  13/WA>
+iterative_deepening_search    <  11/  33/  31/B>   < 656/1815/1812/N>   <   3/  11/  11/WA>
+depth_limited_search          <  54/  65/ 185/B>   < 387/1012/1125/N>   <  50/  54/ 200/WA>
+astar_search                  <   3/   4/   9/B>   <   8/   9/  22/N>   <   2/   3/   6/WA>
+recursive_best_first_search   < 200/ 201/ 601/B>   <  71/  72/ 213/N>   <  11/  12/  43/WA>"""
     compare_searchers(problems=[GraphProblem('A', 'B', romania),
                                 GraphProblem('O', 'N', romania),
                                 GraphProblem('Q', 'WA', australia)],
diff --git a/utils.py b/utils.py
@@ -627,7 +627,7 @@ def issequence(x):
     "Is x a sequence? We say it is if it has a __getitem__ method."
     return hasattr(x, '__getitem__')
 
-def print_table(table, header=None, sep='  ', numfmt='%g'):
+def print_table(table, header=None, sep='   ', numfmt='%g'):
     """Print a list of lists as a table, so that columns line up nicely.
     header, if specified, will be printed as the first row.
     numfmt is the format for all numbers; you might want e.g. '%6.2f'.
@@ -641,9 +641,8 @@ def print_table(table, header=None, sep='  ', numfmt='%g'):
     maxlen = lambda seq: max(map(len, seq))
     sizes = map(maxlen, zip(*[map(str, row) for row in table]))
     for row in table:
-        for (j, size, x) in zip(justs, sizes, row):
-            print getattr(str(x), j)(size) + sep,
-        print
+        print sep.join(getattr(str(x), j)(size)
+                       for (j, size, x) in zip(justs, sizes, row))
 
 def AIMAFile(components, mode='r'):
     "Open a file based at the AIMA root directory."
