Merge branch 'horizon'

Author: jpolitz

.travis.yml

@@ -4,13 +4,14 @@ python:
 branches:
   only:
   - horizon
-  - sql
+  - master
 env:
   global:
   - GH_REF: github.com/brownplt/pyret-docs.git
   - RACKET_DIR: ~/racket
   - RACKET_VERSION: '6.5'
-  - secure: H5K8RszG02jJnvhZm+oQ+NFIyYte29mnk3soZ0Ya9Oq+ECxBU34C5WBJOBEyVldgQy6sKGWFxvXR2+6opZFUS1nzSy2e4t9Fvo0GxiCvJUWVyG9arfe2HNSCB93nOZYJNA3ApVfNOOt/tfKdaBAKSqbIznUBgn1Cr+PTLQtULaRV8cIf3SGC3493zhWyu6yO5zPvTpE6PijmnPPvLriOmLXNoSQ8jkULrhyVu8cORPCxM+3tCL3gIHK1kDfzSF19eSKuEfq/qOWvQcDLWDZsoBW8LrwljJyMIZVGWT2ns9Ig5aoND82qaie6KUjFPQOamLFPysaiT2Flp7tlz7cag+Cyi0oaZIcFEtc5YEl2BC1AGBBaNYT8OVprL9PQmptDL9cukkdUXOxjAazu8uixDZ0czA3FYVPOsE4Yr/86dz/oD1YLgSkj9sN6j8eJFdIBszUd0KNuDZWS+oiD0xbxcJVhZPOwujSUYn5Dkuo7u821V/oPQefpmZnG+w6SdU0t+yFIW3mZqWSYyH0uY2MiczXnu8bEaCFTTxj5x79ZWEPKFmmmrBG9FG3pd6SSGUvKL8ddbfFQagLseCeYAlSdUbij7zdnHgEg6aMYhccCtrJpwB9+b+Frj30KTB3aRyAVv1HboZboTVrHuWMQudDU+9Ws/xYpXzdOFvi0vOYDDAo=
+  - secure: tkOgKmY5brk6wSTluhgKaFiUiVVXnf1HefE1v56LOUlNHcieMLjRAgXc5LsdezI5ymtf59tZBVAdv7zWG+2Co/nMgIVE20FLpT2UeZCyBu+669lDPZG5zJcsq3Yp52EyE3pSzBRc5H5c9Ni3AZWunV/OxV8xUn3TMkTz9ian/j1AiyDK6z/s5TyFVuRITUOriyuE84e5HJvSYdCjMH2jZE3vCp+lBO9xK/+7IAyoXM7LBFIxz2qBbfzeGbDUzMiFujJZ0/cJu8Qfjlz/AEzW13BWhzhrI9FWUaawKJX1xU6gv9uhRgmsQqQjOMe2CdDuUiUoFP11WjbSnSsN7/B3oklqSiHNHFnOCbxYqunpEpI4EOltL0SpEFHZYl5JgtsLJTbqZvAJ0AaT88F8HBJEFthxyz6MhbBZ9CewOpFY50qY7yvsLr6JEEzCEnTk2EtIv6r2Ux5Xad+K2AXfpEPR1VvfRl6J4U7JGKHHspNVJmpdZSnJdYTzS2siHknV4LQ5Zrl1uwhTjTc4H6bshDKQfcXFkkc4edV78jrJiPDP5hpPVaqLH5MTLV0mhsrSowHPaOyL6y3y+/mrUFG7F0Lha9qdtT4k8PvD47ldPxBCaFOh85MC+w+p65WFqf2rwFMmZNA9sUTltFvU5OMtBPfTMpCrhgnBhf62UrLm6z2jJZY=
+  - secure: LNFPDErTqBbgv3XgDI+X9q9Clb/BCFeuUcHjpzP5w5u4y2hpe3TnOkrLfI/FNNYqL2wczqA9cyQ6tDsczFatxz936heSU087uimPCEHKYuUk4jCZ3vM1iIH+MeiAEnaSDXmHOS0iSxvX86BU5AYULlRdpCNqU/12dzJZdARYhIGX+7LNUCUf2/D9MAbL85OjGjzR6ZEaJ5TdvL7IPKejsABiyU/TEAD6PNIgPaL4MRv+gqhedOak7nhFHUfJFUOVQ/GFE9np46HWW19aGIJSktO7RRCsDESUBte19qdQz+pABgn/mR3zVYsn0x7bd9VhpGHt5yeEpAhm82GB5MdkLVYCap8SgGHzl6IAXyToBTmC6wDxOQ/ivpWnkDum1W2rEuY/HrT1235Z7ea5YZVajg5uxAcnkpYqkOyWrLMm7yjXY6wdNQ9F1YKyx6GOxpZj/5opib3aF0hxIRF5nHD2ROZVgLeBM6PKliES1/X5GutBQCh3PsXwGd1G40YtUPXghMwxjYiDmwkM05fOnrUqwfobz98yrDm/6Q7KUEqUaUcV/RshLYcgXrOgSv9YSDykJ7BkvFhnDTOiHPVc4gg4GFHjZI0T8cCziyeroo3/pfR/Oe1kIXyuCzpP4kbY48JGE7GEvC7vT/dwOQ4ERt4XfzD2jlBaubqI6Boy95+VrKo=
 before_install:
 - git clone https://github.com/greghendershott/travis-racket.git
 - cat travis-racket/install-racket.sh | bash

deploy.sh

@@ -1,46 +1,21 @@
 #!/bin/bash
 
-# Travis deploy script adapted from
-# http://lexi-lambda.github.io/blog/2015/07/18/automatically-deploying-a-frog-powered-blog-to-github-pages/
-
-if [ -d "gh-pages" ]; then
-    >&2 echo "Naming conflict. Either rename the folder 'gh-pages' or update the deploy script."
-fi
-
-if [ "${TRAVIS_BRANCH}" -eq "master" ]; then
-    export IS_DEVELOPMENT=false
-else
-    export IS_DEVELOPMENT=true
-fi
-
-BUILD_DIR=build/docs
-
-set -ev # exit with nonzero exit code if anything fails
-
-# Make sure there's no build directory already
-rm -rf $BUILD_DIR || exit 0;
-
-# build blog
+SHORT_COMMIT=`echo $TRAVIS_COMMIT | cut -c1-7`
+VERSION=$SHORT_COMMIT
+BRANCH=$TRAVIS_BRANCH
 npm install
 make
 
-# Fetch gh-pages branch
-git clone --quiet -b gh-pages "https://${GH_TOKEN}@${GH_REF}" gh-pages > /dev/null 2>&1
-
-# Remove any previous build and add the new one
-rm -rf "gh-pages/${TRAVIS_BRANCH}" || exit 0;
-mv $BUILD_DIR "gh-pages/${TRAVIS_BRANCH}"
-
-# Commit the new build
-cd gh-pages
+tar czf build/docs.tgz build/docs
 
-git config user.name "Travis CI"
-# Email here needs to be the same as the user who created
-# the Github access token for Travis
-git config user.email "[email protected]"
+# NOTE(joe):
+#
+# The "*" in front of dele makes the copy continue if the command fails.  This
+# makes it so new branches don't need to have someone manually make a file to
+# delete (see the -Q option in `man curl`).
 
-git add -A "${TRAVIS_BRANCH}"
-git commit -m "Deploy ${TRAVIS_BRANCH} build to Github Pages"
+curl -u $FTP_USER:$FTP_PASS \
+     -Q "*dele pyret-docs/$BRANCH/docs.tgz"\
+     --ftp-create-dirs \
+     -T build/docs.tgz ftp://ftp.cs.brown.edu/pyret-docs/$BRANCH/docs.tgz
 
-# Push the new build
-git push --quiet "https://${GH_TOKEN}@${GH_REF}" gh-pages > /dev/null 2>&1

src/libraries.scrbl

@@ -12,6 +12,7 @@ This section contains information on libraries that come with Pyret.
 @include-section["builtin/strings.scrbl"]
 @include-section["builtin/booleans.scrbl"]
 @include-section["builtin/raw-arrays.scrbl"]
+@include-section["builtin/tables.scrbl"]
 
 @include-section["trove/lists.scrbl"]
 @include-section["trove/sets.scrbl"]
@@ -31,7 +32,6 @@ This section contains information on libraries that come with Pyret.
 @include-section["trove/world.js.rkt"]
 @include-section["builtin/reactors.scrbl"]
 @include-section["trove/plot.js.rkt"]
-@include-section["builtin/tables.scrbl"]
 @include-section["trove/statistics.scrbl"]
-@;@include-section["trove/graph.js.rkt"]
+@include-section["trove/math.scrbl"]
 

src/trove/lists.scrbl

@@ -1783,140 +1783,7 @@ end
 
   }
 
-  @function["max"
-    #:contract (a-arrow (L-of N) N)
-    #:args '(("lst" #f))
-    #:return N
-  ]{
-
-  Given a list of numbers, returns the largest.  Raises an error on empty lists.
-
-@examples{
-examples:
-  max([list: 1, 2, 3]) is 3
-  max([list: ]) raises "empty"
-  max([list: ~1, 3, 7/2]) is 7/2
-end
-}
-
-  }
-
-  @function["min"
-    #:contract (a-arrow (L-of N) N)
-    #:args '(("lst" #f))
-    #:return N
-  ]{
-
-  Given a list of numbers, returns the smallest.  Raises an error on empty lists.
-
-@examples{
-examples:
-  min([list: 1, 2, 3]) is 1
-  min([list: ]) raises "empty"
-  min([list: ~1, 3, -7/2]) is -7/2
-end
-}
-
-  }
-
-
-  @function["sum"
-    #:contract (a-arrow (L-of N) N)
-    #:args '(("lst" #f))
-    #:return N
-  ]{
-
-  Given a list of numbers @pyret{x1, x2, ..., xn}, returns @pyret{x1 + x2 + ... + xn}.
-
-@examples{
-examples:
-  sum([list: 1, 2, 3]) is 6
-  sum([list: ]) is 0
-  sum([list: ~1, 3]) is-roughly ~4
-end
-}
-  }
-
-  @function["mean"
-    #:contract (a-arrow (L-of N) N)
-    #:args '(("lst" #f))
-    #:return N
-  ]{
-
-  Given a list of numbers, returns their arithmetic mean.  Raises an error on empty lists.
-
-@examples{
-examples:
-  mean([list: 1, 2, 6]) is 3
-  mean([list: ]) raises "empty"
-  mean([list: ~1, 3]) is-roughly ~2
-end
-}
-
-  }
-
-  @function["median"
-    #:contract (a-arrow (L-of N) N)
-    #:args '(("lst" #f))
-    #:return N
-  ]{
-
-  Given a list of numbers, returns their median (taking the mean of the two
-  middle numbers if the list has even length).  Raises an error on empty lists.
-
-@examples{
-examples:
-  median([list: 1, 2, 6]) is 2
-  median([list: ]) raises "empty"
-  median([list: ~1, 3]) is-roughly ~2
-end
-}
-
-  }
-
-  @function["stdev"
-    #:contract (a-arrow (L-of N) N)
-    #:args '(("lst" #f))
-    #:return N
-  ]{
-
-  Given a list of numbers, returns their standard deviation.  Raises an error
-  on empty lists.
-
-@examples{
-examples:
-  stdev([list: 3, 4, 5, 6, 7]) is%(within(0.01)) 1.41
-  stdev([list: 1, 1, 1, 1]) is-roughly ~0
-  stdev([list:]) raises "empty"
-end
-}
-
-  }
-
-  @function["distinct"
-    #:contract (a-arrow (L-of N) N)
-    #:args '(("lst" #f))
-    #:return N
-  ]{
-
-  Given a list, returns a new list containing only one copy of each element
-  that is duplicated in the list.  The last (latest in the list) copy is kept.
-  Roughnums are not compared for equality, and so will always appear in the
-  output list.
-
-@examples{
-examples:
-  distinct([list: 3, 1, 2, 2, 3, 2]) is [list: 1, 3, 2]
-  distinct([list: ~1, ~1]) is-roughly [list: ~1, ~1]
-  distinct([list: ~1, ~1, 1]) is-roughly [list: ~1, ~1, 1]
-  distinct([list: ~1, ~1, 1, 1]) is-roughly [list: ~1, ~1, 1]
-  distinct([list: ~1, ~2, ~3]) is-roughly [list: ~1, ~2, ~3]
-end
-}
-
-  }
-
-
+  
   @function[
     "get"
     #:examples
@@ -2014,6 +1881,30 @@ end
     end
     }
   ]
+  @function["distinct"
+    #:contract (a-arrow (L-of N) N)
+    #:args '(("lst" #f))
+    #:return N
+  ]{
+
+  Given a list, returns a new list containing only one copy of each element
+  that is duplicated in the list.  The last (latest in the list) copy is kept.
+  Roughnums are not compared for equality, and so will always appear in the
+  output list.
+
+@examples{
+examples:
+  distinct([list: 3, 1, 2, 2, 3, 2]) is [list: 1, 3, 2]
+  distinct([list: ~1, ~1]) is-roughly [list: ~1, ~1]
+  distinct([list: ~1, ~1, 1]) is-roughly [list: ~1, ~1, 1]
+  distinct([list: ~1, ~1, 1, 1]) is-roughly [list: ~1, ~1, 1]
+  distinct([list: ~1, ~2, ~3]) is-roughly [list: ~1, ~2, ~3]
+end
+}
+
+  }
+
+
   @function[
     "filter"
     #:examples

src/trove/math.scrbl

@@ -0,0 +1,97 @@
+#lang scribble/manual
+@(require "../../scribble-api.rkt" "../abbrevs.rkt")
+@(require (only-in scribble/core delayed-block))
+
+@(define (link T) (a-id T (xref "statistics" T)))
+@(define (t-field name ty) (a-field (tt name) ty))
+
+@(define (t-record . rest)
+   (apply a-record (map tt (filter (lambda (x) (not (string=? x "\n"))) rest))))
+
+@(append-gen-docs
+  `(module "math"
+    (path "src/arr/trove/math.arr")
+
+    (fun-spec (name "sum") (arity 1))
+    (fun-spec (name "max") (arity 1))
+    (fun-spec (name "min") (arity 1))
+    (fun-spec (name "arg-min") (arity 1))
+    (fun-spec (name "arg-max") (arity 1))
+   ))
+
+@docmodule["math"]{
+  The Pyret Math library.  It consists of functions for arithmetic
+  calculations, optimization, and more to come!
+
+  Every function in this library is available on the @tt{math} module
+  object.  For example, if you used @pyret{import math as M}, you would
+  write @pyret{S.arg-max} to access @pyret{arg-max} below.  If you used
+  @pyret{include}, then you can refer to identifiers without writing @pyret{M.}
+  as a prefix.  
+  
+  @;#########################################################################
+  @section{Arithmetic Functions}
+  @function["sum"
+    #:contract (a-arrow (L-of N) N)
+    #:args '(("l" #f))
+    #:return N
+  ]{
+  Calculates the arithmetic sum of the Numbers in @pyret{l}.  If @pyret{l}
+  contains at least one RoughNum, then the output will be a RoughNum.
+
+  @examples{
+  sum([list: 0, 2, 4])
+  sum([list: -1, 1, ~2])
+  }
+  }
+
+  @;#########################################################################
+  @section{Minimization & Maximization}
+  
+  @function["max"
+    #:contract (a-arrow (L-of N) N)
+    #:args '(("l" #f))
+    #:return N
+  ]{
+  Calculates the maximal element of the set of Numbers in @pyret{l}.
+  
+  @examples{
+  max([list: 2.1, 2, 4.5, ~1.5, -1, 1])
+  }
+  }
+  
+  @function["min"
+    #:contract (a-arrow (L-of N) N)
+    #:args '(("l" #f))
+    #:return N
+  ]{
+  Calculates the minimal element of the set of Numbers in @pyret{l}.
+
+  @examples{
+  min([list: -1, 0, ~1, 2, 5])
+  }
+  }
+
+  @function["arg-max"
+    #:contract (a-arrow (L-of N) N)
+    #:args '(("l" #f))
+    #:return N
+  ]{
+  Calculates the index of the maximal element within @pyret{l}.
+  
+  @examples{
+  arg-max([list: -1, 0, ~1, 2, 5])
+  }
+  }
+  @function["arg-min"
+    #:contract (a-arrow (L-of N) N)
+    #:args '(("l" #f))
+    #:return N
+  ]{
+  Calculates the index of the minimal element within @pyret{l}.
+  
+  @examples{
+  arg-max([list: -1, 0, ~1, 2, 5])
+  }
+  }
+}

src/trove/plot.js.rkt

@@ -43,8 +43,8 @@
   Every function in this library is available on the @tt{plot} module object.
   For example, if you used @pyret{import plot as P}, you would write
   @pyret{P.display-function} to access @pyret{display-function} below. If you used
-  @pyret{include}, then you can refer to identifiers without needing to prefix
-  with @pyret{P.}.
+  @pyret{include}, then you can refer to identifiers without needing to prefix 
+  with @pyret{P.} 
 
   @;############################################################################
   @section{The Plot Type}