re-fix rules; thanks for helping git

lizbradley · Oct 6, 2015 · c7115e8 · c7115e8
1 parent b3d1cf2
commit c7115e8
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/calvin/reasoning/rule_list.py b/src/calvin/reasoning/rule_list.py
@@ -162,14 +162,15 @@
 
 r(('stop layer counting', 'depth interval'),
   arg('number of peaks per series is normal', 'depth interval'), sound, NOT) 
-r(('number of peaks per series is normal', 'known depth list', 'proxy list'), 
-  obs('within', 'normal peak count', 'current peak count'), sound)
+r(('number of peaks per series is normal', 'depth interval'), 
+  obs('within', ('normal peak count', 'depth interval'), 
+      ('current peak count', 'depth interval')), sound)
 define(('known depth list', 'proxy list'),
        calc('known_depth_proxies', 'depth interval'))
-define('normal peak count',
-       calc('get_normal_peak_behavior', 'known depth list', 'proxy list'))
-define('current peak count',
-       calc('count_peaks_per_proxy', 'known depth list', 'proxy list'))
+define(('normal peak count', 'depth interval'),
+       calc('get_normal_peak_behavior', ('known depth list', 'proxy list')))
+define(('current peak count', 'depth interval'),
+       calc('count_peaks_per_proxy', ('known depth list', 'proxy list')))
 
 """
 normal counted peak matrix = fn2(depth interval)