Better assy solver implementation (#1063)

* Add casadi to the reqs

* Casadi-based assy solver

* Handle root object location

* Update solve_result_check

* Type center and diagonal

* Assy solver refactoring

- scaling
- minimal quat paramterization
- dummy variables

* Remove useless check

* More tweaks

- Different axis cost
- Restructured remaining costs
- Perturbed starting point

* Simplified costs

* Better settings

* Use extrinsic convention

* Raise for single unary constraint

* Add param handling for the point constraint

* Additional tests

* Rework after review

Author: adam-urbanczyk

cadquery/assembly.py

@@ -357,13 +357,16 @@ def solve(self) -> "Assembly":
         ents = {}
 
         i = 0
-        locked = []
+        locked: List[int] = []
+
         for c in self.constraints:
             for name in c.objects:
                 if name not in ents:
                     ents[name] = i
                     i += 1
-                if c.kind == "Fixed" or name == self.name:
+                if (c.kind == "Fixed" or name == self.name) and ents[
+                    name
+                ] not in locked:
                     locked.append(ents[name])
 
         # Lock the first occuring entity if needed.
@@ -402,15 +405,32 @@ def solve(self) -> "Assembly":
         if not constraints:
             raise ValueError("At least one constraint required")
 
+        # check if at least two entities are present
+        if len(ents) < 2:
+            raise ValueError("At least two entities need to be constrained")
+
         # instantiate the solver
-        solver = ConstraintSolver(locs, constraints, locked=locked)
+        scale = self.toCompound().BoundingBox().DiagonalLength
+        solver = ConstraintSolver(locs, constraints, locked=locked, scale=scale)
 
         # solve
         locs_new, self._solve_result = solver.solve()
 
         # update positions
+
+        # find the inverse root loc
+        loc_root_inv = Location()
+
+        if self.obj:
+            for loc_new, n in zip(locs_new, ents):
+                if n == self.name:
+                    loc_root_inv = loc_new.inverse
+                    break
+
+        # update the positions
         for loc_new, n in zip(locs_new, ents):
-            self.objects[n].loc = loc_new
+            if n != self.name:
+                self.objects[n].loc = loc_root_inv * loc_new
 
         return self
 

cadquery/occ_impl/geom.py

@@ -790,6 +790,9 @@ class BoundBox(object):
     zmax: float
     zlen: float
 
+    center: Vector
+    DiagonalLength: float
+
     def __init__(self, bb: Bnd_Box) -> None:
         self.wrapped = bb
         XMin, YMin, ZMin, XMax, YMax, ZMax = bb.Get()