From: <car...@us...> - 2012-01-10 17:59:37
|
Revision: 9518 http://octave.svn.sourceforge.net/octave/?rev=9518&view=rev Author: carandraug Date: 2012-01-10 17:59:30 +0000 (Tue, 10 Jan 2012) Log Message: ----------- odepkg: fix matlab-style possible short-circuit warnings Modified Paths: -------------- trunk/octave-forge/main/odepkg/inst/odebwe.m trunk/octave-forge/main/odepkg/inst/odepkg_examples_ode.m Modified: trunk/octave-forge/main/odepkg/inst/odebwe.m =================================================================== --- trunk/octave-forge/main/odepkg/inst/odebwe.m 2012-01-10 17:54:29 UTC (rev 9517) +++ trunk/octave-forge/main/odepkg/inst/odebwe.m 2012-01-10 17:59:30 UTC (rev 9518) @@ -362,7 +362,7 @@ %# that is the matrix pencil of the mass matrix and %# the right-hand-side's Jacobian. Perform a (sparse) %# LU-Decomposition afterwards. - if (vnewtit<=1) | (~vsimplified) + if (vnewtit<=1) || (~vsimplified) %# Get the mass matrix from the left-hand-side if (vhavemasshandle) %# Handle only the dynamic mass matrix, if (vmassdependence) %# constant mass matrices have already Modified: trunk/octave-forge/main/odepkg/inst/odepkg_examples_ode.m =================================================================== --- trunk/octave-forge/main/odepkg/inst/odepkg_examples_ode.m 2012-01-10 17:54:29 UTC (rev 9517) +++ trunk/octave-forge/main/odepkg/inst/odepkg_examples_ode.m 2012-01-10 17:59:30 UTC (rev 9518) @@ -41,7 +41,7 @@ ' your patch with your added example to the OdePkg developer team.\n', ... '\n' ]); vode = input ('Please choose a number from above or press <Enter> to return: '); - clc; if (vode > 0 & vode < 6) + clc; if (vode > 0 && vode < 6) %# We can't use the function 'demo' directly here because it does %# not allow to run other functions within a demo. vexa = example (mfilename (), vode); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |