Multi-Robot Trajectory Generation via Consensus ADMM: Convex vs. Non-Convex