[Spambayes-checkins] spambayes table.py,1.3,1.4

[T. Alexander Popiel]

Update of /cvsroot/spambayes/spambayes
In directory usw-pr-cvs1:/tmp/cvs-serv15541

Modified Files:
	table.py 
Log Message:
Added filename headers to the table.  This will be useful for tables
where the variables are things like classifier or tokenizer schemes.


Index: table.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/table.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** table.py	26 Oct 2002 02:07:06 -0000	1.3
--- table.py	26 Oct 2002 15:30:23 -0000	1.4
***************
*** 103,106 ****
--- 103,108 ----
          return fn
  
+ fname = "filename: "
+ fnam2 = "          "
  ratio = "ham:spam: "
  rat2  = "          "
***************
*** 125,128 ****
--- 127,142 ----
      (htest, stest, fp, fn, un, fpp, fnp, unp, cost, bestcost,
       hamdevall, spamdevall) = suck(file(filename))
+     if filename.endswith('.txt'):
+         filename = filename[:-4]
+     filename = filename[filename.rfind('/')+1:]
+     filename = filename[filename.rfind("\\")+1:]
+     if len(fname) > len(fnam2):
+         fname += "        "
+         fname = fname[0:(len(fnam2) + 8)]
+         fnam2 += " %7s" % filename
+     else:
+         fnam2 += "        "
+         fnam2 = fnam2[0:(len(fname) + 8)]
+         fname += " %7s" % filename
      if len(ratio) > len(rat2):
          ratio += "        "
***************
*** 149,154 ****
      kval  += "%8.2f" % k
  
  print ratio
! if ":"[0] in rat2:
      print rat2
  print fptot
--- 163,171 ----
      kval  += "%8.2f" % k
  
+ print fname
+ if len(fnam2.strip()) > 0:
+     print fnam2
  print ratio
! if len(rat2.strip()) > 0:
      print rat2
  print fptot