steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

release
Joe Groff 2010-03-23 02:12:14 -07:00
parent 63bb6c4e42 522f28d5a5
commit 4ad1f7d7d4
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extra/astar/astar-docs.factor
View File

@ -62,8 +62,7 @@ HELP: find-path
", or f if no such path exists" } ", or f if no such path exists" }
} }
{ $description "Find a path between " { $snippet "start" } " and " { $snippet "target" } { $description "Find a path between " { $snippet "start" } " and " { $snippet "target" }
" using the A* algorithm. The " { $snippet "astar" } " tuple must have been previously " " using the A* algorithm."
" built using " { $link <astar> } "."
} ; } ;
HELP: considered HELP: considered
@ -77,6 +76,7 @@ HELP: considered
ARTICLE: "astar" "A* algorithm" ARTICLE: "astar" "A* algorithm"
"The " { $vocab-link "astar" } " vocabulary implements a graph search algorithm for finding the least-cost path from one node to another." $nl "The " { $vocab-link "astar" } " vocabulary implements a graph search algorithm for finding the least-cost path from one node to another." $nl
"The " { $link astar } " tuple may be derived from and its " { $link cost } ", " { $link heuristic } ", and " { $link neighbours } " methods overwritten, or the " { $link <astar> } " word can be used to build such an object from quotations." $nl
"Make an A* object:" "Make an A* object:"
{ $subsections <astar> } { $subsections <astar> }
"Find a path between nodes:" "Find a path between nodes:"

10
extra/astar/astar.factor
View File

@ -1,6 +1,6 @@
! Copyright (C) 2010 Samuel Tardieu. ! Copyright (C) 2010 Samuel Tardieu.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: accessors assocs heaps kernel math sequences sets shuffle ; USING: accessors assocs hash-sets heaps kernel math sequences sets shuffle ;
IN: astar IN: astar
! This implements the A* algorithm. See http://en.wikipedia.org/wiki/A* ! This implements the A* algorithm. See http://en.wikipedia.org/wiki/A*
@ -24,10 +24,10 @@ TUPLE: (astar) astar goal origin in-open-set open-set ;
(add-to-open-set) ; (add-to-open-set) ;
: ?add-to-open-set ( node astar -- ) : ?add-to-open-set ( node astar -- )
2dup astar>> in-closed-set>> key? [ 2drop ] [ add-to-open-set ] if ; 2dup astar>> in-closed-set>> in? [ 2drop ] [ add-to-open-set ] if ;
: move-to-closed-set ( node astar -- ) : move-to-closed-set ( node astar -- )
[ astar>> in-closed-set>> conjoin ] [ in-open-set>> delete-at ] 2bi ; [ astar>> in-closed-set>> adjoin ] [ in-open-set>> delete-at ] 2bi ;
: get-first ( astar -- node ) : get-first ( astar -- node )
[ open-set>> heap-pop drop dup ] [ move-to-closed-set ] bi ; [ open-set>> heap-pop drop dup ] [ move-to-closed-set ] bi ;
@ -58,7 +58,7 @@ TUPLE: (astar) astar goal origin in-open-set open-set ;
: (init) ( from to astar -- ) : (init) ( from to astar -- )
swap >>goal swap >>goal
H{ } clone over astar>> (>>g) H{ } clone over astar>> (>>g)
H{ } clone over astar>> (>>in-closed-set) { } <hash-set> over astar>> (>>in-closed-set)
H{ } clone >>origin H{ } clone >>origin
H{ } clone >>in-open-set H{ } clone >>in-open-set
<min-heap> >>open-set <min-heap> >>open-set
@ -78,4 +78,4 @@ PRIVATE>
astar-simple new swap >>heuristic swap >>cost swap >>neighbours ; astar-simple new swap >>heuristic swap >>cost swap >>neighbours ;
: considered ( astar -- considered ) : considered ( astar -- considered )
in-closed-set>> keys ; in-closed-set>> members ;

7
extra/webapps/planet/planet.factor
View File

@ -1,4 +1,4 @@
! Copyright (C) 2008 Slava Pestov. ! Copyright (C) 2008, 2010 Slava Pestov.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: kernel accessors sequences sorting math math.order USING: kernel accessors sequences sorting math math.order
calendar alarms logging concurrency.combinators namespaces calendar alarms logging concurrency.combinators namespaces
@ -194,4 +194,7 @@ posting "POSTINGS"
{ planet "planet-common" } >>template ; { planet "planet-common" } >>template ;
: start-update-task ( db -- ) : start-update-task ( db -- )
'[ _ [ update-cached-postings ] with-db ] 10 minutes every drop ; '[
"webapps.planet"
[ _ [ update-cached-postings ] with-db ] with-logging
] 10 minutes every drop ;

2
vm/mach_signal.cpp
View File

@ -104,7 +104,7 @@ catch_exception_raise (mach_port_t exception_port,
mach_msg_type_number_t code_count) mach_msg_type_number_t code_count)
{ {
/* 10.6 likes to report exceptions from child processes too. Ignore those */ /* 10.6 likes to report exceptions from child processes too. Ignore those */
if(task != mach_task_self()) return KERN_SUCCESS; if(task != mach_task_self()) return KERN_FAILURE;
/* Get fault information and the faulting thread's register contents.. /* Get fault information and the faulting thread's register contents..