Revision 1529

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

  
38
 void param_init_bounded_number_vector::allocate(const data_matrix &m, const char *s)
39
 {
40
  int min1 = m.rowmin();
41
  int max1 = m.rowmax();
42
  double_index_type bmin = column(m,1);
43
  double_index_type bmax = column(m,2);
44
  index_type phz1 = ivector(column(m,3));
45
  allocate(min1,max1,bmin,bmax,phz1,s);
46
 }
47

  
38 48
 void param_init_bounded_number_vector::allocate(int min1,int max1,
39 49
   const double_index_type & bmin,const double_index_type & bmax,const char * s)
40 50
 {
trunk/src/nh99/tpl2cpp.lex (revision 1529)
2148 2148
                            }
2149 2149

  
2150 2150

  
2151
<INIT_BOUNDED_VECTOR_DEF>{name}\({num_exp},{num_exp},{float_num_exp},{float_num_exp},{num_exp}\) {
2151
<INIT_BOUNDED_VECTOR_DEF>{name}\({num_exp},{num_exp},{float_num_exp},{float_num_exp},{num_exp}\) |
2152
<INIT_BOUNDED_VECTOR_DEV>{name}\({name}\) {
2152 2153

  
2153 2154
    before_part(tmp_string,yytext,'(');  // get x in x(1,4)
2154 2155
    fprintf(fdat,"%s",tmp_string);
trunk/src/nh99/admodel.h (revision 1529)
2657 2657
 * Description not yet available.
2658 2658
 * \param
2659 2659
 */
2660
 class data_matrix;
2660 2661
 class param_init_bounded_number_vector
2661 2662
 {
2662 2663
   param_init_bounded_number * v;
......
2685 2686
   void allocate(int min1,int max1,const double_index_type & bmin,
2686 2687
     const double_index_type & bmax,const char * s);
2687 2688

  
2689
   void allocate(const data_matrix &m, const char *s);
2690

  
2688 2691
   int allocated(void) { return (v!=NULL); }
2689 2692
   int indexmin(void) {return (index_min);}
2690 2693
   int indexmax(void) {return (index_max);}

Also available in: Unified diff