Merge 34faa05 into 8652ae1

docs/interfaces/julia.rst

@@ -77,18 +77,21 @@ The output :code:`results` contains the primal solution :code:`x`, the dual solu
 +-----------------------+------------------------------------------------+
 | :code:`solve_time`    | Solve time                                     |
 +-----------------------+------------------------------------------------+
+| :code:`update_time`   | Update time                                    |
++-----------------------+------------------------------------------------+
 | :code:`polish_time`   | Polish time                                    |
 +-----------------------+------------------------------------------------+
-| :code:`run_time`      | Total run time: setup + solve + polish         |
+| :code:`run_time`      | Total run time: setup/update + solve + polish  |
 +-----------------------+------------------------------------------------+
 | :code:`rho_estimate`  | Optimal rho estimate                           |
 +-----------------------+------------------------------------------------+
 | :code:`rho_updates`   | Number of rho updates                          |
 +-----------------------+------------------------------------------------+
 
-
 Note that if multiple solves are executed from single setup, then after the
-first one :code:`run_time` includes only :code:`solve_time` + :code:`polish_time`.
+first one :code:`run_time` includes :code:`update_time` + :code:`solve_time`
++ :code:`polish_time`.
+
 
 Update
 ------

docs/interfaces/matlab.rst

@@ -78,17 +78,21 @@ The :code:`results` structure contains the primal solution :code:`x`, the dual s
 +-----------------------+------------------------------------------------+
 | :code:`solve_time`    | Solve time                                     |
 +-----------------------+------------------------------------------------+
+| :code:`update_time`   | Update time                                    |
++-----------------------+------------------------------------------------+
 | :code:`polish_time`   | Polish time                                    |
 +-----------------------+------------------------------------------------+
-| :code:`run_time`      | Total run time: setup + solve + polish         |
+| :code:`run_time`      | Total run time: setup/update + solve + polish  |
 +-----------------------+------------------------------------------------+
 | :code:`rho_estimate`  | Optimal rho estimate                           |
 +-----------------------+------------------------------------------------+
 | :code:`rho_updates`   | Number of rho updates                          |
 +-----------------------+------------------------------------------------+
 
 Note that if multiple solves are executed from single setup, then after the
-first one :code:`run_time` includes only :code:`solve_time` + :code:`polish_time`.
+first one :code:`run_time` includes :code:`update_time` + :code:`solve_time`
++ :code:`polish_time`.
+
 
 Update
 ------

docs/interfaces/python.rst

@@ -74,18 +74,21 @@ The :code:`results` object contains the primal solution :code:`x`, the dual solu
 +-----------------------+------------------------------------------------+
 | :code:`solve_time`    | Solve time                                     |
 +-----------------------+------------------------------------------------+
+| :code:`update_time`   | Update time                                    |
++-----------------------+------------------------------------------------+
 | :code:`polish_time`   | Polish time                                    |
 +-----------------------+------------------------------------------------+
-| :code:`run_time`      | Total run time: setup + solve + polish         |
+| :code:`run_time`      | Total run time: setup/update + solve + polish  |
 +-----------------------+------------------------------------------------+
 | :code:`rho_estimate`  | Optimal rho estimate                           |
 +-----------------------+------------------------------------------------+
 | :code:`rho_updates`   | Number of rho updates                          |
 +-----------------------+------------------------------------------------+
 
-
 Note that if multiple solves are executed from single setup, then after the
-first one :code:`run_time` includes only :code:`solve_time` + :code:`polish_time`.
+first one :code:`run_time` includes :code:`update_time` + :code:`solve_time`
++ :code:`polish_time`.
+
 
 Update
 ------

include/types.h

@@ -61,7 +61,7 @@ typedef struct {
 
 
 /**
- * Solver return nformation
+ * Solver return information
  */
 typedef struct {
   c_int iter;          ///< number of iterations taken
@@ -80,6 +80,7 @@ typedef struct {
 # ifdef PROFILING
   c_float setup_time;  ///< time taken for setup phase (seconds)
   c_float solve_time;  ///< time taken for solve phase (seconds)
+  c_float update_time; ///< time taken for update phase (seconds)
   c_float polish_time; ///< time taken for polish phase (seconds)
   c_float run_time;    ///< total time  (seconds)
 # endif // ifdef PROFILING
@@ -287,16 +288,20 @@ typedef struct {
   OSQPSolution *solution; ///< Problem solution
   OSQPInfo     *info;     ///< Solver information
 
-        # ifdef PROFILING
+# ifdef PROFILING
   OSQPTimer *timer;       ///< Timer object
 
   /// flag indicating whether the solve function has been run before
   c_int first_run;
-        # endif // ifdef PROFILING
 
-        # ifdef PRINTING
+  /// flag indicating whether the update_time should be cleared
+  c_int clear_update_time;
+# endif // ifdef PROFILING
+
+# ifdef PRINTING
   c_int summary_printed; ///< Has last summary been printed? (true/false)
-        # endif // ifdef PRINTING
+# endif // ifdef PRINTING
+
 } OSQPWorkspace;
 
 

src/kkt.c

@@ -189,7 +189,7 @@ void update_KKT_P(csc          *KKT,
 
   // Update diagonal elements of KKT by adding sigma
   for (i = 0; i < Pdiag_n; i++) {
-    j                  = Pdiag_idx[i]; // Extract ondex of the element on the
+    j                  = Pdiag_idx[i]; // Extract index of the element on the
                                        // diagonal
     KKT->x[PtoKKT[j]] += param1;
   }