Merge branch 'master' of git://git.debian.org/pkg-exppsy/neurodebian

[neurodebian.git] / survey / makestats

diff --git a/survey/makestats b/survey/makestats
index 7b229b1e900febb3ff03c36dff119250958db69f..7da486e97ba46760ec4e3beb84f5e43ad3f53964 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]
@@ -187,7 +190,10 @@ def mkpic_os_per_env(db, destdir):
             stats[os_family_rev[os]] += counts[os]
         total_count = np.sum(stats.values())
         for osf in stats:
-            stats[osf] = float(stats[osf]) / total_count
+            if not total_count:
+                stats[osf] = 0
+            else:
+                stats[osf] = float(stats[osf]) / total_count
         env_stats[env] = stats
     # make stacked barplot
     pl.figure(figsize=(6.4, 4.8))