Mercurial > octave

changeset 4246:0253850a08d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2002-12-30 17:57:36 by jwe]
author jwe
date Mon, 30 Dec 2002 17:57:36 +0000
parents 610671be8792
children fc9a075d10fb
files doc/interpreter/optim.txi src/ChangeLog src/DLD-FUNCTIONS/lpsolve.cc src/parse.y
diffstat 4 files changed, 20 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/optim.txi	Sat Dec 28 04:02:31 2002 +0000
+++ b/doc/interpreter/optim.txi	Mon Dec 30 17:57:36 2002 +0000
@@ -6,6 +6,7 @@
 @chapter Optimization
 
 @menu
+* Linear Programming::       
 * Quadratic Programming::       
 * Nonlinear Programming::       
 * Linear Least Squares::        
@@ -19,6 +20,9 @@
 @cindex QP
 @cindex NLP
 
+@node Linear Programming
+@section Linear Programming
+
 @node Quadratic Programming
 @section Quadratic Programming
 
--- a/src/ChangeLog	Sat Dec 28 04:02:31 2002 +0000
+++ b/src/ChangeLog	Mon Dec 30 17:57:36 2002 +0000
@@ -1,3 +1,12 @@
+2002-12-30  Paul Kienzle <pkienzle@users.sf.net>
+
+	* parse.y: Fix typo in doc string.
+
+2002-12-29  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* DLD-FUNCTIONS/lpsolve.cc (Flpsolve): Rename from Flp_solve.
+	(Flpsolve_options): Rename ffrom Flp_solve_options.
+
 2002-12-27  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* parse.y (Fevalin): New function.
--- a/src/DLD-FUNCTIONS/lpsolve.cc	Sat Dec 28 04:02:31 2002 +0000
+++ b/src/DLD-FUNCTIONS/lpsolve.cc	Mon Dec 30 17:57:36 2002 +0000
@@ -30,9 +30,9 @@
 #include "error.h"
 #include "oct-obj.h"
 
-DEFUN_DLD (lp_solve, , ,
+DEFUN_DLD (lpsolve, , ,
   "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} lp_solve ()\n\
+@deftypefn {Loadable Function} {} lpsolve ()\n\
 Not implemented yet...\n\
 @end deftypefn")
 {
@@ -45,20 +45,20 @@
   retval(1) = m;
   retval(0) = m;
 
-  error ("lp_solve: not implemented yet");
+  error ("lpsolve: not implemented yet");
 
   return retval;
 }
 
-DEFUN_DLD (lp_solve_options, , ,
+DEFUN_DLD (lpsolve_options, , ,
   "-*- texinfo -*-\n\
-@deftypefn {Loadable Function} {} lp_solve_options ()\n\
+@deftypefn {Loadable Function} {} lpsolve_options ()\n\
 Not implemented yet...\n\
 @end deftypefn")
 {
   octave_value_list retval;
 
-  error ("lp_solve_options: not implemented yet");
+  error ("lpsolve_options: not implemented yet");
 
   return retval;
 }
--- a/src/parse.y	Sat Dec 28 04:02:31 2002 +0000
+++ b/src/parse.y	Mon Dec 30 17:57:36 2002 +0000
@@ -3737,7 +3737,7 @@
 @deftypefn {Built-in Function} {} evalin (@var{context}, @var{try}, @var{catch})\n\
 Like @code{eval}, except that the expressions are evaluated in the\n\
 context @var{context}, which may be either @code{\"caller\"} or\n\
-@code{\"base\"}.
+@code{\"base\"}.\n\
 @end deftypefn")
 {
   octave_value_list retval;