From faf055c8580fe4eb2345919c1a622d865115913f Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Sun, 8 Nov 2009 00:19:53 +0000
Subject: [PATCH] added circle and star-polygon

svn: r16617
---
 collects/2htdp/image.ss                       |   2 +
 collects/2htdp/private/image-more.ss          |  35 ++++++++---
 collects/mrlib/image-core.ss                  |   9 ++-
 .../teachpack/2htdp/scribblings/image.scrbl   |  57 ++++++++++++++----
 .../img/_circle_20__solid___blue__.png        | Bin 0 -> 661 bytes
 .../img/_circle_30__outline___red__.png       | Bin 0 -> 1542 bytes
 ...ygon_20_10_3__solid___cornflowerblue__.png | Bin 0 -> 1559 bytes
 ...tar-polygon_40_5_2__solid___seagreen__.png | Bin 0 -> 1615 bytes
 ...ar-polygon_40_7_3__outline___darkred__.png | Bin 0 -> 4423 bytes
 .../img/_star_40__solid___gray__.png          | Bin 1517 -> 1264 bytes
 collects/tests/2htdp/test-image.ss            |  14 ++++-
 11 files changed, 93 insertions(+), 24 deletions(-)
 create mode 100644 collects/teachpack/2htdp/scribblings/img/_circle_20__solid___blue__.png
 create mode 100644 collects/teachpack/2htdp/scribblings/img/_circle_30__outline___red__.png
 create mode 100644 collects/teachpack/2htdp/scribblings/img/_star-polygon_20_10_3__solid___cornflowerblue__.png
 create mode 100644 collects/teachpack/2htdp/scribblings/img/_star-polygon_40_5_2__solid___seagreen__.png
 create mode 100644 collects/teachpack/2htdp/scribblings/img/_star-polygon_40_7_3__outline___darkred__.png

diff --git a/collects/2htdp/image.ss b/collects/2htdp/image.ss
index 3e1fe09bfc..b3390d3b06 100644
--- a/collects/2htdp/image.ss
+++ b/collects/2htdp/image.ss
@@ -64,10 +64,12 @@ and they all have good sample contracts. (It is amazing what we can do with kids
          scale
          scale/xy
          
+         circle
          ellipse
          rectangle
          regular-polygon
          star
+         star-polygon
          triangle
          
          x-place?
diff --git a/collects/2htdp/private/image-more.ss b/collects/2htdp/private/image-more.ss
index 58ce429211..9a38042193 100644
--- a/collects/2htdp/private/image-more.ss
+++ b/collects/2htdp/private/image-more.ss
@@ -18,9 +18,6 @@
          
          frame
          
-         ellipse
-         rectangle
-         
          show-image
          save-image
          bring-between
@@ -40,9 +37,14 @@
          image-width
          image-height
          
+         circle
+         ellipse
+         rectangle
+         
          regular-polygon
          triangle 
          star
+         star-polygon
          
          swizzle)
 
@@ -190,7 +192,7 @@
      (if (string? arg)
          (string->symbol arg)
          arg)]
-    [(width height)
+    [(width height radius)
      (check-arg fn-name
                 (and (real? arg)
                      (not (negative? arg)))
@@ -621,11 +623,7 @@
         (make-point 0 height)))
   
 
-;;       circle
-;;       ellipse
-;;       triangle
 ;;       line
-;;       star
 ;;       text
 
 (define/chk (triangle side-length mode color)
@@ -635,6 +633,16 @@
   (make-polygon/star side-length side-count mode color values))
 
 (define/chk (star-polygon side-length side-count step-count mode color)
+  (check-arg 'star-polygon
+             (step-count . < . side-count)
+             (format "number that is smaller than the side-count (~a)" side-count)
+             3
+             step-count)
+  (check-arg 'star-polygon
+             (= 1 (gcd side-count step-count))
+             (format "number that is relatively prime to the side-count (~a)" side-count)
+             3
+             step-count)
   (make-polygon/star side-length side-count mode color (λ (l) (swizzle l step-count))))
 
 (define/chk (star side-length mode color)
@@ -650,6 +658,11 @@
                   (make-bb (- r l) (- b t) (- b t))
                   #f))))
 
+(define (gcd a b)
+  (cond
+    [(zero? b) a]
+    [else (gcd b (modulo a b))]))
+
 ;; swizzle : (listof X)[odd-length] -> (listof X)
 ;; returns a list with the same elements, 
 ;; but reordered according to the step. Eg, if the step
@@ -682,6 +695,12 @@
               (make-bb width height height)
               #f))
 
+(define/chk (circle radius mode color)
+  (let ([w/h (* 2 radius)])
+    (make-image (make-ellipse w/h w/h 0 mode color)
+                (make-bb w/h w/h w/h)
+                #f)))
+
 (define (mode-color->pen mode color)
   (send the-pen-list find-or-create-pen color 1 
         (case mode
diff --git a/collects/mrlib/image-core.ss b/collects/mrlib/image-core.ss
index 20bbcedb4b..e5b1ce6d40 100644
--- a/collects/mrlib/image-core.ss
+++ b/collects/mrlib/image-core.ss
@@ -151,8 +151,11 @@ has been moved out).
                   (null? p2-points))
              (and (not (or (null? p1-points)
                            (null? p2-points)))
-                  (eq-recur (rotate-to-zero (closest-to-zero p1-points) p1-points)
-                            (rotate-to-zero (closest-to-zero p2-points) p2-points)))))))
+                  (or (eq-recur (rotate-to-zero (closest-to-zero p1-points) p1-points)
+                                (rotate-to-zero (closest-to-zero p2-points) p2-points))
+                      (let ([p1-rev (reverse p1-points)])
+                        (eq-recur (rotate-to-zero (closest-to-zero p1-rev) p1-rev)
+                                  (rotate-to-zero (closest-to-zero p2-points) p2-points)))))))))
 
 (define (rotate-to-zero zero-p points)
   (let loop ([points points]
@@ -412,7 +415,7 @@ has been moved out).
        (send path line-to (point-x (car points)) (point-y (car points)))
        (send dc set-pen (mode-color->pen (polygon-mode simple-shape) (polygon-color simple-shape)))
        (send dc set-brush (mode-color->brush (polygon-mode simple-shape) (polygon-color simple-shape)))
-       (send dc draw-path path dx dy))]
+       (send dc draw-path path dx dy 'winding))]
     [else
      (let ([dx (+ dx (translate-dx simple-shape))]
            [dy (+ dy (translate-dy simple-shape))]
diff --git a/collects/teachpack/2htdp/scribblings/image.scrbl b/collects/teachpack/2htdp/scribblings/image.scrbl
index 146adca8bc..55a7e0107c 100644
--- a/collects/teachpack/2htdp/scribblings/image.scrbl
+++ b/collects/teachpack/2htdp/scribblings/image.scrbl
@@ -23,7 +23,19 @@ Existing images can be rotated, scaled, and overlaid on top of each other.
 
 @section{Basic Images}
 
-@defproc[(ellipse [width real?] [height real?] [mode mode?] [color (or/c symbol? string?)]) image?]{
+@defproc[(circle [radius (and/c real? positive?)] 
+                 [mode mode?]
+                 [color (or/c symbol? string?)])
+         image?]{
+  Constructs a circle with the given radius, height, mode, and color.
+  
+  @image-examples[(circle 30 "outline" "red")
+                  (circle 20 "solid" "blue")]
+  
+}
+
+
+@defproc[(ellipse [width (and/c real? positive?)] [height (and/c real? positive?)] [mode mode?] [color (or/c symbol? string?)]) image?]{
   Constructs an ellipsis with the given width, height, mode, and color.
   
   @image-examples[(ellipse 40 20 "outline" "black")
@@ -49,17 +61,6 @@ Existing images can be rotated, scaled, and overlaid on top of each other.
                   (regular-polygon 20 6 "solid" "red")]
 }
 
-@defproc[(star [side-length (and/c positive? real?)] 
-               [mode mode?]
-               [color (or/c symbol? string?)])
-         image?]{
-  Constructs a star with five points. The @scheme[side-length] argument 
-  determines the side length of the enclosing pentagon.
-
-  @image-examples[(star 40 "solid" "gray")]
-  
-}
-
 @defproc[(triangle [side-length (and/c positive? real?)] 
                    [mode mode?]
                    [color (or/c symbol? string?)])
@@ -72,6 +73,38 @@ Existing images can be rotated, scaled, and overlaid on top of each other.
 @image-examples[(triangle 40 "solid" "tan")]
 }
 
+@defproc[(star [side-length (and/c real? positive?)] 
+               [mode mode?]
+               [color (or/c symbol? string?)])
+         image?]{
+  Constructs a star with five points. The @scheme[side-length] argument 
+  determines the side length of the enclosing pentagon.
+
+  @image-examples[(star 40 "solid" "gray")]
+  
+}
+
+@defproc[(star-polygon [side-length (and/c real? positive?)]
+                       [side-count side-count?]
+                       [step-count step-count?]
+                       [mode mode?]
+                       [color (or/c symbol? string?)])
+         image?]{
+ 
+  Constructs an arbitrary regular star polygon (a generalization of the regular polygons). 
+  The polygon is enclosed by a regular polygon with @scheme[side-count] sides each
+  @scheme[side-length] long. The polygon is actually constructed by going from vertex to
+  vertex around the regular polgon, but skipping over every @scheme[step-count] verticies.
+  
+  For examples, if @scheme[side-count] is @scheme[5] and @scheme[step-count] is @scheme[2],
+  then this function produces a shape just like @scheme[star].
+  
+  @image-examples[(star-polygon 40 5 2 "solid" "seagreen")
+                  (star-polygon 40 7 3 "outline" "darkred")
+                  (star-polygon 20 10 3 "solid" "cornflowerblue")]
+ 
+}
+                
 @section{Overlaying Images}
 
 @defproc[(overlay [i1 image?] [i2 image?] [is image?] ...) image?]{
diff --git a/collects/teachpack/2htdp/scribblings/img/_circle_20__solid___blue__.png b/collects/teachpack/2htdp/scribblings/img/_circle_20__solid___blue__.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d9a9a112c6c69d14e1dade9bbbca52c651c63a9
GIT binary patch
literal 661
zcmV;G0&4w<P)<h;3K|Lk000e1NJLTq001cf001cn0ssI2CjytD00079Nkl<Zc$~%9
zKTGpa7zOatt44(`T2RDVEOhZ7Qb9j}QV>+AqTO{82i;t&_yt6Cw4j0?z`?<-iXbAk
zlT*PVNNGhV7^;;d=N<Y|+FIL0lk{+gO!r4Z$bD{HBw;w&ERspcGBO#cDo6+cNkV@=
z0s%}+K$46v2GBrmZn(Kgzn?(8wzo4B;_)%x-;J!wdbY0f{G8+C4ao29?q)PfMft6r
zOmb?<v|3)Tmlqf2?frd9(x2c`x3;LN#%xvP`nol0sS69t=Ns9&&b2j*;bLcJ`Sn%T
zjz(>Pi(Os)*}l4>5H{KXW3gIxKF`5HdtrcXH)Z*oy|-sOT<pq9rL8FRcpS0;CK6?K
zEan^xFcK-VLm@|PN#g4(Nup3-M~9;}z@sCQ6pxSi{4}%iS&_?201&B^(=dQ|9J&ti
z^3nubQIJYO6benS0X#iHm>HR@OgatWay7@!<se#Hn`3)C5WT(4vAtf1fq~}O!61;y
zIQ>xr=<|`J=;?vq@AOU2&jWxcT{)RZ1OPzt`r6S4J~UK0w~UQBXP=x@+NY-u!K0(p
zv`Smk7!2AD3&GplS~K$99a~!LwYRr_n9oV>?AQoTPgftzs?S7AOSZtlAaglZrTQ$G
z&vRzRVt8`$|8UsACi(HfaM&_<aq-8W0JYEGy3XC*zrK2%ojf?Gt=6-PxxfF-507HQ
zVLm_CgB#c+HH~Ly92qf6wzYA2nGX*QR6}+t@i;d&==0Sk-EPj!@$it@tikn2(nXWQ
vVmggP0<w&^H*|HOuMfk+2m~O6>D}xfbY(*%!nOP(00000NkvXXu0mjfuBALY

literal 0
HcmV?d00001

diff --git a/collects/teachpack/2htdp/scribblings/img/_circle_30__outline___red__.png b/collects/teachpack/2htdp/scribblings/img/_circle_30__outline___red__.png
new file mode 100644
index 0000000000000000000000000000000000000000..0dd50084e16436991abdf220af1292bbe8063ea2
GIT binary patch
literal 1542
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

literal 0
HcmV?d00001

diff --git a/collects/teachpack/2htdp/scribblings/img/_star-polygon_20_10_3__solid___cornflowerblue__.png b/collects/teachpack/2htdp/scribblings/img/_star-polygon_20_10_3__solid___cornflowerblue__.png
new file mode 100644
index 0000000000000000000000000000000000000000..f7a36ef71638feffe1f4402f752d20e948c87bec
GIT binary patch
literal 1559
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
JPDHLkV1lAk-;MwP

literal 0
HcmV?d00001

diff --git a/collects/teachpack/2htdp/scribblings/img/_star-polygon_40_5_2__solid___seagreen__.png b/collects/teachpack/2htdp/scribblings/img/_star-polygon_40_5_2__solid___seagreen__.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef08dc0821ddfc0a351383b0c599c893db61e77b
GIT binary patch
literal 1615
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
N002ovPDHLkV1oS49LWFx

literal 0
HcmV?d00001

diff --git a/collects/teachpack/2htdp/scribblings/img/_star-polygon_40_7_3__outline___darkred__.png b/collects/teachpack/2htdp/scribblings/img/_star-polygon_40_7_3__outline___darkred__.png
new file mode 100644
index 0000000000000000000000000000000000000000..192971e0467e520fd023a6091420cab65d98e95e
GIT binary patch
literal 4423
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
N002ovPDHLkV1kcTY@h%D

literal 0
HcmV?d00001

diff --git a/collects/teachpack/2htdp/scribblings/img/_star_40__solid___gray__.png b/collects/teachpack/2htdp/scribblings/img/_star_40__solid___gray__.png
index ccecddf5d7af15c775c3f3fe83f0da87e4f7c139..1e0951d5c7e879ea1ddbf3cface8ffbabee6b8bc 100644
GIT binary patch
delta 1245
zcmV<31S0$G3-Ae$BYy<9Nkl<Zc%03eX>Y1b7=|A}DlT=2OXHH(My(dwMx*$l|Nk#Q
z7u%#wni_XeK?RiafyCDrl@7@Coco(FGxuEZ%=RE*7zW^!rfD=yW3>PP61PFS-NtPJ
zxG@w(>2|xz<r1q4;Ku0ndH~Sx_p!PFZVVG(Fc@HU0jwB{#eZTxp96p-Nt&kNGXks_
zW<&viVHmjM3M0mD*Kx-cE{x@JIh)P4KgZ+odcDTv1^6(w5oKz#*$jt6OkRKwV}CGU
z9UfRPR;$%+M41|mMw`tBhaF(T==FO0TQyzR$Kx>$JHUi-EPn9CmG>B`s!pfVgSYUF
za_=$v{r<7dzkjN#lgY$$N5Fw$nQAS<v<`ZVp=p{VNj3#A4G)hoY$D2(Wp(#T9%I-?
zlqno><t2u$>-G_43P)UdiP7)(QPyc$mKTeKhrZxBhUX;_<<m5+)9C;JfgqA3kKNjA
zHt2he!C-KCdFderVHk!aNuntJLjK}ESAt*|#?fOsSbsQ|%b7_q!kiy<U4MRl{)H5V
zS7I23W!Y#nYW^g4r}^*i@3*%%tj9D@luD(l)vC|u+g>3otCgZCf*_a~jek%SMU_gW
zY&L7TZp8qA&1Uod{{Hp#^;>;IRX7~xI4&3r?%z6qVQM%WK0Q6*&M%=WpU)SIMUp(c
zLL9{a0Do0gMN!0eWJ459)3>*`iA2Jtj2(ul&(F_~j}LsuXnV!uah7Gz&d%(M{fq$s
z)9F+cMbCE-_998LP$*noU7-|4!T^Bvdj0b9((QIn>l>;9fdI?0kw^rwJSv8%PN&mu
zw{b5l7Z(?mN`;~*^eWCU0AR6L2!ep)=mP*0MSqpc<xD2yw4!4S05A;0Tv)vQZg_rv
z&T(8I5O7h~4Th=FXe0=NuIuiq|F07SVJ-^<LAYzd_j8dWipS%w>spk_WJ;ydDJ{4^
zHjT$)PhJH8oSwXLkAadsK$M~=ilUs-f=dj;FuYB0oOsl6i7}Z>yxlea9Sjd6%G7K&
zTYs%quB*Gmz>zXL<%PJxm`o<Bs=Bs3rc)k`8w^K}?btzQU#E;Wycmf@;_>mZTrQ))
z7>42cJC0)vNs>^;B1w|va{1xmfu`wvKHq3G4xXVcay>j8W1u(%gTY3lk<aJ1SHj^i
z&+|WSU0weRz<Z2LCd2c5I2^V*kz}=6<$pMCH@{@jdc7WvMozl~PBEs_sZEa5=kswK
zSFKiUMnXEB=6Qab?c0~TxN?SJ;}MNUd7e+F(?2%CFigE(FBA#~x8=j((8bxo8OFiI
zn;?inp-`{a8HPb@haiaS>+4#r=J)$8x7_^;zyZc=HrtOVzu#Z0)vm9vU7UDgv42>r
z)k-Flmg_F!$^piH>&axY)oR6JF{iFu`Fy_n`}>=lo81J0i{;$G>2EipD2gf;i@99R
zsoz26a=BP6CJ2Ho%K)INsw7D^)4;w^-^P4C-=^C_p-`jI@QPvEX0zGcrpleZ5LAq9
zL}jztX0sUzg&f%+b%i7=mCD`S9ac@#PKO6-Q1yB}nx-q2N-C9d-a`jUrBabdL=;6?
zmeC&;Qi4a8<=59&mSy+nM|@hXR_Jy}7>-)}D{`N1`=|5=*c?zV^n15w00000NkvXX
Hu0mjf;kRdh

delta 1500
zcmV<21ta?K3GEAzBYy?7Nkl<Zc%02zSx>@B7@cki3S|=&a2KTkH4rTS|Gf!`528_{
zaf<><DOi>knENn>+q6)oL+9q6H#+T{IWy<$H}g>jLI`NWG)+Mes8Rp`SlR>+4-d2{
z0Bsrle!tOZ42MIiEP%F*X0r(ZXti2YSpaPrNWk~^H&qruRe#1{F!=rb1psK8W|}5F
zB0yCJaufgnLP*<J6lGY4PTN<sWDJMHUavR%sjBK^GNHr;=*gHl3Sl~({`~w<;sW$!
zID>&|cu<is8jY-uLTI<!)9I839iSwm*=#zuYUA-(RaF{vfRc<w{-Nh9|7944(d~BU
zHqnc6|7EmVt$#(Ef5R|3osRE}fQAg)tJVfedC+GWrfF)L=5hn2@bFoNi=z;1+1)Sr
zEW_PV2sC`<r;PD<?CvN88ou&VMyu7r$<w;74+aAtd4caTe7_SDylI-BpPv8#1_Lb1
zE^2}h>bf2X1fT;>*6;7{{r!C(WiSvzP1EZ2`ik|7bbmT6Nz&XVr!WX%y<RsA1Am(4
z&S^HAMMW?k01%BvWm&$vyIW<gQ>oOVCd6vH7!HTu-`|Ppg27;+P?#0+{$hjY`SbJh
zd_K={96_f%&nFTIPmgSFZW0h7q*5tamZQ<=zXPx~XEK>sEOv8qgDM)H#^juDcf?{b
zK@hxFOn*3z%jI&JOvZNI{-#=AU$0auySuxddUtWuA}|b-OeQ@&5)Oy2uCAOKz}y!u
z%d)4Zr<a$Pm?dNaM<I9;zq`9zsZ`e2*XOn_%p1vMvRbXi<ME{g$z+mcN%Bu3k-!N>
zK@cu4FHcWTU0B@c1A#!PR60IBb{{2yqyD&Ac7N$I#^dp7wYt=P%V+W6;GkSCheDyb
ztsKXBwYU{7Q^2z9@$qq~R0;$FOZ&kxgD8r!EN^dbJDZ3d<^Fgm6e^d?2L}h3{osy(
z<G4bhAW4$V&BTsE;CVh4i`g!2Z*R-8EQ%t2Ki(!XoleWL9En8!9%k899ED)bgB-_6
zl7Cbv6uf3(&wdDnLX}EoZ*LF1_{p-q6{%DTrOrqsBFl0*ohImnUw(@N48!DdxkMu2
zOLaLA2#BI6isH%1iPx>b4CK)nkH?>$o>ngenx?t4vy;o^h&6y!WT>jz@At2-ub-Zt
zi2s#VRaH@xx3@RqVIYv03ISCQAcQY3FMq147K_DTFo^#+gz)+K`StY`O+mlkU$oJ{
z0pV&u2(1N<Znvu_N~6)he0(?@)@rqvmzUWxu6V2^l+o#QY<ukScwDd7Z*Omx#(ksF
zP!z>h=Uq_-p{W+tqrSerG)*fOi?iHf#bh$MzrX+b`f@h)dcDzTw6?ZJHXg#&aDOS8
z4F-c+t>%o{UazMp%3KWyt1JkKj83Ox7>3IY)9Li_@$vfldUo5}+gq(xb1zS=QcWZ=
z73Q?H+igWr^7;J7$49%}UV1-@H?q%tNLB-X^&^o;G#bU+1w#ml|HttxL({a;Xtcav
z%SqV%{AmSoczBk9!{n?>gu`K+ZGRu}R{;LYK%4n+IBaKPSxJ(L#Ujry49Ll3f)hnf
zc$3lXc3o<uJkJ-4MM;ueB4KN5%T_6~fy`IlWVmpk3hLI@*3wRb!C<*uK0G{}yQTg4
z`61Y7dXq6Xc{2=icz9SYm+`lT48t599hFKYXWAzF3c!PmUa#kL)Y{rwsee>DIyxda
zEyQB6YPISt<`VeIgA8Zyo12@}YSmd2zz5Is7Z(?2XJ^*KFhM%^kj1Tz;yCW)<RqKT
zdgYsoY&MHZ;JU5@01U&>G|lBT-~{e!{QmyVc0?N+8<k4MFAcLktz~Af3xX?S=BP|2
zb9HsKv9aNa25TrRo6qOZ&sEO_LGT(LxTb10n}Q(Z^Z6C)YfF(zr9@Gz*Xz2j<4+cY
z^ODwe{r>*GP$&=|YY5=!6on;Ym2=sD11uT;fBXZ#Y?%gXFQc3Q0000<MNUMnLSTYF
C1>ouc

diff --git a/collects/tests/2htdp/test-image.ss b/collects/tests/2htdp/test-image.ss
index 292f045db1..b651402514 100644
--- a/collects/tests/2htdp/test-image.ss
+++ b/collects/tests/2htdp/test-image.ss
@@ -68,6 +68,17 @@
           (map loop (cdr (vector->list (struct->vector x))))))]
       [else x])))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;
+;; circle vs ellipse
+;;
+
+(check-equal? (ellipse 40 40 'outline 'black)
+              (circle 20 'outline 'black))
+(check-equal? (ellipse 60 60 'solid 'red)
+              (circle 30 'solid 'red))
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; width and height
@@ -536,8 +547,9 @@
 ;;  regular polygon
 ;;
 
+;; note: the regular-polygon and the rectangle generate the points in reverse directions.
 (check-equal? (round-numbers (regular-polygon 100 4 'outline 'green))
               (round-numbers (rectangle 100 100 'outline 'green)))
 
-(check-equal? (swizzle (list 0 1 2 3 4))
+(check-equal? (swizzle (list 0 1 2 3 4) 2)
               (list 0 2 4 1 3))