/[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 284 by johnpye, Sun Feb 5 13:33:25 2006 UTC revision 285 by johnpye, Thu Feb 9 04:21:30 2006 UTC
# Line 307  Simulation::solve(Solver solver){ Line 307  Simulation::solve(Solver solver){
307    
308      for(int iter = 1; iter <= niter && !stop; ++iter){      for(int iter = 1; iter <= niter && !stop; ++iter){
309          slv_get_status(sys,&status);          slv_get_status(sys,&status);
310    
311          if(status.ready_to_solve){          if(status.ready_to_solve){
312              slv_iterate(sys);              slv_iterate(sys);
313          }          }
# Line 322  Simulation::solve(Solver solver){ Line 323  Simulation::solve(Solver solver){
323      }      }
324      double elapsed = tm_cpu_time() - starttime;      double elapsed = tm_cpu_time() - starttime;
325    
326        activeblock = status.block.current_block;
327    
328      if(status.ok){      if(status.ok){
329          cerr << "... SOLVED, STATUS OK" << endl;          cerr << "... SOLVED, STATUS OK" << endl;
330      }else{      }else{
# Line 476  Simulation::processVarStatus(){ Line 479  Simulation::processVarStatus(){
479          i.setVarStatus(s);          i.setVarStatus(s);
480      }      }
481  }  }
482    
483    const int
484    Simulation::getActiveBlock() const{
485        return activeblock;
486    }

Legend:
Removed from v.284  
changed lines
  Added in v.285

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