/[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 318 by johnpye, Thu Feb 23 10:21:17 2006 UTC revision 319 by johnpye, Thu Feb 23 12:30:40 2006 UTC
# Line 385  Simulation::solve(Solver solver, SolverR Line 385  Simulation::solve(Solver solver, SolverR
385          if(reporter.report(&status)){          if(reporter.report(&status)){
386              stop = true;              stop = true;
387          }          }
   
   
         /*  
         if(tm_cpu_time() - lastupdate > updateinterval && iter > 0){  
             if(solved_vars < status.getNumConverged()){  
                 solved_vars = status.getNumConverged();  
                 CONSOLE_DEBUG("Solved %5d vars. Now block %3d/%-3d...", solved_vars, status.getCurrentBlockNum(), status.getNumBlocks());  
             }else{  
                 CONSOLE_DEBUG("Total %5d iterations (%5d in current block of %d vars)", iter, status.getCurrentBlockIteration(), status.getCurrentBlockSize());  
             }  
             lastupdate = tm_cpu_time();  
         }  
         */  
388      }      }
389    
390      double elapsed = tm_cpu_time() - starttime;      double elapsed = tm_cpu_time() - starttime;
391    
392    
393      activeblock = status.getCurrentBlockNum();      activeblock = status.getCurrentBlockNum();
394    
395        reporter.finalise(&status);
396    
397      if(status.isOK()){      if(status.isOK()){
398          cerr << "... SOLVED, STATUS OK" << endl;          cerr << "... SOLVED, STATUS OK" << endl;
399      }else{      }else{

Legend:
Removed from v.318  
changed lines
  Added in v.319

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