WIP: Initial design v2

Project.toml

@@ -11,12 +11,13 @@ Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 Meshes = "eacbb407-ea5a-433e-ab97-5258b1ca43fa"
 PrettyTables = "08abe8d2-0d0c-5749-adfa-8a2ac140af0d"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
+Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Rotations = "6038ab10-8711-5258-84ad-4b1120ba62dc"
 
 [compat]
 DataFrames = "1"
 JuMP = "1.4"
-Meshes = "0.35,0.36"
+Meshes = "0.39,0.40"
 PrettyTables = "2"
 Rotations = "1.5"
 julia = "1.9"

docs/src/example.md

@@ -122,19 +122,19 @@ Note that a plane normal is given, that is only used later when visualizing the
 ## Rough geometry definitions
 
 fronthole_r = SimpleHole([82.5, 30, 40], 26)
-frontface_r = PlaneAndNormal([82.5, 30, 40], [1, 0, 0])
+frontface_r = SimplePlane([82.5, 30, 40], [1, 0, 0])
 
 righthole1_r = SimpleHole([66, 71.5, 55], 6)
 righthole2_r = SimpleHole([58, 74.5, 24], 4.905)
 righthole3_r = SimpleHole([21.5, 68.5, 40], 8)
-rightface1_r = PlaneAndNormal([66, 71.5, 55], [0, 1, 0])
-rightface2_r = PlaneAndNormal([58, 74.5, 24], [0, 1, 0])
-rightface3_r = PlaneAndNormal([21.5, 68.5, 40], [0, 1, 0])
+rightface1_r = SimplePlane([66, 71.5, 55], [0, 1, 0])
+rightface2_r = SimplePlane([58, 74.5, 24], [0, 1, 0])
+rightface3_r = SimplePlane([21.5, 68.5, 40], [0, 1, 0])
 
 backhole1_r = SimpleHole([-3, 44, 53.9], 6.2)
 backhole2_r = SimpleHole([-3, 16.1, 54], 6.25)
-backface1_r = PlaneAndNormal([-3, 44, 54], [-1, 0, 0])
-backface2_r = PlaneAndNormal([-3, 16, 54], [-1, 0, 0])
+backface1_r = SimplePlane([-3, 44, 54], [-1, 0, 0])
+backface2_r = SimplePlane([-3, 16, 54], [-1, 0, 0])
 ```
 
 ## Pairing the rough and machined features

examples/example.jl

@@ -30,19 +30,19 @@ backface2_m = SimplePlane([14, 14, 0])
 ## Rough geometry definitions
 
 fronthole_r = SimpleHole([82.5, 30, 40], 26)
-frontface_r = PlaneAndNormal([82.5, 30, 40], [1, 0, 0])
+frontface_r = SimplePlane([82.5, 30, 40], [1, 0, 0])
 
 righthole1_r = SimpleHole([66, 71.5, 55], 6)
 righthole2_r = SimpleHole([58, 74.5, 24], 4.905)
 righthole3_r = SimpleHole([21.5, 68.5, 40], 8)
-rightface1_r = PlaneAndNormal([66, 71.5, 55], [0, 1, 0])
-rightface2_r = PlaneAndNormal([58, 74.5, 24], [0, 1, 0])
-rightface3_r = PlaneAndNormal([21.5, 68.5, 40], [0, 1, 0])
+rightface1_r = SimplePlane([66, 71.5, 55], [0, 1, 0])
+rightface2_r = SimplePlane([58, 74.5, 24], [0, 1, 0])
+rightface3_r = SimplePlane([21.5, 68.5, 40], [0, 1, 0])
 
 backhole1_r = SimpleHole([-3, 44, 53.9], 6.2)
 backhole2_r = SimpleHole([-3, 16.1, 54], 6.25)
-backface1_r = PlaneAndNormal([-3, 44, 54], [-1, 0, 0])
-backface2_r = PlaneAndNormal([-3, 16, 54], [-1, 0, 0])
+backface1_r = SimplePlane([-3, 44, 54], [-1, 0, 0])
+backface2_r = SimplePlane([-3, 16, 54], [-1, 0, 0])
 
 ## Geometry pairing and feature descriptors
 

src/BlankLocalizationCore.jl

@@ -4,40 +4,40 @@ using JuMP
 using DataFrames: DataFrame, names, nrow
 using PrettyTables: pretty_table, ft_nonothing, tf_html_minimalist
 using Rotations: RotMatrix
+import Meshes
 using Meshes: SimpleMesh, vertices, boundingbox, connect, Point3, Vec3, Plane, Cylinder,
-    Rotate, Translate, Disk
+    Rotate, Translate, Disk, top, radius, normal, boundingbox
 using Logging: @warn
-using LinearAlgebra: norm, cross, normalize, normalize!
+using Statistics: mean
+using LinearAlgebra: norm, dot, cross, inv, normalize, normalize!
 using Printf: @sprintf
 
 export  PartZero,
         printpartzeropositions
 
-export  AbstractHoleGeometry,
-        AbstractPlaneGeometry,
-        GeometryStyle,
-        IsPrimitive,
-        IsFreeForm,
-        surfacepoints,
-        filteredsurfacepoints,
-        featurepoint,
-        featureradius,
-        visualizationgeometry,
+export  RepresentationStyle,
+        FeatureStyle,
+        AbstractLocalizationGeometry,
         SimpleHole,
-        SimplePlane,
-        PlaneAndNormal,
         MeshHole,
+        SimplePlane,
         MeshPlane,
-        FeatureDescriptor,
-        LocalizationFeature,
-        HoleLocalizationFeature,
-        PlaneLocalizationFeature,
-        localizationfeature,
-        OptimizationResult,
-        Tolerance,
+        featurepoint,
+        surfacepoints,
+        filteredsurfacepoints,
+        featureradius,
+        RoughFeature,
+        MachinedFeature,
+        LocalizationFeature
+
+export  PositionTolerance,
+        ConcentrictyTolerance,
+        ProjectedDimensionTolerance,
+        addtolerance2model!
+
+export  OptimizationResult,
         MultiOperationProblem,
-        setparameters!,
-        isoptimum
+        setparameters!
 
 export  createjumpmodel,
         setjumpresult!,
@@ -66,8 +66,10 @@ HV(v) = vcat(v, 1)
 
 include("partzeros.jl")
 include("geometries.jl")
+include("tolerances.jl")
+include("optimizationproblem.jl")
 include("optimization.jl")
-include("resultevaluation.jl")
+#include("resultevaluation.jl")
 include("visualization.jl")
 
 end