ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-17 20:01:32 +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 $p
=+ dyx=(met 3 q.p.lot) =+ sxz=(feen:ob q.p.lot)
=+ dyx=(met 3 sxz)
:- '~' :- '~'
?: (lte dyx 1) ?: (lte dyx 1)
(weld (trip (tod:po q.p.lot)) rep) (weld (trip (tod:po sxz)) rep)
?: =(2 dyx) =+ dyy=(met 4 sxz)
;: weld =+ imp=*@
(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=&]
|- ^- tape |- ^- tape
?: =(0 dyz) ?: =(imp dyy)
rep rep
%= $ %= $
fin & sxz (rsh 4 1 sxz)
dub !dub imp +(imp)
dyz (dec dyz) rep
q.p.lot (rsh 5 1 q.p.lot) =+ log=(end 4 1 sxz)
rep ;: weld
=+ syb=(wren:un (end 5 1 q.p.lot)) (trip (tos:po (rsh 3 1 log)))
=+ cog=~(zig mu [(rsh 4 1 syb) (end 4 1 syb)]) (trip (tod:po (end 3 1 log)))
;: weld ?:(=((mod imp 4) 0) ?:(=(imp 0) "" "--") "-")
(trip (tos:po (end 3 1 p.cog))) rep
(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
==
== ==
:: ::
$r $r

65
arvo/jael.hoon
View File

@ -41,10 +41,16 @@
vew/(set duct) :: watchers vew/(set duct) :: watchers
== :: == ::
++ jael-friend :: relationship ++ jael-friend :: relationship
$: luf/(unit life) :: life known $: luf/(unit life) :: life as known to
lab/(nap jael-right) :: promises to lab/(nap jael-right) :: promises to
vow/(set duct) :: watchers 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 ++ jael-right :: urbit commitment
$% {$block p/pile} :: address block $% {$block p/pile} :: address block
{$email p/(set @ta)} :: email addresses {$email p/(set @ta)} :: email addresses
@ -231,9 +237,54 @@
:: ::
$line $line
=* ryt `jael-right`[%entry [[(shaf %hand r.tac) q.tac r.tac] ~ ~]] =* 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 ++ from
|= rex/ship |= rex/ship
=+ :* nex=*(list move) =+ :* nex=*(list move)
@ -256,6 +307,16 @@
|= lab/(nap jael-right) |= lab/(nap jael-right)
^+ +> ^+ +>
!! !!
::
++ pall
|= lyf/life
?> |(?=($~ luf) =(u.luf lyf) =(
+>(luf `lyf)
%= +>
luf
?~ luf `lyf
?: =(u.luf
==
-- --
-- --
-- --