Changeset e5ac79b in tol

Timestamp:

Mar 26, 2012, 11:11:45 AM (15 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

e06956b

Parents:

64f04d2

Message:

Refs #1490

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4425 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/stdlib/math/optim/LP

Files:

• Rglpk.tol (modified) (3 diffs)
• test.tol (modified) (2 diffs)

tol/stdlib/math/optim/LP/Rglpk.tol

@@ -61 +61 @@
   "   A: a matrix of the constraint coefficients.\n"
   "\n"
-  "   RHS: the right hand side of the constraints.\n"
+  "   rhs: the right hand side of the constraints.\n"
   "\n"
   "with the following extra args given in the Set optArgs:\n"
@@ -142 +142 @@
   "};\n"
   ;
-  Set solveLP(Matrix C, Matrix A, Matrix RHS, Set optArgs)
+  Set solveLP(Matrix C, Matrix A, Matrix rhs, Set optArgs)
   //////////////////////////////////////////////////////////////////////////////
   {
@@ -184 +184 @@
       "Rglpk_solve_LP.TOL('"+_om.bbm+"','"+_rhs.bbm+"','%A')";
 
-    Set rrs = Rapi::RunRScript(script,args.bbm,argList,result.names,verbose);
-    If(Card(rrs), 
+    Set result = Rapi::RunRScript(script,args.bbm,argList,result.names,verbose);
+    If(Card(result), 
     {[[
       Real status     = MatDat(result[1],1,1),

tol/stdlib/math/optim/LP/test.tol

@@ -20 +20 @@
   Matrix rhs = ((60, Real -1,80));
 
-  Set bounds = [[ {Set lower=[[ [[1, Real -Inf]], [[2, Real -Inf]], [[3, Real -Inf]] ]]} ]];
+  Set bounds = { [[ Set lower=[[ [[1, Real -Inf]], [[2, Real -Inf]], [[3, Real -Inf]] ]] ]] };
 
   Set sol=Rglpk::solveLP(obj, mat, rhs,
@@ -44 +44 @@
   Matrix rhs = ((60,40,80));
 
-  Set bounds = [[ {Set upper=[[ [[2, 4.0]] ]]} ]];
+  Set bounds = { [[ Set upper=[[ [[2, 4.0]] ]] ]] };
 
   Set sol=Rglpk::solveLP(obj, mat, rhs,