diff --git a/basis/calendar/format/format-tests.factor b/basis/calendar/format/format-tests.factor index f8864351a4..cb1ff0b60f 100644 --- a/basis/calendar/format/format-tests.factor +++ b/basis/calendar/format/format-tests.factor @@ -1,5 +1,5 @@ USING: calendar.format calendar kernel math tools.test -io.streams.string accessors io math.order ; +io.streams.string accessors io math.order sequences ; IN: calendar.format.tests [ 0 ] [ @@ -81,3 +81,5 @@ IN: calendar.format.tests ] [ "Thursday, 02-Oct-2008 23:59:59 GMT" cookie-string>timestamp ] unit-test +[ ] +[ { 2008 2009 } [ year. ] each ] unit-test diff --git a/basis/calendar/format/format.factor b/basis/calendar/format/format.factor index 6aa4126ff9..d07d74722a 100644 --- a/basis/calendar/format/format.factor +++ b/basis/calendar/format/format.factor @@ -66,7 +66,7 @@ M: array month. ( pair -- ) [ month-name write bl number>string print ] [ 1 zeller-congruence ] [ (days-in-month) day-abbreviations2 " " join print ] 2tri - over " " concat write + over " " "" concat-as write [ [ 1 + day. ] keep 1 + + 7 mod zero? [ nl ] [ bl ] if diff --git a/basis/html/streams/streams-tests.factor b/basis/html/streams/streams-tests.factor index eeac9210c1..10d99f31a2 100644 --- a/basis/html/streams/streams-tests.factor +++ b/basis/html/streams/streams-tests.factor @@ -49,7 +49,7 @@ M: funky url-of "http://www.funky-town.com/" swap town>> append ; ] make-html-string ] unit-test -[ "
cdr
" ] +[ "
cdr
" ] [ [ H{ { page-color T{ rgba f 1 0 1 1 } } } @@ -57,7 +57,7 @@ M: funky url-of "http://www.funky-town.com/" swap town>> append ; ] make-html-string ] unit-test -[ "
" ] [ +[ "

" ] [ [ H{ } [ ] with-nesting nl ] make-html-string ] unit-test diff --git a/basis/html/streams/streams.factor b/basis/html/streams/streams.factor index c6a2b08c00..6b98874703 100644 --- a/basis/html/streams/streams.factor +++ b/basis/html/streams/streams.factor @@ -113,7 +113,7 @@ CONSTANT: pre-css "white-space: pre; font-family: monospace;" { inset padding-css, } } make-css ] [ wrap-margin swap at [ pre-css append ] unless ] bi - "display: inline-block;" append ; + " display: inline-block;" append ; : div-tag ( xml style -- xml' ) div-css-style diff --git a/basis/math/vectors/simd/simd-docs.factor b/basis/math/vectors/simd/simd-docs.factor index 97ff99cd28..2fbe823965 100644 --- a/basis/math/vectors/simd/simd-docs.factor +++ b/basis/math/vectors/simd/simd-docs.factor @@ -41,7 +41,21 @@ $nl POSTPONE: SIMD: POSTPONE: SIMDS: } -"The following vector types are supported:" +"The following scalar types are supported:" +{ $code + "char" + "uchar" + "short" + "ushort" + "int" + "uint" + "longlong" + "ulonglong" + "float" + "double" +} + +"The following vector types are generated from the above scalar types:" { $code "char-16" "uchar-16" @@ -89,6 +103,7 @@ $nl { $code """USING: compiler.tree.debugger math.vectors math.vectors.simd ; +SIMD: double SYMBOLS: x y ; [ @@ -107,7 +122,7 @@ IN: simd-demo { float-4 float-4 float-4 } declare [ v* ] [ [ 1.0 ] dip n-v v* ] bi-curry* bi v+ ; -\ interpolate optimizer-report.""" } +\\ interpolate optimizer-report.""" } "Note that using " { $link declare } " is not recommended. Safer ways of getting type information for the input parameters to a word include defining methods on a generic word (the value being dispatched upon has a statically known type in the method body), as well as using " { $link "hints" } " and " { $link POSTPONE: inline } " declarations." $nl "Here is a better version of the " { $snippet "interpolate" } " words above that uses hints:" @@ -122,7 +137,7 @@ IN: simd-demo HINTS: interpolate float-4 float-4 float-4 ; -\ interpolate optimizer-report. """ } +\\ interpolate optimizer-report. """ } "This time, the optimizer report lists calls to both SIMD primitives and high-level vector words, because hints cause two code paths to be generated. The " { $snippet "optimized." } " word can be used to make sure that the fast code path consists entirely of calls to primitives." $nl "If the " { $snippet "interpolate" } " word was to be used in several places with different types of vectors, it would be best to declare it " { $link POSTPONE: inline } "." @@ -153,13 +168,13 @@ M: actor advance ( dt actor -- ) [ >float ] dip [ update-velocity ] [ update-position ] 2bi ; -M\ actor advance optimized.""" +M\\ actor advance optimized.""" } "The " { $vocab-link "compiler.cfg.debugger" } " vocabulary can give a lower-level picture of the generated code, that includes register assignments and other low-level details. To look at low-level optimizer output, call " { $snippet "test-mr mr." } " on a word or quotation:" { $code """USE: compiler.tree.debugger -M\ actor advance test-mr mr.""" } +M\\ actor advance test-mr mr.""" } "An example of a high-performance algorithm that uses SIMD primitives can be found in the " { $vocab-link "benchmark.nbody-simd" } " vocabulary." ; ARTICLE: "math.vectors.simd.intrinsics" "Low-level SIMD primitives" @@ -206,7 +221,7 @@ ARTICLE: "math.vectors.simd" "Hardware vector arithmetic (SIMD)" HELP: SIMD: { $syntax "SIMD: type" } { $values { "type" "a scalar C type" } } -{ $description "Defines 128-bit and 256-bit SIMD arrays for holding elements of " { $snippet "type" } " into the vocabulary search path. The possible type/length combinations are listed in " { $link "math.vectors.simd.types" } " and the generated words are documented in " { $link "math.vectors.simd.words" } "." } ; +{ $description "Defines 128-bit and 256-bit SIMD arrays for holding elements of " { $snippet "type" } " into the vocabulary search path. The allowed scalar types, and the auto-generated type/length vector combinations that result, are listed in " { $link "math.vectors.simd.types" } ". Generated words are documented in " { $link "math.vectors.simd.words" } "." } ; HELP: SIMDS: { $syntax "SIMDS: type type type ... ;" } diff --git a/extra/project-euler/065/065-tests.factor b/extra/project-euler/065/065-tests.factor new file mode 100644 index 0000000000..8d16cce32e --- /dev/null +++ b/extra/project-euler/065/065-tests.factor @@ -0,0 +1,4 @@ +USING: project-euler.065 tools.test ; +IN: project-euler.065.tests + +[ 272 ] [ euler065 ] unit-test diff --git a/extra/project-euler/065/065.factor b/extra/project-euler/065/065.factor new file mode 100644 index 0000000000..588c38c53d --- /dev/null +++ b/extra/project-euler/065/065.factor @@ -0,0 +1,77 @@ +! Copyright (c) 2009 Guillaume Nargeot. +! See http://factorcode.org/license.txt for BSD license. +USING: kernel math lists lists.lazy project-euler.common sequences ; +IN: project-euler.065 + +! http://projecteuler.net/index.php?section=problems&id=065 + +! DESCRIPTION +! ----------- + +! The square root of 2 can be written as an infinite continued fraction. + +! 1 +! √2 = 1 + ------------------------- +! 1 +! 2 + --------------------- +! 1 +! 2 + ----------------- +! 1 +! 2 + ------------- +! 2 + ... + +! The infinite continued fraction can be written, √2 = [1;(2)], (2) indicates +! that 2 repeats ad infinitum. In a similar way, √23 = [4;(1,3,1,8)]. + +! It turns out that the sequence of partial values of continued fractions for +! square roots provide the best rational approximations. Let us consider the +! convergents for √2. + +! 1 3 1 7 1 17 1 41 +! 1 + - = - ; 1 + ----- = - ; 1 + --------- = -- ; 1 + ------------- = -- +! 2 2 1 5 1 12 1 29 +! 2 + - 2 + ----- 2 + --------- +! 2 1 1 +! 2 + - 2 + ----- +! 2 1 +! 2 + - +! 2 + +! Hence the sequence of the first ten convergents for √2 are: +! 1, 3/2, 7/5, 17/12, 41/29, 99/70, 239/169, 577/408, 1393/985, 3363/2378, ... + +! What is most surprising is that the important mathematical constant, +! e = [2; 1,2,1, 1,4,1, 1,6,1 , ... , 1,2k,1, ...]. + +! The first ten terms in the sequence of convergents for e are: +! 2, 3, 8/3, 11/4, 19/7, 87/32, 106/39, 193/71, 1264/465, 1457/536, ... + +! The sum of digits in the numerator of the 10th convergent is 1+4+5+7=17. + +! Find the sum of digits in the numerator of the 100th convergent of the +! continued fraction for e. + + +! SOLUTION +! -------- + +array reverse 0 + [ + recip ] reduce 2 + ; + +PRIVATE> + +: euler065 ( -- answer ) + 100 e-frac numerator number>digits sum ; + +! [ euler065 ] 100 ave-time +! 4 ms ave run time - 0.33 SD (100 trials) + +SOLUTION: euler065 diff --git a/extra/project-euler/065/authors.txt b/extra/project-euler/065/authors.txt new file mode 100644 index 0000000000..6eb6698c00 --- /dev/null +++ b/extra/project-euler/065/authors.txt @@ -0,0 +1 @@ +Guillaume Nargeot diff --git a/extra/project-euler/072/072.factor b/extra/project-euler/072/072.factor index de6312f2a7..9fab6788bd 100644 --- a/extra/project-euler/072/072.factor +++ b/extra/project-euler/072/072.factor @@ -30,7 +30,7 @@ IN: project-euler.072 ! The answer can be found by adding totient(n) for 2 ≤ n ≤ 1e6 : euler072 ( -- answer ) - 2 1000000 [a,b] [ totient ] [ + ] map-reduce ; + 2 1000000 [a,b] [ totient ] sigma ; ! [ euler072 ] 100 ave-time ! 5274 ms ave run time - 102.7 SD (100 trials) diff --git a/extra/project-euler/072/authors.txt b/extra/project-euler/072/authors.txt new file mode 100644 index 0000000000..6eb6698c00 --- /dev/null +++ b/extra/project-euler/072/authors.txt @@ -0,0 +1 @@ +Guillaume Nargeot diff --git a/extra/project-euler/074/authors.txt b/extra/project-euler/074/authors.txt new file mode 100644 index 0000000000..6eb6698c00 --- /dev/null +++ b/extra/project-euler/074/authors.txt @@ -0,0 +1 @@ +Guillaume Nargeot diff --git a/extra/project-euler/085/authors.txt b/extra/project-euler/085/authors.txt new file mode 100644 index 0000000000..6eb6698c00 --- /dev/null +++ b/extra/project-euler/085/authors.txt @@ -0,0 +1 @@ +Guillaume Nargeot diff --git a/extra/project-euler/102/authors.txt b/extra/project-euler/102/authors.txt new file mode 100644 index 0000000000..6eb6698c00 --- /dev/null +++ b/extra/project-euler/102/authors.txt @@ -0,0 +1 @@ +Guillaume Nargeot diff --git a/extra/project-euler/112/authors.txt b/extra/project-euler/112/authors.txt new file mode 100644 index 0000000000..6eb6698c00 --- /dev/null +++ b/extra/project-euler/112/authors.txt @@ -0,0 +1 @@ +Guillaume Nargeot diff --git a/extra/project-euler/124/authors.txt b/extra/project-euler/124/authors.txt new file mode 100644 index 0000000000..6eb6698c00 --- /dev/null +++ b/extra/project-euler/124/authors.txt @@ -0,0 +1 @@ +Guillaume Nargeot diff --git a/extra/project-euler/188/188-tests.factor b/extra/project-euler/188/188-tests.factor new file mode 100755 index 0000000000..aa0debbbe3 --- /dev/null +++ b/extra/project-euler/188/188-tests.factor @@ -0,0 +1,4 @@ +USING: project-euler.188 tools.test ; +IN: project-euler.188.tests + +[ 95962097 ] [ euler188 ] unit-test diff --git a/extra/project-euler/188/188.factor b/extra/project-euler/188/188.factor new file mode 100755 index 0000000000..559cd8c5c1 --- /dev/null +++ b/extra/project-euler/188/188.factor @@ -0,0 +1,43 @@ +! Copyright (c) 2009 Guillaume Nargeot. +! See http://factorcode.org/license.txt for BSD license. +USING: kernel math math.functions project-euler.common ; +IN: project-euler.188 + +! http://projecteuler.net/index.php?section=problems&id=188 + +! DESCRIPTION +! ----------- + +! The hyperexponentiation or tetration of a number a by a positive integer b, +! denoted by a↑↑b or ^(b)a, is recursively defined by: + +! a↑↑1 = a, +! a↑↑(k+1) = a^(a↑↑k). + +! Thus we have e.g. 3↑↑2 = 3^3 = 27, hence +! 3↑↑3 = 3^27 = 7625597484987 and +! 3↑↑4 is roughly 10^(3.6383346400240996*10^12). + +! Find the last 8 digits of 1777↑↑1855. + + +! SOLUTION +! -------- + +! Using modular exponentiation. +! http://en.wikipedia.org/wiki/Modular_exponentiation + + + +: euler188 ( -- answer ) + 1777 1855 10 8 ^ hyper-exp-mod ; + +! [ euler188 ] 100 ave-time +! 4 ms ave run time - 0.05 SD (100 trials) + +SOLUTION: euler188 diff --git a/extra/project-euler/188/authors.txt b/extra/project-euler/188/authors.txt new file mode 100644 index 0000000000..6eb6698c00 --- /dev/null +++ b/extra/project-euler/188/authors.txt @@ -0,0 +1 @@ +Guillaume Nargeot diff --git a/extra/project-euler/project-euler.factor b/extra/project-euler/project-euler.factor index 3438de8c2d..401e53d185 100644 --- a/extra/project-euler/project-euler.factor +++ b/extra/project-euler/project-euler.factor @@ -14,17 +14,17 @@ USING: definitions io io.files io.pathnames kernel math math.parser project-euler.037 project-euler.038 project-euler.039 project-euler.040 project-euler.041 project-euler.042 project-euler.043 project-euler.044 project-euler.045 project-euler.046 project-euler.047 project-euler.048 - project-euler.049 project-euler.051 project-euler.052 project-euler.053 - project-euler.054 project-euler.055 project-euler.056 project-euler.057 - project-euler.058 project-euler.059 project-euler.063 project-euler.067 - project-euler.069 project-euler.071 project-euler.072 project-euler.073 - project-euler.074 project-euler.075 project-euler.076 project-euler.079 - project-euler.085 project-euler.092 project-euler.097 project-euler.099 - project-euler.100 project-euler.102 project-euler.112 project-euler.116 - project-euler.117 project-euler.124 project-euler.134 project-euler.148 - project-euler.150 project-euler.151 project-euler.164 project-euler.169 - project-euler.173 project-euler.175 project-euler.186 project-euler.190 - project-euler.203 project-euler.215 ; + project-euler.049 project-euler.051 project-euler.052 project-euler.053 + project-euler.054 project-euler.055 project-euler.056 project-euler.057 + project-euler.058 project-euler.059 project-euler.063 project-euler.065 + project-euler.067 project-euler.069 project-euler.071 project-euler.072 + project-euler.073 project-euler.074 project-euler.075 project-euler.076 + project-euler.079 project-euler.085 project-euler.092 project-euler.097 + project-euler.099 project-euler.100 project-euler.102 project-euler.112 + project-euler.116 project-euler.117 project-euler.124 project-euler.134 + project-euler.148 project-euler.150 project-euler.151 project-euler.164 + project-euler.169 project-euler.173 project-euler.175 project-euler.186 + project-euler.188 project-euler.190 project-euler.203 project-euler.215 ; IN: project-euler