Show new figure, change color scheme.

[neurodebian.git] / survey / makestats

diff --git a/survey/makestats b/survey/makestats
index 7b229b1e900febb3ff03c36dff119250958db69f..328eed253064231584cb756f14bdb17b0368543a 100755 (executable)
--- a/survey/makestats
+++ b/survey/makestats
@@ -16,10 +16,10 @@ import numpy as np
 import time
 
 # uniform colors for OS results
-os_colors = ['#B63537', '#4E4DA0', '#008200', 'gray']
+os_colors = ['#AA2029', '#D1942B', '#7FB142', '#69A7CE']
 os_order = ['linux', 'mac', 'win', 'otheros']
 time_order = ['notime', 'little', 'most', 'always']
-time_colors = ['#AA2029', '#D1942B', '#7FB142', '#69A7CE']
+time_colors = ['#FF0000', '#FF5500', '#FFAC00', '#FFFD08']
 time_categories = {
         'notime': "don't use it",
         'little': "less than 50%",
@@ -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:
@@ -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))
@@ -231,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',