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

f1b2fnl6.cpp (revision 1110)
2 2
 * $Id$
3 3
 *
4 4
 * Author: David Fournier
5
 * Copyright (c) 2008-2012 Regents of the University of California 
5
 * Copyright (c) 2008-2012 Regents of the University of California
6 6
 */
7 7
/**
8 8
 * \file
......
21 21
  p=&_x;
22 22
  int mmin=p->indexmin();
23 23
  int mmax=p->indexmax();
24
  
24

  
25 25
  int jmin=(*p)(mmin).indexmin();
26 26
  int ind_index = x(mmin,jmin).get_ind_index();
27
  if (ind_index<0) 
27
  if (ind_index<0)
28 28
  {
29 29
    add_to_inactive_list();
30 30
  }
......
97 97
 * \param
98 98
 */
99 99
void funnel_init_df1b2matrix::xinit(init_df1b2vector& y,int& ii)
100
{ 
100
{
101 101
  df1b2_init_matrix * vp = (df1b2_init_matrix *) p;
102 102
  int mmin=vp->indexmin();
103 103
  int mmax=vp->indexmax();
......
120 120
 */
121 121
void funnel_init_df1b2matrix::set_index(imatrix& y,int& ii)
122 122
{
123
  
124 123
  df1b2_init_matrix * vp = (df1b2_init_matrix *) p;
125 124
  int mmin=vp->indexmin();
126 125
  int mmax=vp->indexmax();
......
173 172
  int mmin=x.indexmin();
174 173
  int mmax=x.indexmax();
175 174
  int ind_index = x(mmin).get_ind_index();
176
  if (ind_index<0) 
175
  if (ind_index<0)
177 176
  {
178 177
    add_to_inactive_list();
179 178
  }
......
193 192
}
194 193

  
195 194
void funnel_init_bounded_df1b2vector::xinit(init_df1b2vector& y,int& ii)
196
{ 
195
{
197 196
  df1b2_init_bounded_vector * vp = (df1b2_init_bounded_vector *) p;
198 197
  int mmin=p->indexmin();
199 198
  int mmax=p->indexmax();
......
205 204
  }
206 205
}
207 206

  
208
  
209 207
void funnel_init_bounded_df1b2vector::set_index(imatrix& y,int& ii)
210 208
{
211
  
212 209
  int mmin=p->indexmin();
213 210
  int mmax=p->indexmax();
214 211
  int i;
......
219 216
    ii++;
220 217
  }
221 218
}
222
  
219

  
223 220
void funnel_init_bounded_df1b2vector::set_value(const init_df1b2vector& _x,
224 221
  const int& _ii,const df1b2variable& _pen)
225 222
{
......
241 238
    else
242 239
    {
243 240
      (*this)(i) = (x(ii));
244
      *((*this)(i).get_u()) = 
241
      *((*this)(i).get_u()) =
245 242
        boundp(*(x(ii++).get_u()),vp->getminb(),vp->getmaxb());
246 243
    }
247 244
  }

Also available in: Unified diff