Commits

dan mackinlay committed b7fdb07 Merge

merge

Comments (0)

Files changed (6)

dispatchers_basic.py

 from warehouse import Box, digest
 import warnings
 
-def safe_call(fn, *args, **kwargs):
+def safe_call(fn, box, *args, **kwargs):
     try:
-        return fn(*args, **kwargs)
+         return fn(box=box, *args, **kwargs)
     except Exception, e:
          #commute stats errors into warnings, because weird errors raised at run time poison concurrency
          warnings.warn(str(e))
+         return box
 
 class InProcessDispatcher(object):
     """We give dispatchers responsiblity for the warehouse results are kept in
 ###############################
 # wicks hybrid version
 import experiments
-output_name = 'wicks_fig5_super_addendum'
+output_name = 'wicks_fig5'
 #output_name = 'vel_particlewise_panic'
 #output_name = 'correlation_entropy'
 #output_name = 'correlation_quick_dirty'
 #for exp_name in ('vel_particlewise_panic',):
 #for exp_name in ('correlation_entropy',):
 #for exp_name in ('wicks_fig5', 'wicks_fig5_addendum', 'wicks_fig5_super_addendum'):
-for exp_name in ('wicks_fig5_super_addendum',):
+for exp_name in ('wicks_fig5', 'wicks_fig5_addendum'):
+#for exp_name in ('wicks_fig5_super_addendum',):
+#for exp_name in ('wicks_fig5_addendum',):
 #for exp_name in ('correlation_quick_dirty',):
     w=experiments.get_trial_warehouse(exp_name)
     headers = ["val", "param", "basename"]
 #!/usr/bin/env python
 # encoding: utf-8
 """
+main.py
+
 A central control room wherefrom all commands are launched - not out of logical necessity, but for semantic clarity, and ease of data tracking with, e.g. sumatra.
 """
 import numpy as np
 """
+mi.py
+
 purely mutual-information-related machinery, providing a reasonably consistent interface across pairwise, vectorwise, calculations.
 
 TODO:

trader_experiments.py

         norm_periodic=False,
         desc="""Using Wick's parameters and his stats on the 2d case""")
 
+wicks_fig5_addendum_plus = Bunch(
+        trader_factory="WicksTraderSet",
+        limit=(17,), num_agents=3000,
+        keep_steps=5000,
+        discard_steps=10000,
+        repeat=4,
+        P1=Range(4.5, 2*pi),
+        P2=0.3,
+        P3=0.94,
+        dimensions=2,
+        seed_offset=232345,
+        sampler='GridSampler',
+        stats_set=no_stats,
+        norm_periodic=False,
+        desc="""Using Wick's parameters and his stats on the 2d case""")
+
 wicks_fig5_meta_addendum = Bunch(
         trader_factory="WicksTraderSet",
         limit=(23,), num_agents=3000,
         norm_periodic=False,
         desc="""Using Wick's parameters and his stats on the 2d case""")
 
+wicks_fig5_super_addendum_plus = Bunch(
+        trader_factory="WicksTraderSet",
+        limit=(129,), num_agents=3000,
+        keep_steps=5000,
+        discard_steps=10000,
+        repeat=8,
+        P1=Range(0,2*pi),
+        P2=0.3,
+        P3=0.94,
+        dimensions=2,
+        seed_offset=2345,
+        sampler='GridSampler',
+        stats_set=wicks_vs_me_vs_ince,
+        norm_periodic=False,
+        desc="""Using Wick's parameters and his stats on the 2d case""")
 
 wicks_fig5_appendix = Bunch(
         trader_factory="WicksTraderSet",
         
     def mi_comparifier(X,Y, *args):
         return estimator(X, Y,
-            x_bins=actual_n_bins, y_bins=actual_n_bins,
+            x_bins=n_vel_bins, y_bins=n_vel_bins,
             *args, **mi_kwargs)
         
     #get condensed-form MI-distance matrix