# HG changeset patch
# User jwe
# Date 785455015 0
# Node ID a1b0080599e5992ca239d41510ddc5bac36c6211
# Parent  2e954ce5263ff44fc4873e7665efa1a7e589b400
[project @ 1994-11-21 21:56:42 by jwe]

diff -r 2e954ce5263f -r a1b0080599e5 src/npsol.cc
--- a/src/npsol.cc	Mon Nov 21 19:18:33 1994 +0000
+++ b/src/npsol.cc	Mon Nov 21 21:56:55 1994 +0000
@@ -358,14 +358,14 @@
 
   npsol_constraints = 0;
   if (nargin == 5 || nargin == 7 || nargin == 8 || nargin == 10)
-    npsol_constraints = is_valid_function (args(nargin-1), "npsol", 0);
+    npsol_constraints = is_valid_function (args(nargin-2), "npsol", 0);
 
   if (nargin == 7 || nargin == 5)
     {
       if (! npsol_constraints)
 	{
-	  ColumnVector lub = args(nargin).vector_value ();
-	  ColumnVector llb = args(nargin-2).vector_value ();
+	  ColumnVector lub = args(nargin-1).vector_value ();
+	  ColumnVector llb = args(nargin-3).vector_value ();
 
 	  if (error_state || llb.capacity () == 0 || lub.capacity () == 0)
 	    {
@@ -373,7 +373,7 @@
 	      return retval;
 	    }
 
-	  Matrix c = args(nargin-1).matrix_value ();
+	  Matrix c = args(nargin-2).matrix_value ();
 
 	  if (error_state)
 	    {
@@ -408,8 +408,8 @@
 	{
 	  if (takes_correct_nargs (npsol_constraints, 1, "npsol", 1))
 	    {
-	      ColumnVector nlub = args(nargin).vector_value ();
-	      ColumnVector nllb = args(nargin-2).vector_value ();
+	      ColumnVector nlub = args(nargin-1).vector_value ();
+	      ColumnVector nllb = args(nargin-3).vector_value ();
 
 	      if (error_state
 		  || (! nonlinear_constraints_ok
@@ -445,14 +445,14 @@
       if (! npsol_constraints)
 	{
 	  // Produce error message.
-	  is_valid_function (args(nargin-1), "npsol", 1);
+	  is_valid_function (args(nargin-2), "npsol", 1);
 	}
       else
 	{
 	  if (takes_correct_nargs (npsol_constraints, 1, "npsol", 1))
 	    {
-	      ColumnVector nlub = args(nargin).vector_value ();
-	      ColumnVector nllb = args(nargin-2).vector_value ();
+	      ColumnVector nlub = args(nargin-1).vector_value ();
+	      ColumnVector nllb = args(nargin-3).vector_value ();
 
 	      if (error_state
 		  || (! nonlinear_constraints_ok
@@ -462,8 +462,8 @@
 	      NLFunc const_func (npsol_constraint_function);
 	      NLConst nonlinear_constraints (nllb, const_func, nlub);
 
-	      ColumnVector lub = args(nargin-3).vector_value ();
-	      ColumnVector llb = args(nargin-5).vector_value ();
+	      ColumnVector lub = args(nargin-4).vector_value ();
+	      ColumnVector llb = args(nargin-6).vector_value ();
 
 	      if (error_state || llb.capacity () == 0 || lub.capacity () == 0)
 		{
@@ -471,7 +471,7 @@
 		  return retval;
 		}
 	      
-	      Matrix c = args(nargin-4).matrix_value ();
+	      Matrix c = args(nargin-5).matrix_value ();
 
 	      if (error_state)
 		{
diff -r 2e954ce5263f -r a1b0080599e5 src/qpsol.cc
--- a/src/qpsol.cc	Mon Nov 21 19:18:33 1994 +0000
+++ b/src/qpsol.cc	Mon Nov 21 21:56:55 1994 +0000
@@ -172,8 +172,8 @@
 
   if (nargin == 6 || nargin == 8)
     {
-      ColumnVector lub = args(nargin).vector_value ();
-      ColumnVector llb = args(nargin-2).vector_value ();
+      ColumnVector lub = args(nargin-1).vector_value ();
+      ColumnVector llb = args(nargin-3).vector_value ();
 
       if (error_state || llb.capacity () == 0 || lub.capacity () == 0)
 	{
@@ -181,7 +181,7 @@
 	  return retval;
 	}
 
-      Matrix A = args(nargin-1).matrix_value ();
+      Matrix A = args(nargin-2).matrix_value ();
 
       if (error_state)
 	{