diff --git a/mex/sources/bytecode/SparseMatrix.cc b/mex/sources/bytecode/SparseMatrix.cc index 56828f97c8545bd514f10b4e93bfb8e1e3cea435..bb97bbc852aa7897f4c9fc84064a813fed631401 100644 --- a/mex/sources/bytecode/SparseMatrix.cc +++ b/mex/sources/bytecode/SparseMatrix.cc @@ -3802,12 +3802,12 @@ dynSparseMatrix::Simulate_One_Boundary(int block_num, int y_size, int size) } } - mexPrintf("-----------------------------------\n"); - mexPrintf(" Simulate iteration no %d \n", iter+1); - mexPrintf(" max. error=%.10e \n", static_cast<double>(max_res)); - mexPrintf(" sqr. error=%.10e \n", static_cast<double>(res2)); - mexPrintf(" abs. error=%.10e \n", static_cast<double>(res1)); - mexPrintf("-----------------------------------\n"); + mexPrintf("------------------------------------\n"); + mexPrintf(" Simulate iteration no %d\n", iter+1); + mexPrintf(" Inf-norm error = %.3e\n", static_cast<double>(max_res)); + mexPrintf(" 2-norm error = %.3e\n", static_cast<double>(sqrt(res2))); + mexPrintf(" 1-norm error = %.3e\n", static_cast<double>(res1)); + mexPrintf("------------------------------------\n"); } bool zero_solution; @@ -4172,12 +4172,12 @@ dynSparseMatrix::Simulate_Newton_Two_Boundaries(int blck, int y_size, int y_kmin break; } } - mexPrintf("-----------------------------------\n"); - mexPrintf(" Simulate iteration no %d \n", iter+1); - mexPrintf(" max. error=%.10e \n", static_cast<double>(max_res)); - mexPrintf(" sqr. error=%.10e \n", static_cast<double>(res2)); - mexPrintf(" abs. error=%.10e \n", static_cast<double>(res1)); - mexPrintf("-----------------------------------\n"); + mexPrintf("------------------------------------\n"); + mexPrintf(" Simulate iteration no %d\n", iter+1); + mexPrintf(" Inf-norm error = %.3e\n", static_cast<double>(max_res)); + mexPrintf(" 2-norm error = %.3e\n", static_cast<double>(sqrt(res2))); + mexPrintf(" 1-norm error = %.3e\n", static_cast<double>(res1)); + mexPrintf("------------------------------------\n"); mexEvalString("drawnow;"); } if (cvg) diff --git a/mex/sources/bytecode/SparseMatrix.hh b/mex/sources/bytecode/SparseMatrix.hh index e896f1d4c2beec89f390a4b15c8d095d60a1bc01..35fb3ce59aacc33fa78251008dbe19bd01383d29 100644 --- a/mex/sources/bytecode/SparseMatrix.hh +++ b/mex/sources/bytecode/SparseMatrix.hh @@ -203,6 +203,7 @@ protected: int maxit_; double *direction; double solve_tolf; + // 1-norm error, square of 2-norm error, ∞-norm error double res1, res2, max_res; int max_res_idx; int *index_vara;