small fixes

Author: RaulDurand

src/geo/tools.jl

@@ -12,7 +12,6 @@ function dir(dart::Dart)
 end
 
 
-
 function getedges(s::Face)
     edges = Edge[]
     for loop in s.loops
@@ -47,7 +46,6 @@ function getpoints(s::Face)
 end
 
 
-
 function getpoints(v::Volume)
     points = Set{Point}()
     for spin in v.spins
@@ -59,7 +57,6 @@ function getpoints(v::Volume)
 end
 
 
-
 function is_neighbor(surf1::Face, surf2::Face)
     for dart in surf1.loops[1].darts
         for s in dart.edge.faces
@@ -71,7 +68,6 @@ end
 
 
 
-
 function in_segment(X, X1, X2)
     tol = 1e-6
     X1X = X-X1
@@ -115,21 +111,6 @@ function point_in_edge(p::Point, l::Edge)
 end
 
 
-function coplanar(face::Face, points::Vector{Point})
-    face.flat || return false
-    tol = 1e-6 # reduced tolerance 
-
-    normal = getnormal(face.loops[1])
-    p1 = face.loops[1].darts[1].points[1]
-
-    for p in points # check if every point is in the plane
-        abs(dot(p.coord - p1.coord, normal)) > tol && return false
-    end
-
-    return true
-end
-
-
 function split_edge(geo::GeoModel, edge::Edge, point::Point)
 
     p1 = edge.points[1]
@@ -180,9 +161,6 @@ function split_edge(geo::GeoModel, edge::Edge, point::Point)
 end
 
 
-
-
-
 function intersection(l1::Edge, l2::Edge)
     # Assumes:
     # L1: P = P1 +V1*t
@@ -236,9 +214,6 @@ function parallel(dart1::Dart, dart2::Dart)
 end
 
 
-
-
-
 function colinear(points::Vector{Point})
     length(points)<2 && return true
     tol = 1e-6
@@ -260,6 +235,7 @@ function colinear(points::Vector{Point})
 end
 
 
+# Get a directed normal vector even if the loop is not flat
 function getnormal(loop::Loop)
     C = getcoords(loop.points)
 
@@ -295,6 +271,21 @@ function getnormal(loop::Loop)
 end
 
 
+function coplanar(face::Face, points::Vector{Point})
+    face.flat || return false
+    tol = 1e-6 # reduced tolerance 
+
+    normal = getnormal(face.loops[1])
+    p1 = face.loops[1].darts[1].points[1]
+
+    for p in points # check if every point is in the plane
+        abs(dot(p.coord - p1.coord, normal)) > tol && return false
+    end
+
+    return true
+end
+
+
 function coplanar(points::Vector{Point})
     n = length(points)
     n<=3 && return true

src/tools/table.jl

@@ -75,8 +75,15 @@ function Base.size(table::DataTable)
 end
 
 
-function Base.getproperty(table::DataTable, sym::Symbol)
-    return getindex(table, sym)
+function Base.getproperty(table::DataTable, name::Symbol)
+    key   = string(name)
+    colidx = getcolidx(table)
+    if haskey(colidx, key)
+        idx  = colidx[key]
+        return getindex(table, key)
+    end
+
+    return getfield(table, name)
 end
 
 

test/runtests.jl

@@ -16,9 +16,9 @@ let
             "tools/runtests.jl",
             "mech/runtests.jl",
             "dynamic/runtests.jl",
-            "hydromech/runtests.jl",
             "thermomech/runtests.jl",
-            "acoustic-mech/runtests.jl"
+            "acoustic-mech/runtests.jl",
+            "hydromech/runtests.jl",
         ]
     end
 end