ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-03 14:37:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into nextbreach

Browse Source 
Conflicts:
	urb/urbit.pill
	urb/zod/arvo/hoon.hoon
This commit is contained in:
Jared Hance 2014-06-06 15:38:38 -04:00
commit 6e0235f2b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arvo/hoon.hoon
View File

@ -1325,11 +1325,11 @@
:: =+ a4=(rnd p (rsh 0 e2 a3))
=+ a4=(rnd p (rsh 0 e2 a2))
=+ s2=|(s.n s.m)
[s=s2 e=:(sum:si e.n e.m e2) a=a4]
[s=s2 e=:(sum:si e.n e.m (sun:si e2)) a=a4]
++ div |= [p=@u n=[s=? e=@s a=@u] m=[s=? e=@s a=@u]] ^- [s=? e=@ a=@]
=+ b=(rnd p (^div (lsh 0 (^mul p 2) a.n) a.m))
?: (^gte e.n e.m)
?: (^gte a.n a.m)
[s=|(s.n s.m) e=(dif:si e.n e.m) a=b]
[s=|(s.n s.m) e=(dif:si (dif:si e.n e.m) (sun:si 1)) a=b]