/[ascend]/trunk/pygtk/interface/simulation.cpp
ViewVC logotype

Diff of /trunk/pygtk/interface/simulation.cpp

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

revision 206 by johnpye, Tue Jan 17 15:58:23 2006 UTC revision 207 by johnpye, Mon Jan 23 06:47:06 2006 UTC
# Line 287  Simulation::solve(Solver solver){ Line 287  Simulation::solve(Solver solver){
287      setSolver(solver);      setSolver(solver);
288    
289    
290      cerr << "PRESOLVING SYSTEM..." << endl;      cerr << "PRESOLVING SYSTEM...";
291      slv_presolve(sys);      slv_presolve(sys);
292      cerr << "... DONE PRESOLVING" << endl;      cerr << "DONE" << endl;
293    
294      cerr << "SOLVING SYSTEM..." << endl;      cerr << "SOLVING SYSTEM..." << endl;
295      // Add some stuff here for cleverer iteration....      // Add some stuff here for cleverer iteration....
296      unsigned niter = 300;      unsigned niter = 1000;
297      double updateinterval = 0.02;      double updateinterval = 0.02;
298    
299      double starttime = tm_cpu_time();      double starttime = tm_cpu_time();
# Line 302  Simulation::solve(Solver solver){ Line 302  Simulation::solve(Solver solver){
302      int solved_vars=0;      int solved_vars=0;
303      bool stop=false;      bool stop=false;
304    
305      for(int iter = 0; iter < niter && !stop; ++iter){      for(int iter = 1; iter <= niter && !stop; ++iter){
306          slv_get_status(sys,&status);          slv_get_status(sys,&status);
307          if(status.ready_to_solve){          if(status.ready_to_solve){
308              slv_iterate(sys);              slv_iterate(sys);

Legend:
Removed from v.206  
changed lines
  Added in v.207

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