Revision 760

branches/threaded2/src/nh99/mod_hess.cpp (revision 760)
66 66
  }
67 67
#endif
68 68
}
69

  
70 69
void function_minimizer::hess_routine_noparallel(void)
71 70
{
72
  int nvar=initial_params::nvarcalc();
73
  independent_variables x(1,nvar);
71
  int nvar = initial_params::nvarcalc();
72
  independent_variables x(1, nvar);
74 73
  initial_params::xinit(x);
75 74
  double delta=1.e-5;
76
  dvector g1(1,nvar);
77
  dvector g2(1,nvar);
78
  dvector hess(1,nvar);
79
  dvector hess1(1,nvar);
80
  dvector hess2(1,nvar);
81
  double eps=.1;
75
  dvector g1(1, nvar);
76
  dvector g2(1, nvar);
77
  dvector hess(1, nvar);
78
  dvector hess1(1, nvar);
79
  dvector hess2(1, nvar);
80
  double eps = 0.1;
82 81
  gradient_structure::set_YES_DERIVATIVES();
83 82

  
84
  dvector gbest(1,nvar);
85
  gbest.fill_seqadd(1.e+50,0.);
86
 
87 83
  std::ostringstream oss;
88 84
  std::thread::id this_thread_id = std::this_thread::get_id();
89 85
  oss << *ad_comm::adprogram_name << this_thread_id << ".hes";
......
161 157
    }
162 158
  }
163 159
  ofs << gradient_structure::Hybrid_bounded_flag;
164
  dvector tscale(1,nvar);   // need to get scale from somewhere
160
  dvector tscale(1,nvar);
165 161
  initial_params::stddev_scale(tscale,x);
166 162
  ofs << tscale;
167 163

  
branches/threaded2/src/nh99/modspmin.cpp (revision 760)
516 516
            if ( (on=option_match(argc,argv,"-sob",nopt))>-1)
517 517
            {
518 518
              int nsob=0;
519
              //int iseed0=0;
520
              //double dscale=1.0;
521 519
              if (nopt)
522 520
              {
523 521
                nsob=atoi(argv[on+1]);
......
527 525
                    << endl << " ignored" << endl;
528 526
                }
529 527
              }
530
              if ( (on=option_match(argc,argv,"-mcr",nopt))>-1)
531
              {
532
    #if defined(NO_MCMC)
533
                cerr << "mcmc and sob option not supported you must purchase"
534
                        " this as an add on" << endl;
535
                exit(1);
536
    #else
537
                //sob_routine(nsob,dscale,1);
538
                //sobol_importance_routine(nsob,iseed0,dscale,1);
539
    #endif
540
          
541
              }
542
              else
543
              {
544
    #if defined(NO_MCMC)
545
                cerr << "mcmc and sob option not supported you must purchase"
546
                        " this as an add on" << endl;
547
                exit(1);
548
    #else
549
                //sobol_importance_routine(nsob,iseed0,dscale,0);
550
    #endif
551
         
552
              }
553 528
            }
554 529
            initial_params::sd_phase=0;
555 530
          }
branches/threaded2/src/linad99/sgradclc.cpp (revision 760)
94 94
      ad_exit(1);
95 95
    }
96 96
  }
97
  dvector& g= (dvector&) _g;
97
  dvector& g = (dvector&)_g;
98 98
  gradient_structure::TOTAL_BYTES = 0;
99
  gradient_structure::PREVIOUS_TOTAL_BYTES=0;
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff