Changeset 4430

Show
Ignore:
Timestamp:
03/26/12 16:00:29 (6 years ago)
Author:
josp
Message:

refs #1490, portando cambios [4426]

Location:
tolp/OfficialTolArchiveNetwork/StdLib/math/optim/LP
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • tolp/OfficialTolArchiveNetwork/StdLib/math/optim/LP/Rglpk.tol

    r4429 r4430  
    6161  "   A: a matrix of the constraint coefficients.\n" 
    6262  "\n" 
    63   "   RHS: the right hand side of the constraints.\n" 
     63  "   rhs: the right hand side of the constraints.\n" 
    6464  "\n" 
    6565  "with the following extra args given in the Set optArgs:\n" 
     
    142142  "};\n" 
    143143  ; 
    144   Set solveLP(Matrix C, Matrix A, Matrix RHS, Set optArgs) 
     144  Set solveLP(Matrix C, Matrix A, Matrix rhs, Set optArgs) 
    145145  ////////////////////////////////////////////////////////////////////////////// 
    146146  { 
     
    184184      "Rglpk_solve_LP.TOL('"+_om.bbm+"','"+_rhs.bbm+"','%A')"; 
    185185 
    186     Set rrs = Rapi::RunRScript(script,args.bbm,argList,result.names,verbose); 
    187     If(Card(rrs),  
     186    Set result = Rapi::RunRScript(script,args.bbm,argList,result.names,verbose); 
     187    If(Card(result),  
    188188    {[[ 
    189189      Real status     = MatDat(result[1],1,1), 
  • tolp/OfficialTolArchiveNetwork/StdLib/math/optim/LP/test.tol

    r4429 r4430  
    2020  Matrix rhs = ((60, Real -1,80)); 
    2121 
    22   Set bounds = [[ {Set lower=[[ [[1, Real -Inf]], [[2, Real -Inf]], [[3, Real -Inf]] ]]} ]]; 
     22  Set bounds = { [[ Set lower=[[ [[1, Real -Inf]], [[2, Real -Inf]], [[3, Real -Inf]] ]] ]] }; 
    2323 
    2424  Set sol=Rglpk::solveLP(obj, mat, rhs, 
     
    4444  Matrix rhs = ((60,40,80)); 
    4545 
    46   Set bounds = [[ {Set upper=[[ [[2, 4.0]] ]]} ]]; 
     46  Set bounds = { [[ Set upper=[[ [[2, 4.0]] ]] ]] }; 
    4747 
    4848  Set sol=Rglpk::solveLP(obj, mat, rhs,