Revision 349

trunk/src/linad99/newfmin.cpp (revision 349)
69 69
  {
70 70
    signal(SIGINT, exit_handler);
71 71
    ctlc_flag = 1;
72
    if (ad_printf) (*ad_printf)("\npress q to quit or c to invoke derivative checker: ");
72
    if (ad_printf) (*ad_printf)("\npress q to quit or c to invoke derivative checker or s to stop optimizing: ");
73 73
  }
74 74
#ifdef __NDPX__
75 75
  #include <iostream.hxx>
......
569 569
              c='C';
570 570
            if ( c == 'C')
571 571
            {
572
	      
572 573
              for (i=1; i<=n; i++)
573 574
              {
574 575
                x.elem(i)=xx.elem(i);
......
576 577
              ireturn = 3;
577 578
              derch(f, x , w, n, ireturn);
578 579
              return;
579
            }
580
            } 
581
            else if(c=='S')
582
            {
583
	      //set convergence criteria to something high to stop now
584
	      crit=100000.0;
585
	      return;
586
	    }
580 587
            else 
581 588
            {
582 589
              if ( c == 'Q'|| c == 'N') 

Also available in: Unified diff