Merge branch 'master' of alioth:/git/pkg-exppsy/neurodebian

[neurodebian.git] / survey / makestats

diff --git a/survey/makestats b/survey/makestats
index 09b0c9415b20fe6d7f39a554c2c836dc841cfa7d..070400b045b26f499f53eea9534b3ae4acf55d94 100755 (executable)
--- a/survey/makestats
+++ b/survey/makestats
@@ -101,6 +101,8 @@ class DB(dict):
     os_dict = load_list2dict('oslist.txt')
     datamod_dict = load_list2dict('datamodlist.txt')
     sw_dict = load_list2dict('swlist.txt')
+    position_dict = load_list2dict('position-dd-list.txt')
+    employer_dict = load_list2dict('employer-dd-list.txt')
 
     def __init__(self, srcdir):
         # eats the whole directory
@@ -168,7 +170,8 @@ class DB(dict):
 
     def get_nice_name(self, id):
         srcs = [DB.os_dict, os_cat_names, DB.sw_dict, sw_categories,
-                resource_categories, time_categories, DB.datamod_dict]
+                resource_categories, time_categories,
+                DB.datamod_dict, DB.position_dict, DB.employer_dict]
         for src in srcs:
             if id in src:
                 return src[id]
@@ -177,7 +180,7 @@ class DB(dict):
 
 
 def mkpic_os_per_env(db, destdir):
-    envs = ['pers', 'man', 'virt', 'virt']
+    envs = ['pers_os', 'man_os', 'virt_host_os', 'virt_guest_os']
     env_names = ['Personal', 'Managed', 'Virt. Host', 'Virt. Guest']
     env_stats = {}
     for env in envs:
@@ -234,7 +237,7 @@ def mkpic_time_per_env(db, destdir):
     pl.ylim(-0.4, len(envs))
     pl.title("Research activity time by environment")
     pl.xlabel("Fraction of submissions")
-    pl.savefig('%s/ospref_by_env.png' % destdir, format='png', dpi=80)
+    pl.savefig('%s/time_by_env.png' % destdir, format='png', dpi=80)
 
 
 def mkpic_submissions_per_key(db, destdir, key, title, sortby='name',