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

df1b2f25.cpp (revision 1110)
54 54
    double pen=0;
55 55
    if(!initial_params::mc_phase)
56 56
    {
57
      if (!scalefactor) 
57
      if (!scalefactor)
58 58
        d(ii)=ndfboundp(x(ii),minb,maxb,pen);
59 59
      else
60 60
        d(ii)=ndfboundp(x(ii)/scalefactor,minb,maxb,pen)/scalefactor;
61 61
    }
62 62
    else
63 63
    {
64
      if (!scalefactor) 
64
      if (!scalefactor)
65 65
        d(ii)=ndfboundp_mc(x(ii),minb,maxb,pen);
66 66
      else
67 67
        d(ii)=ndfboundp_mc(x(ii)/scalefactor,minb,maxb,pen)/scalefactor;
......
79 79
  void df1b2_init_vector::sd_scale(const dvector& _v,const dvector& x,const int& _ii)
80 80
  {
81 81
    if (allocated())
82
    {  
82
    {
83 83
      int& ii=(int&) _ii;
84 84
      dvector& v=(dvector&) _v;
85 85
      int mmin=indexmin();
......
100 100
  void df1b2_init_matrix::sd_scale(const dvector& _v,const dvector& x,const int& _ii)
101 101
  {
102 102
    if (allocated())
103
    {  
103
    {
104 104
      int& ii=(int&) _ii;
105 105
      dvector& v=(dvector&) _v;
106 106
      int mmin=indexmin();
......
117 117
            if (scalefactor) v(ii)/=scalefactor;
118 118
            ii++;
119 119
          }
120
	}  
120
	}
121 121
      }
122 122
    }
123 123
  }
......
129 129
  void df1b2_init_bounded_vector::sd_scale(const dvector& _v,const dvector& x,const int& _ii)
130 130
  {
131 131
    if (allocated())
132
    {  
132
    {
133 133
      int& ii=(int&) _ii;
134 134
      dvector& v=(dvector&) _v;
135 135
      int mmin=indexmin();
......
139 139
      {
140 140
        for (int i=mmin;i<=mmax;i++)
141 141
        {
142
          if (!scalefactor) 
142
          if (!scalefactor)
143 143
            v(ii)=ndfboundp(x(ii),minb,maxb,pen);
144 144
          else
145 145
            v(ii)=ndfboundp(x(ii)/scalefactor,minb,maxb,pen)/scalefactor;
......
164 164
  void df1b2_init_bounded_matrix::sd_scale(const dvector& _v,const dvector& x,const int& _ii)
165 165
  {
166 166
    if (allocated())
167
    {  
167
    {
168 168
      int& ii=(int&) _ii;
169 169
      dvector& v=(dvector&) _v;
170 170
      int rmin=indexmin();
......
173 173
      for (int i=rmin;i<=rmax;i++)
174 174
      {
175 175
        if (::allocated((*this)(i)))
176
        {  
176
        {
177 177
          int cmin=(*this)(i).indexmin();
178 178
          int cmax=(*this)(i).indexmax();
179 179
          for (int j=cmin;j<=cmax;j++)
180 180
          {
181
            if (!scalefactor) 
181
            if (!scalefactor)
182 182
              v(ii)=ndfboundp(x(ii),minb,maxb,pen);
183 183
            else
184 184
              v(ii)=ndfboundp(x(ii)/scalefactor,minb,maxb,pen)/

Also available in: Unified diff