[ADD] new files

11_DefiningTypes.jl

@@ -0,0 +1,107 @@
+abstract Shape
+
+type Circle <: Shape
+    x::Float64
+    y::Float64
+    radius::Float64
+end
+
+
+type Rectangle <: Shape
+    t1::Tuple
+    t2::Tuple
+    #width::Float64 = abs(t2[1]-t1[1])
+    #height::Float64 = abs(t2[2]-t2[2])
+end
+
+
+type ShapeGroup <: Shape
+    members::Vector{Shape}
+end
+
+"Group shapes into a group, which can be treated as a shape itself"
+function group(shapes::Shape...)
+    ShapeGroup(collect(shapes))
+end
+
+
+"Get position of Circle"
+getposition(c::Circle) = (c.x,c.y)
+
+
+"Get position of Rectangle"
+getposition(r::Rectangle) = r.t2
+
+
+# Inform implementer of Shape subtypes of required functions
+getposition(s::Shape) = error("You must implement for Shape")
+setposition(s::Shape, x, y) = error("You must implement this function for Shape")
+
+"Set absolute position of center of Circle"
+function setposition(c::Circle,x,y) # If you cast the type on the function 
+    c.x = x                         # you can only use that input type
+    c.y = y                         # that is no type inference or conversion will be made
+end
+
+"Set absolute position upper left corner of Rectangle"
+function setposition(r::Rectangle,x::Tuple)
+    r.t2 = x                                           
+    r.t1[1] = r.t1[1] + x[1]
+    r.t1[2] = r.t1[2] + x[2]
+end
+
+"Move Shape by `dx` units along the x-axis and `dy` units across the y-axis"
+function move(s::Shape,dx,dy)
+    x,y = getposition(s)
+    setposition(s,x+dx,y+dy)
+end
+
+"Check if point at `(x,y)` is inside circle"
+function inside(c::Circle,x,y)
+    dx = x - c.x
+    dy = y - c.y
+    hypot(dx,dy) <= c.radius
+end
+
+"Check if point at `(x,y)` is inside rectangle"
+function inside(r::Rectangle,x::Tuple)
+    r.x <= x <= r.r + r.width &&
+    r.y <= y <= r.y + r.height
+end
+
+"Check if point at `(x,y)` is inside one of the shapes in the group"
+function inside(g::ShapeGroup,x,y)
+    for m in g.members
+        if inside(m,x,y)
+            return true
+        end
+    end
+end
+
+"Check if point at `(x,y)` defined as a tuple is inside one of the shapes in the group"
+function inside(g::ShapeGroup,x::Tuple)
+    for m in g.members
+        if inside(m,x)
+            return true
+        end
+    end
+end
+
+# TESTING CODE
+
+#c = Circle(2,3,5)
+
+#println(c)
+
+#println(c.x) # Accessing type objects using the dot notation is not good practice
+#println(c.y) # it is preferable to encapsulate using accessor functions
+#println(c.radius)
+
+#x,y = getposition(c)
+
+#println(x)
+#println(y)
+
+#setposition(c,20.0,30.0)
+
+#println(c)

11_points.jl

@@ -0,0 +1,18 @@
+A = (8,6)
+B = (10,6)
+C = (6,6)
+D = (6,2)
+E = (10,2)
+F = (13,6)
+G = (14,6)
+H = (12,4)
+I = (14,4)
+J = (14,2)
+K = (12,2)
+L = (7,5)
+M = (8,3)
+N = (8,7)
+O = (11,6)
+P = (11,4)
+Q = (13,3)
+R = (14,5)

11_shapes.jl

@@ -0,0 +1,11 @@
+include("./11_DefiningTypes.jl")
+include("./11_points.jl") 
+
+r1 = Rectangle(D,B)
+c1 = Circle(A...,2)
+r2 = Rectangle(K,I)
+c2 = Circle(F...,1)
+
+g1 = group(c1,r1)
+g2 = group(c2,r2)
+allgroup = group(g1,g2)