/[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 314 by johnpye, Thu Feb 23 06:00:42 2006 UTC revision 315 by johnpye, Thu Feb 23 07:40:47 2006 UTC
# Line 372  Simulation::solve(Solver solver, SolverR Line 372  Simulation::solve(Solver solver, SolverR
372      bool stop=false;      bool stop=false;
373    
374      status.getSimulationStatus(*this);      status.getSimulationStatus(*this);
     cerr << "FIRST REPORTER CALL..." << endl;  
     reporter.report(&status);  
     cerr << "SECOND REPORTER CALL..." << endl;  
     reporter.report(&status);  
     cerr << "THIRD REPORTER CALL..." << endl;  
375      reporter.report(&status);      reporter.report(&status);
376    
377      for(int iter = 1; iter <= niter && !stop; ++iter){      for(int iter = 1; iter <= niter && !stop; ++iter){
# Line 388  Simulation::solve(Solver solver, SolverR Line 383  Simulation::solve(Solver solver, SolverR
383          status.getSimulationStatus(*this);          status.getSimulationStatus(*this);
384          reporter.report(&status);          reporter.report(&status);
385    
386            /*
387          if(tm_cpu_time() - lastupdate > updateinterval && iter > 0){          if(tm_cpu_time() - lastupdate > updateinterval && iter > 0){
388              if(solved_vars < status.getNumConverged()){              if(solved_vars < status.getNumConverged()){
389                  solved_vars = status.getNumConverged();                  solved_vars = status.getNumConverged();
# Line 397  Simulation::solve(Solver solver, SolverR Line 393  Simulation::solve(Solver solver, SolverR
393              }              }
394              lastupdate = tm_cpu_time();              lastupdate = tm_cpu_time();
395          }          }
396            */
397      }      }
398      double elapsed = tm_cpu_time() - starttime;      double elapsed = tm_cpu_time() - starttime;
399    

Legend:
Removed from v.314  
changed lines
  Added in v.315

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