Move histogram words from core/sets to extra/histogram

diff --git a/core/sets/sets-docs.factor b/core/sets/sets-docs.factor
index 298fcbeeae23bf6801fa7dfab557856f148c60b0..0fce78dd681877e17ec9c01b9758f009f5ad40d2 100755 (executable)
--- a/core/sets/sets-docs.factor
+++ b/core/sets/sets-docs.factor
@@ -20,13 +20,6 @@ $nl
 { $subsection set= }
 "A word used to implement the above:"
 { $subsection unique }
-"Counting elements in a sequence:"
-{ $subsection histogram }
-{ $subsection histogram* }
-"Combinators for implementing histogram:"
-{ $subsection sequence>assoc }
-{ $subsection sequence>assoc* }
-{ $subsection sequence>hashtable }
 "Adding elements to sets:"
 { $subsection adjoin }
 { $subsection conjoin }
@@ -134,72 +127,3 @@ HELP: gather
      { "newseq" sequence } }
 { $description "Maps a quotation onto a sequence, concatenates the results of the mapping, and removes duplicates." } ;
 
-HELP: histogram
-{ $values
-    { "seq" sequence }
-    { "hashtable" hashtable }
-}
-{ $examples 
-    { $example "! Count the number of times an element appears in a sequence."
-               "USING: prettyprint sets ;"
-               "\"aaabc\" histogram ."
-               "H{ { 97 3 } { 98 1 } { 99 1 } }"
-    }
-}
-{ $description "Returns a hashtable where the keys are the elements of the sequence and the values are the number of times they appeared in that sequence." } ;
-
-HELP: histogram*
-{ $values
-    { "hashtable" hashtable } { "seq" sequence }
-    { "hashtable" hashtable }
-}
-{ $examples 
-    { $example "! Count the number of times the elements of two sequences appear."
-               "USING: prettyprint sets ;"
-               "\"aaabc\" histogram \"aaaaaabc\" histogram* ."
-               "H{ { 97 9 } { 98 2 } { 99 2 } }"
-    }
-}
-{ $description "Takes an existing hashtable and uses " { $link histogram } " to continue counting the number of occurences of each element." } ;
-
-HELP: sequence>assoc
-{ $values
-    { "seq" sequence } { "quot" quotation } { "exemplar" "an exemplar assoc" }
-    { "assoc" assoc }
-}
-{ $examples 
-    { $example "! Iterate over a sequence and increment the count at each element"
-               "USING: assocs prettyprint sets ;"
-               "\"aaabc\" [ inc-at ] H{ } sequence>assoc ."
-               "H{ { 97 3 } { 98 1 } { 99 1 } }"
-    }
-}
-{ $description "Iterates over a sequence, allowing elements of the sequence to be added to a newly created " { $snippet "assoc" } " according to the passed quotation." } ;
-
-HELP: sequence>assoc*
-{ $values
-    { "assoc" assoc } { "seq" sequence } { "quot" quotation }
-    { "assoc" assoc }
-}
-{ $examples 
-    { $example "! Iterate over a sequence and add the counts to an existing assoc"
-               "USING: assocs prettyprint sets kernel ;"
-               "H{ { 97 2 } { 98 1 } } clone \"aaabc\" [ inc-at ] sequence>assoc* ."
-               "H{ { 97 5 } { 98 2 } { 99 1 } }"
-    }
-}
-{ $description "Iterates over a sequence, allowing elements of the sequence to be added to an existing " { $snippet "assoc" } " according to the passed quotation." } ;
-
-HELP: sequence>hashtable
-{ $values
-    { "seq" sequence } { "quot" quotation }
-    { "hashtable" hashtable }
-}
-{ $examples 
-    { $example "! Count the number of times an element occurs in a sequence"
-               "USING: assocs prettyprint sets ;"
-               "\"aaabc\" [ inc-at ] sequence>hashtable ."
-               "H{ { 97 3 } { 98 1 } { 99 1 } }"
-    }
-}
-{ $description "Iterates over a sequence, allowing elements of the sequence to be added to a hashtable according to the passed quotation." } ;

diff --git a/core/sets/sets-tests.factor b/core/sets/sets-tests.factor
old mode 100644 (file)
new mode 100755 (executable)
index be195a6..f9f8ba9
--- a/core/sets/sets-tests.factor
+++ b/core/sets/sets-tests.factor
@@ -30,12 +30,3 @@ IN: sets.tests
 
 [ f ] [ { 1 } { } intersects? ] unit-test
 
-[
-    H{
-        { 97 2 }
-        { 98 2 }
-        { 99 2 }
-    }
-] [
-    "aabbcc" histogram
-] unit-test

diff --git a/core/sets/sets.factor b/core/sets/sets.factor
index 421d43bb3dff024bda75b6d032d2110a23a797b4..062b624e8fec0f327b45b06b045893a7dbd8d20d 100755 (executable)
--- a/core/sets/sets.factor
+++ b/core/sets/sets.factor
@@ -54,25 +54,3 @@ PRIVATE>
 
 : set= ( seq1 seq2 -- ? )
     [ unique ] bi@ = ;
-
-<PRIVATE
-
-: (sequence>assoc) ( seq quot assoc -- assoc )
-    [ swap curry each ] keep ; inline
-
-PRIVATE>
-
-: sequence>assoc* ( assoc seq quot: ( obj assoc -- ) -- assoc )
-    rot (sequence>assoc) ; inline
-
-: sequence>assoc ( seq quot: ( obj assoc -- ) exemplar -- assoc )
-    clone (sequence>assoc) ; inline
-
-: sequence>hashtable ( seq quot: ( obj hashtable -- ) -- hashtable )
-    H{ } sequence>assoc ; inline
-
-: histogram* ( hashtable seq -- hashtable )
-    [ inc-at ] sequence>assoc* ;
-
-: histogram ( seq -- hashtable )
-    [ inc-at ] sequence>hashtable ;

diff --git a/extra/histogram/histogram-docs.factor b/extra/histogram/histogram-docs.factor
new file mode 100755 (executable)
index 0000000..d81400f
--- /dev/null
+++ b/extra/histogram/histogram-docs.factor
@@ -0,0 +1,83 @@
+IN: histogram\r
+USING: help.markup help.syntax sequences hashtables quotations assocs ;\r
+\r
+HELP: histogram\r
+{ $values\r
+    { "seq" sequence }\r
+    { "hashtable" hashtable }\r
+}\r
+{ $examples \r
+    { $example "! Count the number of times an element appears in a sequence."\r
+               "USING: prettyprint sets ;"\r
+               "\"aaabc\" histogram ."\r
+               "H{ { 97 3 } { 98 1 } { 99 1 } }"\r
+    }\r
+}\r
+{ $description "Returns a hashtable where the keys are the elements of the sequence and the values are the number of times they appeared in that sequence." } ;\r
+\r
+HELP: histogram*\r
+{ $values\r
+    { "hashtable" hashtable } { "seq" sequence }\r
+    { "hashtable" hashtable }\r
+}\r
+{ $examples \r
+    { $example "! Count the number of times the elements of two sequences appear."\r
+               "USING: prettyprint sets ;"\r
+               "\"aaabc\" histogram \"aaaaaabc\" histogram* ."\r
+               "H{ { 97 9 } { 98 2 } { 99 2 } }"\r
+    }\r
+}\r
+{ $description "Takes an existing hashtable and uses " { $link histogram } " to continue counting the number of occurences of each element." } ;\r
+\r
+HELP: sequence>assoc\r
+{ $values\r
+    { "seq" sequence } { "quot" quotation } { "exemplar" "an exemplar assoc" }\r
+    { "assoc" assoc }\r
+}\r
+{ $examples \r
+    { $example "! Iterate over a sequence and increment the count at each element"\r
+               "USING: assocs prettyprint sets ;"\r
+               "\"aaabc\" [ inc-at ] H{ } sequence>assoc ."\r
+               "H{ { 97 3 } { 98 1 } { 99 1 } }"\r
+    }\r
+}\r
+{ $description "Iterates over a sequence, allowing elements of the sequence to be added to a newly created " { $snippet "assoc" } " according to the passed quotation." } ;\r
+\r
+HELP: sequence>assoc*\r
+{ $values\r
+    { "assoc" assoc } { "seq" sequence } { "quot" quotation }\r
+    { "assoc" assoc }\r
+}\r
+{ $examples \r
+    { $example "! Iterate over a sequence and add the counts to an existing assoc"\r
+               "USING: assocs prettyprint sets kernel ;"\r
+               "H{ { 97 2 } { 98 1 } } clone \"aaabc\" [ inc-at ] sequence>assoc* ."\r
+               "H{ { 97 5 } { 98 2 } { 99 1 } }"\r
+    }\r
+}\r
+{ $description "Iterates over a sequence, allowing elements of the sequence to be added to an existing " { $snippet "assoc" } " according to the passed quotation." } ;\r
+\r
+HELP: sequence>hashtable\r
+{ $values\r
+    { "seq" sequence } { "quot" quotation }\r
+    { "hashtable" hashtable }\r
+}\r
+{ $examples \r
+    { $example "! Count the number of times an element occurs in a sequence"\r
+               "USING: assocs prettyprint sets ;"\r
+               "\"aaabc\" [ inc-at ] sequence>hashtable ."\r
+               "H{ { 97 3 } { 98 1 } { 99 1 } }"\r
+    }\r
+}\r
+{ $description "Iterates over a sequence, allowing elements of the sequence to be added to a hashtable according to the passed quotation." } ;\r
+\r
+ARTICLE: "histogram" "Computing histograms"\r
+"Counting elements in a sequence:"\r
+{ $subsection histogram }\r
+{ $subsection histogram* }\r
+"Combinators for implementing histogram:"\r
+{ $subsection sequence>assoc }\r
+{ $subsection sequence>assoc* }\r
+{ $subsection sequence>hashtable } ;\r
+\r
+ABOUT: "histogram"\r

diff --git a/extra/histogram/histogram-tests.factor b/extra/histogram/histogram-tests.factor
new file mode 100755 (executable)
index 0000000..f0e7b3e
--- /dev/null
+++ b/extra/histogram/histogram-tests.factor
@@ -0,0 +1,12 @@
+IN: histogram.tests\r
+USING: help.markup help.syntax tools.test histogram ;\r
+\r
+[\r
+    H{\r
+        { 97 2 }\r
+        { 98 2 }\r
+        { 99 2 }\r
+    }\r
+] [\r
+    "aabbcc" histogram\r
+] unit-test\r

diff --git a/extra/histogram/histogram.factor b/extra/histogram/histogram.factor
new file mode 100755 (executable)
index 0000000..70ddfd3
--- /dev/null
+++ b/extra/histogram/histogram.factor
@@ -0,0 +1,26 @@
+! Copyright (C) 2009 Doug Coleman.\r
+! See http://factorcode.org/license.txt for BSD license.\r
+USING: kernel sequences assocs ;\r
+IN: histogram\r
+\r
+<PRIVATE\r
+\r
+: (sequence>assoc) ( seq quot assoc -- assoc )\r
+    [ swap curry each ] keep ; inline\r
+\r
+PRIVATE>\r
+\r
+: sequence>assoc* ( assoc seq quot: ( obj assoc -- ) -- assoc )\r
+    rot (sequence>assoc) ; inline\r
+\r
+: sequence>assoc ( seq quot: ( obj assoc -- ) exemplar -- assoc )\r
+    clone (sequence>assoc) ; inline\r
+\r
+: sequence>hashtable ( seq quot: ( obj hashtable -- ) -- hashtable )\r
+    H{ } sequence>assoc ; inline\r
+\r
+: histogram* ( hashtable seq -- hashtable )\r
+    [ inc-at ] sequence>assoc* ;\r
+\r
+: histogram ( seq -- hashtable )\r
+    [ inc-at ] sequence>hashtable ;\r