/[ascend]/trunk/base/generic/solver/slv8.c
ViewVC logotype

Diff of /trunk/base/generic/solver/slv8.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1078 by johnpye, Sun Jan 7 07:10:16 2007 UTC revision 1079 by johnpye, Tue Jan 9 10:46:54 2007 UTC
# Line 90  int slv8_register(SlvFunctionsT *f){ Line 90  int slv8_register(SlvFunctionsT *f){
90  #define SLV8(s) ((slv8_system_t)(s))  #define SLV8(s) ((slv8_system_t)(s))
91  #define MI8F(s) slv_get_output_file( SLV8(s)->p.output.more_important )  #define MI8F(s) slv_get_output_file( SLV8(s)->p.output.more_important )
92  #define SERVER (sys->slv)  #define SERVER (sys->slv)
93  #define slv8_PA_SIZE 54  #define slv8_PA_SIZE 56
94  #define SAFE_CALC_PTR (sys->parm_array[0])  #define SAFE_CALC_PTR (sys->parm_array[0])
95  #define SAFE_CALC     ((*(int *)SAFE_CALC_PTR))  #define SAFE_CALC     ((*(int *)SAFE_CALC_PTR))
96  #define SCALEOPT_PTR (sys->parm_array[1])  #define SCALEOPT_PTR (sys->parm_array[1])
# Line 1487  int32 slv8_get_default_parameters(slv_sy Line 1487  int32 slv8_get_default_parameters(slv_sy
1487        "rvobjl", "RVOBJL","Limit on objective in Quick Mode",        "rvobjl", "RVOBJL","Limit on objective in Quick Mode",
1488             U_p_real(val, 0),U_p_real(lo,0),U_p_real(hi,10e10), 5);             U_p_real(val, 0),U_p_real(lo,0),U_p_real(hi,10e10), 5);
1489            
1490      asc_assert(parameters->num_parms==slv8_PA_SIZE);
1491    
1492    return 1;    return 1;
1493  }  }

Legend:
Removed from v.1078  
changed lines
  Added in v.1079

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22