Revision 1534

trunk/src/nh99/model48.cpp (revision 1534)
35 35
   }
36 36
 }
37 37

  
38
 /**
39
  * Overload the allocate function to use a data_matrix object.
40
  * \author Steve Martell
41
  */
38 42
 void param_init_bounded_number_vector::allocate(const data_matrix &m, const char *s)
39 43
 {
40 44
  int min1 = m.rowmin();
trunk/src/nh99/admodel.h (revision 1534)
1164 1164
/**
1165 1165
 * Description not yet available.
1166 1166
 * \param
1167
 * \author Dave Founier & Steve Martell
1168
 * Overloaded allocate function to recieve a data_vector from an input file.
1167 1169
 */
1168 1170
class param_init_bounded_number: public param_init_number
1169 1171
{
......
1178 1180
  void allocate(double _minb,double _maxb,int phase_start=1,
1179 1181
    const char * s="UNNAMED");
1180 1182
  void allocate(double _minb,double _maxb,const char * s="UNNAMED");
1183
  // Added by Steve Martell for using input data for allocation.
1181 1184
  void allocate(const data_vector& v,const char * s="UNNAMED");
1182 1185

  
1183 1186
public:
......
2654 2657
 };
2655 2658

  
2656 2659
/**
2657
 * Description not yet available.
2660
 * Class object for init_bounded_number vector
2661
 * \author Dave Fournier, addition by Steve Martell
2658 2662
 * \param
2663
 * Steve Martell overloaded the allocate routine to accomodate a matrix object
2664
 * of the form data_matrix that would be read in from an input file.
2659 2665
 */
2660 2666
 class data_matrix;
2661 2667
 class param_init_bounded_number_vector
......
2686 2692
   void allocate(int min1,int max1,const double_index_type & bmin,
2687 2693
     const double_index_type & bmax,const char * s);
2688 2694

  
2695
   // Added by Steve Martell, Jan 18, 2014.
2689 2696
   void allocate(const data_matrix &m, const char *s);
2690 2697

  
2691 2698
   int allocated(void) { return (v!=NULL); }
trunk/src/nh99/model.cpp (revision 1534)
473 473
  {
474 474
    return 1;
475 475
  }
476

  
477
  //Added By Steve Martell
476
  
477
  /**
478
   * Use a data_vector to allocate an init_bounded_number
479
   * \author Steve Martell
480
   * \param v vector containing the lower bound, upper bound, and phase of estimation.
481
  **/
478 482
  void param_init_bounded_number::allocate(const data_vector & v,
479 483
   const char * _s)
480 484
   {

Also available in: Unified diff