minor updates

Author: bottler

README.md

@@ -11,4 +11,4 @@ Some fairly standalone python scripts
 
 * tinisDummyProgram: a demo program for tinisMultiRun
 
-* results: code for managing results of long neural network training runs
+* results: code for managing results of long neural network training runs

oncampus.py

@@ -4,7 +4,12 @@
 # draw : whetheer it would be a good idea to try to plot graphs to the screen. This will be false if you are offcampus or are using SSH without X forwarding
 import os, subprocess, string
 
-if "SSH_CLIENT" in os.environ:
+if "STY" in os.environ or "TMUX" in os.environ: #we are inside gnu screen or tmux
+    #It's not obvious what behaviour is correct in this case - same session can be used in multiple places.
+    #Simplest is to treat this as off campus.
+    #When on campus just do graphing in another terminal.
+    oncampus = False
+elif "SSH_CLIENT" in os.environ:
     oncampus = -1 < subprocess.check_output(["who", "-m"]).find(b"warwick")
 else:
     oncampus = True

results/results.py

@@ -247,10 +247,14 @@ def v(name, t, ismin):
         #we could take more care of nans here
         r = lambda x : round(x,4) if x is not None else "NAN?"
         return (name,r(m(t)),r(ar(t)/(len(a)-1.0)),r(m(t[:len(a)//2])))
+    teo_=replaceSeriesWithMovingAverage_(teo,movingAvgLength,True)
+    tea_=replaceSeriesWithMovingAverage_(tea,movingAvgLength,False)   
     d=[v("trainObj",tro,1),
        v("trainAcc",tra,0),
        v( "testObj",teo,1),
-       v( "testAcc",tea,0)]
+       v( "testAcc",tea,0),
+       v( "testObj_Avg",teo_,1),
+       v( "testAcc_Avg",tea_,0)]
     print (tabulate.tabulate(d, headers=("","best","bestIsWhere","firstHalf")))
 
 #could provide more here