Revision 1142

trunk/src/nh99/modspmin.cpp (revision 1142)
309 309
  void function_minimizer::computations1(int argc,char * argv[])
310 310
  {
311 311
    tracing_message(traceflag,"B1");
312
#if defined(__SPDLL__)
313
    //if (ad_printf) (*ad_printf)("entered void function_minimizer::computations1\n");
314
#endif
315 312

  
316
#if defined (AD_DEMO)
317
     if (gradient_structure::ARRAY_MEMBLOCK_SIZE != 12000)
318
     {
319
#if defined(__SPDLL__)
320
       //if (ad_printf) (*ad_printf)("setting ad_chea_flag\n");
321
#endif
322
       ad_cheat_flag=1;
323
     }
324
#endif
325
    //char ch;
326 313
    int on=-1;
327 314
    int nopt=-1;
328
    //dvector xxxx("{1.1,2.1,3.1}");
329 315
#if defined(USE_ADPVM)
330 316
    if (ad_comm::pvm_manager)
331 317
    {
......
386 372

  
387 373
    stddev_params::get_stddev_number_offset();
388 374

  
389
#if defined (AD_DEMO)
390
    if (ad_cheat_flag==1)
391
    {
392
      exit(0);
393
    }
394
#endif
395

  
396 375
    tracing_message(traceflag,"C1");
397 376

  
398 377
#if defined(ADMB_REDEMO)
......
434 413
      }
435 414
      else
436 415
      {
437

  
438 416
        initial_params::current_phase=initial_params::max_number_phases;
439 417
      }
440 418
      tracing_message(traceflag,"D1");
441 419

  
442 420
      //double ratio=100.*gradient_structure::max_last_offset/12000.0;
443
  #if defined (AD_DEMO)
444
      cout << endl << endl;
445
      if (ad_printf)
446
      {
447
        (*ad_printf) (" Your model used %lf  percent of demonstration version"
448
           " capacity \n",ratio);
449
      }
450
      write_banner_stuff();
451

  
452
  #endif
453 421
      tracing_message(traceflag,"E1");
454 422
      if (option_match(argc,argv,"-est") == -1)
455 423
      {
......
629 597
    }
630 598
    while(spminflag || repeatminflag);
631 599
  }
632

  
633

  
600
  
634 601
  void function_minimizer::computations(void)
635 602
  {
636 603
    // for now just do parameter estimates
637 604
    //function_minimizer::minimize();
638 605
    minimize();
639
    //
640 606
  }
641 607

  
642

  
643 608
void write_banner_stuff(void)
644 609
{
645 610
  if (ad_printf)
......
1134 1099
  }
1135 1100
#else
1136 1101
  void extra_random_effects_generator2(void) {;}
1137

  
1138
#endif  //#if defined(ADMB_REDEMO)
1102
#endif  //#if defined(ADMB_REDEMO)
trunk/src/nh99/model7.cpp (revision 1142)
533 533
    }
534 534
  }
535 535
#endif
536
}
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff