diff --git a/.gitignore b/.gitignore --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /dist /.cabal-sandbox /tmp +/.stack-work + diff --git a/CHANGELOG.md b/CHANGELOG.md --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +0.4.3.1 +------- + + +* Compatibility support for *MonadRandom-0.5*. + +0.4.3.0 +------- + + +* **Control.Auto.Blip**: New blip stream splitter `onEitherB`, which splits + an incoming blip stream into two output streams based on whether the + emitted items resolve to `Left` or `Right` when applied to the splitting + function. + 0.4.2.4 ------- diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ Auto ==== +[![auto on Hackage](https://img.shields.io/hackage/v/auto.svg?maxAge=2592000)](https://hackage.haskell.org/package/auto) +[![auto on Stackage LTS](http://stackage.org/package/auto/badge/lts)](http://stackage.org/lts/package/auto) +[![auto on Stackage Nightly](http://stackage.org/package/auto/badge/nightly)](http://stackage.org/nightly/package/auto) +[![Build Status](https://travis-ci.org/mstksg/auto.svg?branch=master)](https://travis-ci.org/mstksg/auto) + [![Join the chat at https://gitter.im/mstksg/auto](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mstksg/auto?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ~~~bash @@ -11,7 +16,7 @@ ------------- ~~~haskell --- Let's impliement a PID feedback controller over a black box system. +-- Let's implement a PID feedback controller over a black box system. import Control.Auto import Prelude hiding ((.), id) @@ -25,7 +30,7 @@ -- A PID controller adjusts the input to the black box system until the -- response matches the target. It does this by adjusting the input based on --- the current error, the cumulative sum, and the consecutative differences. +-- the current error, the cumulative sum, and the consecutive differences. -- -- See http://en.wikipedia.org/wiki/PID_controller -- @@ -138,7 +143,7 @@ concepts. Your building blocks are well-defined *ideas*. * **Compositional**: You build your eventually complex program/game out of - small, simple components. These simple components compose with eachother; + small, simple components. These simple components compose with each other; and compositions of components compose as well with other components. Every "layer" of composition is seamless. It's the [scalable program architecture][spa] principle in practice: If you combine an A with an A, diff --git a/auto.cabal b/auto.cabal --- a/auto.cabal +++ b/auto.cabal @@ -1,5 +1,5 @@ name: auto -version: 0.4.3.0 +version: 0.4.3.1 synopsis: Denotative, locally stateful programming DSL & platform description: (Up to date documentation is maintained at ) @@ -40,7 +40,7 @@ repository on github for plenty of real-world and toy examples to learn from; I've also done a - + on this library, with examples and full tutorials! . Support available on freenode's #haskell-auto, @@ -56,11 +56,12 @@ copyright: (c) Justin Le 2015 category: Control homepage: https://github.com/mstksg/auto -bug-reports: https://github.com/mstksg/issues +bug-reports: https://github.com/mstksg/auto/issues build-type: Simple extra-source-files: README.md CHANGELOG.md tutorial/tutorial.md + stack.yaml .gitignore cabal-version: >=1.10 diff --git a/src/Control/Auto/Process/Random.hs b/src/Control/Auto/Process/Random.hs --- a/src/Control/Auto/Process/Random.hs +++ b/src/Control/Auto/Process/Random.hs @@ -131,12 +131,13 @@ import Control.Auto.Interval import Control.Category import Control.Monad (guard) -import Control.Monad.Random +import Control.Monad.Random (MonadRandom(..), RandT, runRandT) import Data.Bits import Data.Orphans () import Data.Serialize import Data.Tuple import Prelude hiding (id, (.), concat, concatMap, sum) +import System.Random (RandomGen(..), Random(..), StdGen) -- | Given a seed-consuming generating function of form @g -> (b, g)@ diff --git a/stack.yaml b/stack.yaml new file mode 100644 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,66 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# http://docs.haskellstack.org/en/stable/yaml_configuration/ + +# Resolver to choose a 'specific' stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# resolver: lts-3.5 +# resolver: nightly-2015-09-21 +# resolver: ghc-7.10.2 +# resolver: ghcjs-0.1.0_ghc-7.10.2 +# resolver: +# name: custom-snapshot +# location: "./custom-snapshot.yaml" +resolver: lts-6.3 + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# - location: +# git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# extra-dep: true +# subdirs: +# - auto-update +# - wai +# +# A package marked 'extra-dep: true' will only be built if demanded by a +# non-dependency (i.e. a user package), and its test suites and benchmarks +# will not be run. This is useful for tweaking upstream packages. +packages: +- '.' +# Dependency packages to be pulled from upstream that are not in the resolver +# (e.g., acme-missiles-0.3) +extra-deps: [] + +# Override default flag values for local packages and extra-deps +flags: {} + +# Extra package databases containing global packages +extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=1.1" +# +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor diff --git a/tutorial/tutorial.md b/tutorial/tutorial.md --- a/tutorial/tutorial.md +++ b/tutorial/tutorial.md @@ -752,7 +752,7 @@ value. ~~~haskell -ghci> interactAuto (onFor 4 . (++ "!!!")) +ghci> interactAuto (onFor 4 . arr (++ "!!!")) > hello hello!!! > how