Revision 1615

trunk/src/nh99/tpl2cpp.lex (revision 1615)
586 586

  
587 587
<DEFINE_DATA>init_number {
588 588
    likelihood_found=1;
589
    BEGIN IN_NUMBER_DEF;
589
    BEGIN INIT_BOUNDED_NUMBER_DEF;
590 590
    fprintf(fdat,"%s","  data_number ");
591 591
                     }
592 592

  
593
<DEFINE_DATA>init_xml_doc {
594
    BEGIN IN_NUMBER_DEF;
595
    fprintf(fdat,"%s","  init_xml_doc ");
596
                     }
597

  
593 598
<DEFINE_DATA>init_adstring {
594 599

  
595 600
    BEGIN IN_NUMBER_DEF;
......
1789 1794
<IN_VECTOR_DEF>{name}\({num_exp},{num_exp}\) |
1790 1795
<IN_VECTOR_DEF>{name}\({num_exp},{name}\) |
1791 1796
<IN_VECTOR_DEF>{name}\({name},{num_exp}\) |
1792
<IN_VECTOR_DEF>{name}\({name},{name}\) {
1797
<IN_VECTOR_DEF>{name}\({name},{name}\) |
1798
<IN_VECTOR_DEF>({name}\({name}\)) {
1793 1799

  
1794 1800
    before_part(tmp_string,yytext,'(');  // get x in x(1,4)
1795 1801
    fprintf(fdat,"%s",tmp_string);
......
2175 2181
                            }
2176 2182

  
2177 2183
<IN_MATRIX_DEF>{name}\({num_exp},{num_exp},{num_exp},{num_exp}\) |
2178
<IN_MATRIX_DEF>{name}\({num_exp},{num_exp},{num_exp},{num_exp},{num_exp}\) {
2184
<IN_MATRIX_DEF>{name}\({num_exp},{num_exp},{num_exp},{num_exp},{num_exp}\) |
2185
<IN_MATRIX_DEF>({name}\({name}\)) {
2179 2186

  
2180 2187
    before_part(tmp_string,yytext,'(');  // get x in x(1,4)
2181 2188
    fprintf(fdat,"%s",tmp_string);
trunk/src/nh99/admodel.h (revision 1615)
73 73
#include <cifstrem.h>
74 74

  
75 75
#include <adstring.hpp>
76
class init_xml_doc;
76 77

  
77 78
#if defined(UNIXKLUDGE)
78 79
#include <unistd.h>
......
1136 1137
protected:
1137 1138
  void allocate(int phase_start=1,const char *s="UNNAMED");
1138 1139
  void allocate(const char *s="UNNAMED");
1140
  void allocate(init_xml_doc&, const char *s="UNNAMED");
1139 1141
  friend class model_parameters;
1140 1142
  friend class param_init_number_vector;
1141 1143
  param_init_number();
......
1182 1184
  void allocate(double _minb,double _maxb,const char * s="UNNAMED");
1183 1185
  // Added by Steve Martell for using input data for allocation.
1184 1186
  void allocate(const data_vector& v,const char * s="UNNAMED");
1187
  void allocate(init_xml_doc&, const char * s="UNNAMED");
1185 1188

  
1186 1189
public:
1187 1190
#if defined(USE_ADPVM)
......
1388 1391
  data_int& operator=(const int);
1389 1392
  void allocate(int n,const char * s="UNNAMED");
1390 1393
  void allocate(const char * s="UNNAMED");
1394
  void allocate(init_xml_doc&, const char * s="UNNAMED");
1391 1395
  friend class model_data;
1392 1396
  friend class model_parameters;
1393 1397
  friend int operator + (int n,data_int v);
......
1493 1497
    const char * = "UNNAMED");
1494 1498
  void allocate(int rmin, int rmax, int cmin, const ivector& cmax,
1495 1499
    const char * = "UNNAMED");
1500
  void allocate(init_xml_doc&, const char * = "UNNAMED");
1496 1501
  friend class model_data;
1497 1502
};
1498 1503

  
......
1626 1631
private:
1627 1632
  void allocate(int imin,int imax,const char * ="UNNAMED");
1628 1633
  void allocate(int imin, const ivector& imax, const char * ="UNNAMED");
1634
  void allocate(init_xml_doc&, const char * ="UNNAMED");
1629 1635
  friend class model_data;
1630 1636
};
1631 1637

  
trunk/docs/api/dox-share/mainpage.txt (revision 1615)
10 10
  <li> Documentation of mathematical functions can be found in the 
11 11
"Function Reference" tab.</li>
12 12
  <li> C++ class documentation can be found in the "Classes" tab. </li>
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff