openscvx 0.3.1.dev4__tar.gz → 0.3.1.dev12__tar.gz

{openscvx-0.3.1.dev4/openscvx.egg-info → openscvx-0.3.1.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openscvx
-Version: 0.3.1.dev4
+Version: 0.3.1.dev12
 Summary: A general Python-based successive convexification implementation which uses a JAX backend.
 Author-email: Chris Hayner and Griffin Norris <haynec@uw.edu>
 License: Apache Software License

{openscvx-0.3.1.dev4 → openscvx-0.3.1.dev12}/openscvx/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.3.1.dev4'
-__version_tuple__ = version_tuple = (0, 3, 1, 'dev4')
+__version__ = version = '0.3.1.dev12'
+__version_tuple__ = version_tuple = (0, 3, 1, 'dev12')
 
-__commit_id__ = commit_id = 'gfe2df476c'
+__commit_id__ = commit_id = 'g9a182ff5a'

{openscvx-0.3.1.dev4 → openscvx-0.3.1.dev12}/openscvx/algorithms/optimization_results.py

@@ -66,6 +66,8 @@ class OptimizationResults:
     J_tr_history: list[np.ndarray] = field(default_factory=list)
     J_vb_history: list[np.ndarray] = field(default_factory=list)
     J_vc_history: list[np.ndarray] = field(default_factory=list)
+    TR_history: list[np.ndarray] = field(default_factory=list)
+    VC_history: list[np.ndarray] = field(default_factory=list)
 
     @property
     def x(self) -> np.ndarray:

{openscvx-0.3.1.dev4 → openscvx-0.3.1.dev12}/openscvx/algorithms/ptr.py

@@ -101,6 +101,8 @@ def format_result(problem, state: "SolverState", converged: bool) -> Optimizatio
         J_tr_history=state.J_tr,
         J_vb_history=state.J_vb,
         J_vc_history=state.J_vc,
+        TR_history=state.TR_history,
+        VC_history=state.VC_history,
     )
 
 
@@ -142,6 +144,8 @@ def PTR_step(
         V_multi_shoot,
         subprop_time,
         dis_time,
+        vc_mat,
+        tr_mat,
     ) = PTR_subproblem(
         params.items(),
         cpg_solve,
@@ -157,6 +161,8 @@ def PTR_step(
     state.V_history.append(V_multi_shoot)
     state.X.append(x_sol)
     state.U.append(u_sol)
+    state.VC_history.append(vc_mat)
+    state.TR_history.append(tr_mat)
 
     state.J_tr = np.sum(np.array(J_tr_vec))
     state.J_vb = np.sum(np.array(J_vb_vec))
@@ -300,14 +306,10 @@ def PTR_subproblem(
     )
 
     # Calculate J_tr_vec using the JAX-compatible block diagonal matrix
-    J_tr_vec = (
-        la.norm(
-            inv_block_diag @ np.hstack((x_new_guess - state.x, u_new_guess - state.u)).T,
-            axis=0,
-        )
-        ** 2
-    )
-    J_vc_vec = np.sum(np.abs(prob.var_dict["nu"].value), axis=1)
+    tr_mat = inv_block_diag @ np.hstack((x_new_guess - state.x, u_new_guess - state.u)).T
+    J_tr_vec = la.norm(tr_mat, axis=0) ** 2
+    vc_mat = np.abs(prob.var_dict["nu"].value)
+    J_vc_vec = np.sum(vc_mat, axis=1)
 
     id_ncvx = 0
     J_vb_vec = 0
@@ -336,4 +338,6 @@ def PTR_subproblem(
         V_multi_shoot,
         subprop_time,
         dis_time,
+        vc_mat,
+        abs(tr_mat),
     )

{openscvx-0.3.1.dev4 → openscvx-0.3.1.dev12}/openscvx/algorithms/solver_state.py

@@ -59,6 +59,8 @@ class SolverState:
     X: List[np.ndarray] = field(default_factory=list)
     U: List[np.ndarray] = field(default_factory=list)
     V_history: List[np.ndarray] = field(default_factory=list)
+    VC_history: List[np.ndarray] = field(default_factory=list)
+    TR_history: List[np.ndarray] = field(default_factory=list)
 
     @property
     def x(self) -> np.ndarray:
@@ -225,4 +227,6 @@ class SolverState:
             X=[settings.sim.x.guess.copy()],
             U=[settings.sim.u.guess.copy()],
             V_history=[],
+            VC_history=[],
+            TR_history=[],
         )

{openscvx-0.3.1.dev4 → openscvx-0.3.1.dev12}/openscvx/plotting/__init__.py

@@ -13,34 +13,16 @@ violations, and creating animations of the optimization process.
 """
 
 from .plotting import (
-    frame_args,
-    full_subject_traj_time,
-    plot_constraint_violation,
     plot_control,
-    plot_initial_guess,
-    plot_losses,
-    plot_scp_animation,
+    plot_scp_iteration_animation,
     plot_state,
-    qdcm,
-    save_gate_parameters,
-    scp_traj_interp,
 )
 
 __all__ = [
     # Core plotting functions
     "plot_state",
     "plot_control",
-    "plot_constraint_violation",
-    "plot_losses",
-    "plot_scp_animation",
-    "plot_initial_guess",
-    # Trajectory utilities
-    "full_subject_traj_time",
-    "scp_traj_interp",
-    # Helper functions
-    "qdcm",
-    "save_gate_parameters",
-    "frame_args",
+    "plot_scp_iteration_animation",
 ]
 
 # Mark module as unstable/deprecated