Mercurial > octave-nkf

changeset 6484:1ece41c144a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-04-04 03:22:16 by jwe]
author jwe
date Wed, 04 Apr 2007 03:22:17 +0000
parents d00da2148c53
children 0f233b5b96a1
files src/ChangeLog src/DLD-FUNCTIONS/__glpk__.cc src/DLD-FUNCTIONS/cellfun.cc src/DLD-FUNCTIONS/colamd.cc src/DLD-FUNCTIONS/fftw.cc src/DLD-FUNCTIONS/qr.cc src/DLD-FUNCTIONS/sort.cc src/DLD-FUNCTIONS/urlwrite.cc
diffstat 8 files changed, 126 insertions(+), 109 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed Apr 04 02:58:48 2007 +0000
+++ b/src/ChangeLog	Wed Apr 04 03:22:17 2007 +0000
@@ -1,7 +1,14 @@
 2007-04-03  John W. Eaton  <jwe@octave.org>
 
+	* DLD-FUNCTIONS/urlwrite.cc (Furlwrite, Furlread):
+	Use && for logical, not &.
+
+	* DLD-FUNCTIONS/qr.cc (Fqr): Clarify nargin check.
+
 	* error.cc (Frethrow): Add braces to avoid ambiguous if/else.
 	* oct-stream.cc (octave_scan<>): Likewise.
+	* DLD-FUNCTIONS/colamd.cc (Fetree): Likewise.
+	* DLD-FUNCTIONS/sort.cc (mx_sort, mx_sort_indexed): Likewise.
 
 	* ov-fcn-handle.cc (make_fcn_handle): Pass ultimate parent
 	function name to lookup_function.
--- a/src/DLD-FUNCTIONS/__glpk__.cc	Wed Apr 04 02:58:48 2007 +0000
+++ b/src/DLD-FUNCTIONS/__glpk__.cc	Wed Apr 04 03:22:17 2007 +0000
@@ -257,7 +257,8 @@
 
   if (save_pb)
     {
-      if (lpx_write_cpxlp (lp, "outpb.lp") != 0)
+      static char tmp[] = "outpb.lp";
+      if (lpx_write_cpxlp (lp, tmp) != 0)
 	{
 	  error ("__glpk__: unable to write problem");
 	  longjmp (mark, -1);
@@ -308,7 +309,8 @@
 #ifdef GLPK_PRE_4_14
       insist (method != method);
 #else
-      glpk_fault_hook (0, "method != method");
+      static char tmp[] = "method != method";
+      glpk_fault_hook (0, tmp);
 #endif
     }
 
--- a/src/DLD-FUNCTIONS/cellfun.cc	Wed Apr 04 02:58:48 2007 +0000
+++ b/src/DLD-FUNCTIONS/cellfun.cc	Wed Apr 04 03:22:17 2007 +0000
@@ -220,7 +220,7 @@
           if (d < 0)
 	    error ("cellfun: third argument must be a postive integer");
 
-	  if (!error_state)
+	  if (! error_state)
             {
               NDArray result (f_args.dims ());
               for (octave_idx_type count = 0; count < k ; count++)
@@ -274,10 +274,10 @@
 	{
 	  octave_value_list idx;
 	  octave_value_list inputlist;
-	  bool UniformOutput = true;
-	  bool haveErrorHandler = false;
+	  bool uniform_output = true;
+	  bool have_error_handler = false;
 	  std::string err_name;
-	  octave_function *ErrorHandler;
+	  octave_function *error_handler = 0;
 	  int offset = 1;
 	  int i = 1;
 	  OCTAVE_LOCAL_BUFFER (Cell, inputs, nargin);
@@ -297,13 +297,13 @@
 				  arg.begin (), tolower);
 
 		  if (arg == "uniformoutput")
-		    UniformOutput = args(i++).bool_value();
+		    uniform_output = args(i++).bool_value();
 		  else if (arg == "errorhandler")
 		    {
 		      if (args(i).is_function_handle () || 
 			  args(i).is_inline_function ())
 			{
-			  ErrorHandler = args(i).function_value ();
+			  error_handler = args(i).function_value ();
 
 			  if (error_state)
 			    goto cellfun_err;
@@ -314,15 +314,15 @@
 			  std::string fname = "function y = ";
 			  fname.append (fcn_name);
 			  fname.append ("(x) y = ");
-			  ErrorHandler = extract_function (args(i), "cellfun", 
-							   err_name, fname,
-							   "; endfunction");
+			  error_handler = extract_function (args(i), "cellfun", 
+							    err_name, fname,
+							    "; endfunction");
 			}
 
-		      if (!ErrorHandler)
+		      if (! error_handler)
 			goto cellfun_err;
 
-		      haveErrorHandler = true;
+		      have_error_handler = true;
 		      i++;
 		    }
 		  else
@@ -348,10 +348,10 @@
 
 	  inputlist.resize(nargin-offset);
 
-	  if (haveErrorHandler)
+	  if (have_error_handler)
 	    buffer_error_messages++;
 
-	  if (UniformOutput)
+	  if (uniform_output)
 	    {
 	      retval.resize(nargout);
 
@@ -362,7 +362,7 @@
 
 		  octave_value_list tmp = feval (func, inputlist, nargout);
 
-		  if (error_state && haveErrorHandler)
+		  if (error_state && have_error_handler)
 		    {
 		      octave_value_list errtmp = 
 			Flasterr (octave_value_list (), 2);
@@ -375,7 +375,7 @@
 		      errlist.prepend (msg);
 		      buffer_error_messages--;
 		      error_state = 0;
-		      tmp = feval (ErrorHandler, errlist, nargout);
+		      tmp = feval (error_handler, errlist, nargout);
 		      buffer_error_messages++;
 
 		      if (error_state)
@@ -441,7 +441,7 @@
 
 		  octave_value_list tmp = feval (func, inputlist, nargout);
 
-		  if (error_state && haveErrorHandler)
+		  if (error_state && have_error_handler)
 		    {
 		      octave_value_list errtmp = 
 			Flasterr (octave_value_list (), 2);
@@ -454,7 +454,7 @@
 		      errlist.prepend (msg);
 		      buffer_error_messages--;
 		      error_state = 0;
-		      tmp = feval (ErrorHandler, errlist, nargout);
+		      tmp = feval (error_handler, errlist, nargout);
 		      buffer_error_messages++;
 
 		      if (error_state)
--- a/src/DLD-FUNCTIONS/colamd.cc	Wed Apr 04 02:58:48 2007 +0000
+++ b/src/DLD-FUNCTIONS/colamd.cc	Wed Apr 04 03:22:17 2007 +0000
@@ -693,18 +693,19 @@
 	}
 
       if (nargin == 2)
-	if (args(1).is_string ())
-	  {
-	    std::string str = args(1).string_value ();
-	    if (str.find("C") == 0 || str.find("c") == 0)
-	      is_sym = false;
-	  }
-	else
-	  {
-	    error ("etree: second argument must be a string");
-	    return retval;
-	  }
-
+	{
+	  if (args(1).is_string ())
+	    {
+	      std::string str = args(1).string_value ();
+	      if (str.find ("C") == 0 || str.find ("c") == 0)
+		is_sym = false;
+	    }
+	  else
+	    {
+	      error ("etree: second argument must be a string");
+	      return retval;
+	    }
+	}
       // column elimination tree post-ordering (reuse variables)
       OCTAVE_LOCAL_BUFFER (octave_idx_type, etree, n_col + 1);
       
--- a/src/DLD-FUNCTIONS/fftw.cc	Wed Apr 04 02:58:48 2007 +0000
+++ b/src/DLD-FUNCTIONS/fftw.cc	Wed Apr 04 03:22:17 2007 +0000
@@ -142,7 +142,8 @@
 		    {
 		      std::transform (arg1.begin (), arg1.end (), 
 				      arg1.begin (), tolower);
-		      octave_fftw_planner::FftwMethod meth;
+		      octave_fftw_planner::FftwMethod meth
+			= octave_fftw_planner::UNKNOWN;
 
 		      if (arg1 == "estimate")
 			meth = fftw_planner.method
--- a/src/DLD-FUNCTIONS/qr.cc	Wed Apr 04 02:58:48 2007 +0000
+++ b/src/DLD-FUNCTIONS/qr.cc	Wed Apr 04 03:22:17 2007 +0000
@@ -153,7 +153,7 @@
 
   int nargin = args.length ();
 
-  if (nargin != 1 && nargin != 2 || nargout > 3)
+  if (nargin < 1 || nargin > 2 || nargout > 3)
     {
       print_usage ();
       return retval;
--- a/src/DLD-FUNCTIONS/sort.cc	Wed Apr 04 02:58:48 2007 +0000
+++ b/src/DLD-FUNCTIONS/sort.cc	Wed Apr 04 03:22:17 2007 +0000
@@ -347,26 +347,28 @@
 	  // things up.
 
 	  if (lo_ieee_signbit (octave_NaN))
-	    if (mode == UNDEFINED || mode == ASCENDING)
-	      {
-		octave_idx_type i = 0;
-		double *vtmp = reinterpret_cast<double *> (p);
-		while (xisnan (vtmp[i++]) && i < ns);
-		for (octave_idx_type l = 0; l < ns - i + 1; l++)
-		  vtmp[l] = vtmp[l+i-1];
-		for (octave_idx_type l = ns - i + 1; l < ns; l++)
-		  vtmp[l] = octave_NaN;
-	      }
-	    else
-	      {
-		octave_idx_type i = ns;
-		double *vtmp = reinterpret_cast<double *> (p);
-		while (xisnan (vtmp[--i]) && i > 0);
-		for (octave_idx_type l = i; l >= 0; l--)
-		  vtmp[l-i+ns-1] = vtmp[l];
-		for (octave_idx_type l = 0; l < ns - i - 1; l++)
-		  vtmp[l] = octave_NaN;
-	      }
+	    {
+	      if (mode == UNDEFINED || mode == ASCENDING)
+		{
+		  octave_idx_type i = 0;
+		  double *vtmp = reinterpret_cast<double *> (p);
+		  while (xisnan (vtmp[i++]) && i < ns);
+		  for (octave_idx_type l = 0; l < ns - i + 1; l++)
+		    vtmp[l] = vtmp[l+i-1];
+		  for (octave_idx_type l = ns - i + 1; l < ns; l++)
+		    vtmp[l] = octave_NaN;
+		}
+	      else
+		{
+		  octave_idx_type i = ns;
+		  double *vtmp = reinterpret_cast<double *> (p);
+		  while (xisnan (vtmp[--i]) && i > 0);
+		  for (octave_idx_type l = i; l >= 0; l--)
+		    vtmp[l-i+ns-1] = vtmp[l];
+		  for (octave_idx_type l = 0; l < ns - i - 1; l++)
+		    vtmp[l] = octave_NaN;
+		}
+	    }
 
 	  p += ns;
 	}
@@ -406,24 +408,26 @@
 	  // fix things up.
 
 	  if (lo_ieee_signbit (octave_NaN))
-	    if (mode == UNDEFINED || mode == ASCENDING)
-	      {
-		 octave_idx_type i = 0;
-		while (xisnan (v[i++*stride + offset]) && i < ns);
-		for (octave_idx_type l = 0; l < ns - i + 1; l++)
-		  v[l*stride + offset] = v[(l+i-1)*stride + offset];
-		for (octave_idx_type l = ns - i + 1; l < ns; l++)
-		  v[l*stride + offset] = octave_NaN;
-	      }
-	    else
-	      {
-		 octave_idx_type i = ns;
-		while (xisnan (v[--i*stride + offset]) && i > 0);
-		for (octave_idx_type l = i; l >= 0; l--)
-		  v[(l-i+ns-1)*stride + offset] = v[l*stride + offset];
-		for (octave_idx_type l = 0; l < ns - i - 1; l++)
-		  v[l*stride + offset] = octave_NaN;
-	      }
+	    {
+	      if (mode == UNDEFINED || mode == ASCENDING)
+		{
+		   octave_idx_type i = 0;
+		  while (xisnan (v[i++*stride + offset]) && i < ns);
+		  for (octave_idx_type l = 0; l < ns - i + 1; l++)
+		    v[l*stride + offset] = v[(l+i-1)*stride + offset];
+		  for (octave_idx_type l = ns - i + 1; l < ns; l++)
+		    v[l*stride + offset] = octave_NaN;
+		}
+	      else
+		{
+		   octave_idx_type i = ns;
+		  while (xisnan (v[--i*stride + offset]) && i > 0);
+		  for (octave_idx_type l = i; l >= 0; l--)
+		    v[(l-i+ns-1)*stride + offset] = v[l*stride + offset];
+		  for (octave_idx_type l = 0; l < ns - i - 1; l++)
+		    v[l*stride + offset] = octave_NaN;
+		}
+	    }
 	}
     }
 
@@ -509,42 +513,44 @@
       // If it will be sorted to the beginning, fix things up.
 
       if (lo_ieee_signbit (octave_NaN))
-	if (mode == UNDEFINED || mode == ASCENDING)
-	  {
-	    octave_idx_type i = 0;
-	    while (xisnan (v[i++*stride+offset]) && i < ns);
-	    OCTAVE_LOCAL_BUFFER (double, itmp, i - 1);
-	    for (octave_idx_type l = 0; l < i -1; l++)
-	      itmp[l] = idx(l*stride + offset);
-	    for (octave_idx_type l = 0; l < ns - i + 1; l++)
-	      {
-		v[l*stride + offset] = v[(l+i-1)*stride + offset];
-		idx(l*stride + offset) = idx((l+i-1)*stride + offset);
-	      }
-	    for (octave_idx_type k = 0, l = ns - i + 1; l < ns; l++, k++)
-	      {
-		v[l*stride + offset] = octave_NaN;
-		idx(l*stride + offset) = itmp[k];
-	      }
-	  }
-	else 
-	  {
-	     octave_idx_type i = ns;
-	    while (xisnan (v[--i*stride+offset]) && i > 0);
-	    OCTAVE_LOCAL_BUFFER (double, itmp, ns - i - 1);
-	    for (octave_idx_type l = 0; l < ns - i -1; l++)
-	      itmp[l] = idx((l+i+1)*stride + offset);
-	    for (octave_idx_type l = i; l >= 0; l--)
-	      {
-		v[(l-i+ns-1)*stride + offset] = v[l*stride + offset];
-		idx((l-i+ns-1)*stride + offset) = idx(l*stride + offset);
-	      }
-	    for (octave_idx_type k = 0, l = 0; l < ns - i - 1; l++, k++)
-	      {
-		v[l*stride + offset] = octave_NaN;
-		idx(l*stride + offset) = itmp[k];
-	      }
-	  }
+	{
+	  if (mode == UNDEFINED || mode == ASCENDING)
+	    {
+	      octave_idx_type i = 0;
+	      while (xisnan (v[i++*stride+offset]) && i < ns);
+	      OCTAVE_LOCAL_BUFFER (double, itmp, i - 1);
+	      for (octave_idx_type l = 0; l < i -1; l++)
+		itmp[l] = idx(l*stride + offset);
+	      for (octave_idx_type l = 0; l < ns - i + 1; l++)
+		{
+		  v[l*stride + offset] = v[(l+i-1)*stride + offset];
+		  idx(l*stride + offset) = idx((l+i-1)*stride + offset);
+		}
+	      for (octave_idx_type k = 0, l = ns - i + 1; l < ns; l++, k++)
+		{
+		  v[l*stride + offset] = octave_NaN;
+		  idx(l*stride + offset) = itmp[k];
+		}
+	    }
+	  else 
+	    {
+	      octave_idx_type i = ns;
+	      while (xisnan (v[--i*stride+offset]) && i > 0);
+	      OCTAVE_LOCAL_BUFFER (double, itmp, ns - i - 1);
+	      for (octave_idx_type l = 0; l < ns - i -1; l++)
+		itmp[l] = idx((l+i+1)*stride + offset);
+	      for (octave_idx_type l = i; l >= 0; l--)
+		{
+		  v[(l-i+ns-1)*stride + offset] = v[l*stride + offset];
+		  idx((l-i+ns-1)*stride + offset) = idx(l*stride + offset);
+		}
+	      for (octave_idx_type k = 0, l = 0; l < ns - i - 1; l++, k++)
+		{
+		  v[l*stride + offset] = octave_NaN;
+		  idx(l*stride + offset) = itmp[k];
+		}
+	    }
+	}
     }
 
   retval(1) = idx;
--- a/src/DLD-FUNCTIONS/urlwrite.cc	Wed Apr 04 02:58:48 2007 +0000
+++ b/src/DLD-FUNCTIONS/urlwrite.cc	Wed Apr 04 03:22:17 2007 +0000
@@ -313,7 +313,7 @@
       retval(2) = std::string (res == CURLE_OK ? "" : curl_easy_strerror (res));
     }
 
-  if (nargout < 2 & res != CURLE_OK)
+  if (nargout < 2 && res != CURLE_OK)
     error ("urlwrite: curl: %s", curl_easy_strerror (res));
 
 #else
@@ -430,7 +430,7 @@
       retval(2) = std::string (res == CURLE_OK ? "" : curl_easy_strerror (res));
     }
 
-  if (nargout < 2 & res != CURLE_OK)
+  if (nargout < 2 && res != CURLE_OK)
     error ("urlread: curl: %s", curl_easy_strerror (res));
 
 #else