[Octave-cvsupdate] SF.net SVN: octave:[10538] trunk/octave-forge/main

[<jpi...@us...>]

Revision: 10538
          http://octave.svn.sourceforge.net/octave/?rev=10538&view=rev
Author:   jpicarbajal
Date:     2012-05-30 08:15:08 +0000 (Wed, 30 May 2012)
Log Message:
-----------
linear-algebra: fixing text_waitbar use in nmf_pg

Modified Paths:
--------------
    trunk/octave-forge/main/geometry/inst/geom2d/closed_path.m
    trunk/octave-forge/main/linear-algebra/inst/nmf_pg.m

Modified: trunk/octave-forge/main/geometry/inst/geom2d/closed_path.m
===================================================================
--- trunk/octave-forge/main/geometry/inst/geom2d/closed_path.m	2012-05-30 08:00:59 UTC (rev 10537)
+++ trunk/octave-forge/main/geometry/inst/geom2d/closed_path.m	2012-05-30 08:15:08 UTC (rev 10538)
@@ -13,7 +13,6 @@
 %%    You should have received a copy of the GNU General Public License
 %%    along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-
 %% -*- texinfo -*-
 %% @deftypefn {Function File} {@var{y} =} polygon (@var{x})
 %% Returns a simple closed path that passes through all the points in @var{x}.

Modified: trunk/octave-forge/main/linear-algebra/inst/nmf_pg.m
===================================================================
--- trunk/octave-forge/main/linear-algebra/inst/nmf_pg.m	2012-05-30 08:00:59 UTC (rev 10537)
+++ trunk/octave-forge/main/linear-algebra/inst/nmf_pg.m	2012-05-30 08:15:08 UTC (rev 10538)
@@ -85,6 +85,12 @@
   maxsubiter = parser.Results.MaxSubIter;
   verbose    = parser.Results.Verbose;
 
+  # Check if text_waitbar is loaded
+  __txtwb__ = true;
+  if !exist ('text_waitbar')
+    __txtwb__ = false;
+  end
+
   clear parser
   # ------ #
 
@@ -141,7 +147,13 @@
          r,c,Wr,Wc,Hr,Hc);
     fprintf ("Initial gradient norm = %f\n", initgrad);
     fflush (stdout);
-    text_waitbar(0,'Please wait ...');
+
+    if __txtwb__
+      text_waitbar(0,'Please wait ...');
+    else
+      printf ('Running main loop, this may take a while.\n');
+      fflush (stdout);
+    end
   end
 
   for iter = 1:maxiter
@@ -177,9 +189,10 @@
       break
     end
 
-     if verbose
+    if verbose && __txtwb__
       text_waitbar (iter/maxiter);
-     end
+    end
+
   end
 
   if iter == maxiter

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.