diff options
| author | Adam Bard <github@adambard.com> | 2018-08-22 19:48:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 19:48:46 -0700 |
| commit | 67637e02eb88ae70e309378e27b0ffa8ce734105 (patch) | |
| tree | 7f5137aa327bd1db61cbcc5e4165dc7390bdd6e5 | |
| parent | 843ba7019323e6e7411cae9d4c0fa83ce98baf92 (diff) | |
| parent | f81e0f451b026e5db34bb7181a7f210734566338 (diff) | |
Merge branch 'master' into julia1
| -rw-r--r-- | asymptotic-notation.html.markdown | 4 | ||||
| -rw-r--r-- | julia.html.markdown | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/asymptotic-notation.html.markdown b/asymptotic-notation.html.markdown index 6a6df968..a1dfe9e1 100644 --- a/asymptotic-notation.html.markdown +++ b/asymptotic-notation.html.markdown @@ -155,7 +155,7 @@ Small-o, commonly written as **o**, is an Asymptotic Notation to denote the upper bound (that is not asymptotically tight) on the growth rate of runtime of an algorithm. -`f(n)` is o(g(n)), if for some real constants c (c > 0) and n<sub>0</sub> (n<sub>0</sub> > 0), `f(n)` is < `c g(n)` +`f(n)` is o(g(n)), if for all real constants c (c > 0) and n<sub>0</sub> (n<sub>0</sub> > 0), `f(n)` is < `c g(n)` for every input size n (n > n<sub>0</sub>). The definitions of O-notation and o-notation are similar. The main difference @@ -168,7 +168,7 @@ Small-omega, commonly written as **ω**, is an Asymptotic Notation to denote the lower bound (that is not asymptotically tight) on the growth rate of runtime of an algorithm. -`f(n)` is ω(g(n)), if for some real constants c (c > 0) and n<sub>0</sub> (n<sub>0</sub> > 0), `f(n)` is > `c g(n)` +`f(n)` is ω(g(n)), if for all real constants c (c > 0) and n<sub>0</sub> (n<sub>0</sub> > 0), `f(n)` is > `c g(n)` for every input size n (n > n<sub>0</sub>). The definitions of Ω-notation and ω-notation are similar. The main difference diff --git a/julia.html.markdown b/julia.html.markdown index 07a051e1..891a0a00 100644 --- a/julia.html.markdown +++ b/julia.html.markdown @@ -501,9 +501,10 @@ add_10(3) # => 13 map(add_10, [1,2,3]) # => [11, 12, 13] filter(x -> x > 5, [3, 4, 5, 6, 7]) # => [6, 7] -# We can use list comprehensions for nicer maps -[add_10(i) for i = [1, 2, 3]] # => [11, 12, 13] -[add_10(i) for i in [1, 2, 3]] # => [11, 12, 13] +# We can use list comprehensions +[add_10(i) for i = [1, 2, 3]] # => [11, 12, 13] +[add_10(i) for i in [1, 2, 3]] # => [11, 12, 13] +[x for x in [3, 4, 5, 6, 7] if x > 5] # => [6, 7] #################################################### ## 5. Types |