hls 0.14 → 0.15

raw patch · 4 files changed

+46/−13 lines, 4 filesdep ~hcg-minusdep ~hpsPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: hcg-minus, hps

API changes (from Hackage documentation)

Files

• LSystem/LSystem.hs +10/−3
• LSystem/Systems.hs +27/−1
• README +1/−1
• hls.cabal +8/−8

@@ -31,9 +31,16 @@ applyRule :: [Element] -> Rules -> [Element] applyRule a rs = concatMap (getRule rs) a --- | /n/ iterations of the specified 'LSystem'.------ > expand (lSystem "F+F+F" [('F',"F-F+F")]) 1 == "F-F+F+F-F+F+F-F+F"+{- | /n/ iterations of the specified 'LSystem'.++> let f p q n = expand (lSystem p q) n+> f {- algae -} "A" [('A',"AB"),('B',"A")] 5 == "ABAABABAABAAB"+> f "0" [('1',"11"),('0',"1[0]0")] 3 == "1111[11[1[0]0]1[0]0]11[1[0]0]1[0]0"+> f {- cantor -} "A" [('A',"ABA"),('B',"BBB")] 3 == "ABABBBABABBBBBBBBBABABBBABA"+> f {- koch -} "F" [('F',"F+F-F-F+F")] 2 == "F+F-F-F+F+F+F-F-F+F-F+F-F-F+F-F+F-F-F+F+F+F-F-F+F"+> f "F+F+F" [('F',"F-F+F")] 1 == "F-F+F+F-F+F+F-F+F"++-} expand :: LSystem -> Int -> [Element] expand (LSystem a rs) n =     case n of

@@ -2,6 +2,7 @@ -- For 'l0' through 'lB' see <http://paulbourke.net/fractals/lsys/>. -- For 'lC' see <http://en.wikipedia.org/wiki/Penrose_tiling>. -- For 'lD' see <http://hackage.haskell.org/package/nymphaea>.+-- For 'p0' etc. see <http://algorithmicbotany.org/papers/#abop>. module LSystem.Systems where  import Graphics.PS@@ -44,6 +45,30 @@ lD :: LSystem lD = lSystem "F+F+F+F+F+F" [('F',"F-F++F-F")] +p00 = lSystem "F-F-F-F" [('F',"F-F+F+FF-F-F+F")]+p01 = lSystem "F-F-F-F" [('F',"F+FF-FF-F-F+F+FF-F-F+F+FF+FF-F")]+p02 = lSystem "-F" [('F',"F+F-F-F+F")]+p03 = lSystem "F+F+F+F" [('F',"F+f-FF+F+FF+Ff+FF-f+FF-F-FF-Ff-FFF"),('f',"ffffff")]+p04 = lSystem "F-F-F-F" [('F',"FF-F-F-F-F-F+F")]+p05 = lSystem "F-F-F-F" [('F',"FF-F-F-F-FF")]++p00d = (p00,90,1)+p01d = (p01,90,1)+p02d = (p02,90,1)+p03d = (p03,90,1)+p04d = (p04,90,1)+p05d = (p05,90,1)++p00l_a = renderL p00d 0 1+p00l_b = renderL p00d 1 1+p00l_c = renderL p00d 2 1+p00l_d = renderL p00d 3 1+p01l = renderL p01d 2 1+p02l = renderL p02d 4 1+p03l = renderL p03d 2 1+p04l = renderL p04d 4 1+p05l = renderL p05d 4 1+ -- * With turning angle and line scalar  l0d,l1d,l2d,l3d,l4d,l5d,l6d,l7d,l8d,l9d,lAd,lBd,lCd,lDd :: (LSystem,Double,Double)@@ -82,7 +107,8 @@  -- > map (wn_from_extent . l_extent) systems_l systems_l :: [[Ln R]]-systems_l = [l0l,l1l,l2l,l3l,l4l,l5l,l6l,l7l,l8l,l9l,lAl,lBl,lCl,lDl]+systems_l = [l0l,l1l,l2l,l3l,l4l,l5l,l6l,l7l,l8l,l9l,lAl,lBl,lCl,lDl+            ,p00l_a,p00l_b,p00l_c,p00l_d,p01l,p02l,p03l,p04l,p05l]  -- * PS Images 

@@ -8,7 +8,7 @@  [hs]: http://haskell.org -© [rohan drape][rd], 2006-2012, [gpl]+© [rohan drape][rd], 2006-2014, [gpl]  [rd]: http://rd.slavepianos.org/ [gpl]: http://gnu.org/copyleft/

@@ -1,25 +1,25 @@ Name:              hls-Version:           0.14+Version:           0.15 Synopsis:          Haskell Lindenmayer Systems-Description:       Haskell library for generating Lindemayer systems+Description:       Haskell Lindenmayer Systems License:           GPL Category:          Graphics-Copyright:         Rohan Drape, 2006-2013+Copyright:         Rohan Drape, 2006-2014 Author:            Rohan Drape Maintainer:        rd@slavepianos.org Stability:         Experimental-Homepage:          http://rd.slavepianos.org/?t=hls-Tested-With:       GHC == 7.6.1+Homepage:          http://rd.slavepianos.org/t/hls+Tested-With:       GHC == 7.8.2 Build-Type:        Simple Cabal-Version:     >= 1.8  Data-files:        README  Library-  Build-Depends:   base==4.*,+  Build-Depends:   base == 4.*,                    containers,-                   hcg-minus == 0.14.*,-                   hps == 0.14.*+                   hcg-minus == 0.15.*,+                   hps == 0.15.*   GHC-Options:     -Wall -fwarn-tabs   Exposed-modules: LSystem.LSystem                    LSystem.Turtle