From 16db9a26680b085540ee093a31b3efd8bbe0141e Mon Sep 17 00:00:00 2001 From: Charlotte HECQUET Date: Tue, 16 Apr 2013 15:40:11 +0200 Subject: [PATCH] * Bug #7927 fixed - Output "flag" in qmr function was not well documented. Change-Id: I8320d38c92efed440845aa985e8486d0bf298420 --- scilab/CHANGES_5.5.X | 2 ++ .../sparse/help/en_US/iterativesolvers/qmr.xml | 33 +++++++++----------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X index 1642863..bb816a0 100644 --- a/scilab/CHANGES_5.5.X +++ b/scilab/CHANGES_5.5.X @@ -69,6 +69,8 @@ Bug fixes * Bug #7684 fixed - Introduction demo splitted in subsections. +* Bug #7927 fixed - Output "flag" in qmr function was not well documented. + * Bug #8667 fixed - Handling of %nan in functions min,max,median is not correctly documented. * Bug #8680 fixed - Output argument "end" of the regexp function has been changed. diff --git a/scilab/modules/sparse/help/en_US/iterativesolvers/qmr.xml b/scilab/modules/sparse/help/en_US/iterativesolvers/qmr.xml index e14dafd..475c8e4 100644 --- a/scilab/modules/sparse/help/en_US/iterativesolvers/qmr.xml +++ b/scilab/modules/sparse/help/en_US/iterativesolvers/qmr.xml @@ -13,7 +13,7 @@ qmr - quasi minimal resiqual method with preconditioning + quasi minimal residual method with preconditioning Calling Sequence @@ -165,24 +165,19 @@ function y = Ap ( x ) flag - - - 0 = - - - gmres converged to the desired tolerance within maxi iterations - - - - - 1 = - - - no convergence given maxi - - - - + + + flag=0: qmr converged to the desired tolerance within maxi + iterations, + + + flag=1: no convergence given maxi, + + + -7 < flag < 0: A breakdown occurred because one of the scalar quantities calculated during + qmr was equal to zero. + + -- 1.7.9.5