Revision 1110 trunk/src/df1b2-separable/df1b2impf.cpp

df1b2impf.cpp (revision 1110)
105 105
       if (is>nsamp) break;
106 106
       icount++;
107 107
       dvar_vector tau=ch*pmin->lapprox->epsilon(is);
108
 
108

  
109 109
       vy(xs+1,xs+us).shift(1)+=tau;
110 110
       initial_params::reset(vy);    // get the values into the model
111 111
       vy(xs+1,xs+us).shift(1)-=tau;
......
140 140
     }
141 141
     lbound+=samplesize;
142 142
     ubound+=samplesize;
143
   } 
144
  
143
   }
144

  
145 145
   double fm=mean(value(fvalues(1,mean_count)));
146 146
   dvar_vector nfval=exp(fvalues(1,mean_count)-fm);
147 147
   vf=-fm-log(nfval*blocksizes(1,mean_count)/sum(blocksizes(1,mean_count)));
148
   //vf-=us*.91893853320467241; 
148
   //vf-=us*.91893853320467241;
149 149

  
150
   
151 150
   int sgn=0;
152 151
   dvariable ld;
153 152
   if (ad_comm::no_ln_det_choleski_flag)
......
165 164
   vy(xs+1,xs+us).shift(1)=u0;
166 165
   initial_params::reset(vy);    // get the values into the model
167 166
   gradient_structure::set_YES_DERIVATIVES();
168
  
167

  
169 168
  ii=1;
170 169
  for (i=1;i<=xs;i++)
171 170
    xadjoint(i)=g(ii++);

Also available in: Unified diff