urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-12 10:29:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cgyarvin/relearning' into relearning

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-09-07 10:37:14 -07:00
commit d611d11189
2 changed files with 80 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
arvo/hoon.hoon
View File

@ -4698,37 +4698,27 @@
==
::
$p
=+ dyx=(met 3 q.p.lot)
=+ sxz=(feen:ob q.p.lot)
=+ dyx=(met 3 sxz)
:- '~'
?: (lte dyx 1)
(weld (trip (tod:po q.p.lot)) rep)
?: =(2 dyx)
;: weld
(trip (tos:po (end 3 1 q.p.lot)))
(trip (tod:po (rsh 3 1 q.p.lot)))
rep
==
=+ [dyz=(met 5 q.p.lot) fin=| dub=&]
(weld (trip (tod:po sxz)) rep)
=+ dyy=(met 4 sxz)
=+ imp=*@
|- ^- tape
?: =(0 dyz)
?: =(imp dyy)
rep
%= $
fin &
dub !dub
dyz (dec dyz)
q.p.lot (rsh 5 1 q.p.lot)
rep
=+ syb=(wren:un (end 5 1 q.p.lot))
=+ cog=~(zig mu [(rsh 4 1 syb) (end 4 1 syb)])
;: weld
(trip (tos:po (end 3 1 p.cog)))
(trip (tod:po (rsh 3 1 p.cog)))
`tape`['-' ~]
(trip (tos:po (end 3 1 q.cog)))
(trip (tod:po (rsh 3 1 q.cog)))
`tape`?.(fin ~ ['-' ?.(dub ~ ['-' ~])])
rep
==
%= $
sxz (rsh 4 1 sxz)
imp +(imp)
rep
=+ log=(end 4 1 sxz)
;: weld
(trip (tos:po (rsh 3 1 log)))
(trip (tod:po (end 3 1 log)))
?:(=((mod imp 4) 0) ?:(=(imp 0) "" "--") "-")
rep
==
==
::
$r

65
arvo/jael.hoon
View File

@ -41,10 +41,16 @@
vew/(set duct) :: watchers
== ::
++ jael-friend :: relationship
$: luf/(unit life) :: life known
$: luf/(unit life) :: life as known to
lab/(nap jael-right) :: promises to
vow/(set duct) :: watchers
== ::
++ jael-inference :: learning result
$% {$hard p/ship} :: rough update to
{$meet p/ship} :: first contact with
{$soft p/ship} :: soft update to
{$sign p/ship q/gree} :: return signature
==
++ jael-right :: urbit commitment
$% {$block p/pile} :: address block
{$email p/(set @ta)} :: email addresses
@ -231,9 +237,54 @@
::
$line
=* ryt `jael-right`[%entry [[(shaf %hand r.tac) q.tac r.tac] ~ ~]]
!!
=< abet
=< abet
(give:(unto:(from p.tac) our) `(nap jael-right)`[ryt ~ ~])
::
$meet
=^ fur pub.urb.nav.lex (~(meet da pub.urb.nav.lex) p.tac)
[~ lex]
::
$over
$(our p.tac, tac q.tac)
::
$pall
=< abet
=< abet
(pall:(unto:(from our) p.tac) q.tac)
==
::
++ meld
|= {new/gree old/gree}
=+
=< work
|% ++ abet
++ work
=+ wen=(~(tap by new))
|- ^- {(list jael-inference
++
=+ wen=(~(tap by new))
|- ^- {gree gree}
?~ wen [~ old]
=+ mor=$(wen t.wen)
++ da :: pedigree core
|_ {via/ship ped/gree}
++ meet
|= new/gree
=+ wen=(~(tap by new))
|- ^- {(list jael-inference) gree}
?~ wen [~ ped]
=+ mor=$(wen t.wen)
--
::
++ from
|= rex/ship
=+ :* nex=*(list move)
@ -256,6 +307,16 @@
|= lab/(nap jael-right)
^+ +>
!!
::
++ pall
|= lyf/life
?> |(?=($~ luf) =(u.luf lyf) =(
+>(luf `lyf)
%= +>
luf
?~ luf `lyf
?: =(u.luf
==
--
--
--