/[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 320 by johnpye, Thu Feb 23 12:30:40 2006 UTC revision 321 by johnpye, Thu Feb 23 14:14:36 2006 UTC
# Line 397  Simulation::solve(Solver solver, SolverR Line 397  Simulation::solve(Solver solver, SolverR
397      if(status.isOK()){      if(status.isOK()){
398          cerr << "... SOLVED, STATUS OK" << endl;          cerr << "... SOLVED, STATUS OK" << endl;
399      }else{      }else{
400          ERROR_REPORTER_NOLINE(ASC_USER_ERROR,"Solver failed");          cerr << "... SOLVER FAILED" << endl;
401      }      }
402    
403      cerr << "SOLVER PERFORMED " << status.getIterationNum() << " ITERATIONS IN " << elapsed << "s" << endl;      cerr << "SOLVER PERFORMED " << status.getIterationNum() << " ITERATIONS IN " << elapsed << "s" << endl;
404    
405        /*
406      if(status.hasExceededTimeLimit()){      if(status.hasExceededTimeLimit()){
407          ERROR_REPORTER_NOLINE(ASC_USER_ERROR,"Exceeded interation limit");          ERROR_REPORTER_NOLINE(ASC_USER_ERROR,"Exceeded interation limit");
408      }      }
# Line 414  Simulation::solve(Solver solver, SolverR Line 415  Simulation::solve(Solver solver, SolverR
415              " (%.2f s).",status.getCurrentBlockNum(),status.getIterationNum(),elapsed);              " (%.2f s).",status.getCurrentBlockNum(),status.getIterationNum(),elapsed);
416          IncidenceMatrix inc = getIncidenceMatrix();          IncidenceMatrix inc = getIncidenceMatrix();
417    
         /*  
418          cerr << "VARIABLES IN NON-CONVERGED BLOCK:" << endl;          cerr << "VARIABLES IN NON-CONVERGED BLOCK:" << endl;
419          vector<Variable> v = inc.getBlockVars(status.block.current_block);          vector<Variable> v = inc.getBlockVars(status.block.current_block);
420          for(vector<Variable>::iterator vi = v.begin(); vi < v.end(); ++vi){          for(vector<Variable>::iterator vi = v.begin(); vi < v.end(); ++vi){
# Line 426  Simulation::solve(Solver solver, SolverR Line 426  Simulation::solve(Solver solver, SolverR
426          for(vector<Relation>::iterator ri = r.begin(); ri < r.end(); ++ri){          for(vector<Relation>::iterator ri = r.begin(); ri < r.end(); ++ri){
427              cerr << ri->getName() << endl;              cerr << ri->getName() << endl;
428          }          }
429          */          
430      }      }
431        */
432    
433  }  }
434    

Legend:
Removed from v.320  
changed lines
  Added in v.321

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