Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv2359
Modified Files:
Tag: simdata
Interpolate.cpp
Log Message:
no message
Index: Interpolate.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/Interpolate.cpp,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** Interpolate.cpp 20 Jan 2003 04:56:49 -0000 1.1.2.2
--- Interpolate.cpp 20 Jan 2003 18:28:04 -0000 1.1.2.3
***************
*** 71,79 ****
value_t d = breaks[i+1] - breaks[i-1];
value_t sig = (breaks[i] - breaks[i-1]) / d;
! value_t p = 2.0 + sig * z[i-1];
! z[i] = (sig - 1.0) / p;
value_t a = (data[i+1] - data[i]) / (breaks[i+1] - breaks[i]);
value_t b = (data[i] - data[i-1]) / (breaks[i] - breaks[i-1]);
! u[i] = (6.0 * (a - b) / d - sig * u[i-1]) / p;
}
z[n-1] = 0.0;
--- 71,79 ----
value_t d = breaks[i+1] - breaks[i-1];
value_t sig = (breaks[i] - breaks[i-1]) / d;
! value_t p = static_cast<float>(2.0 + sig * z[i-1]);
! z[i] = static_cast<float>((sig - 1.0) / p);
value_t a = (data[i+1] - data[i]) / (breaks[i+1] - breaks[i]);
value_t b = (data[i] - data[i-1]) / (breaks[i] - breaks[i-1]);
! u[i] = static_cast<float>((6.0 * (a - b) / d - sig * u[i-1]) / p);
}
z[n-1] = 0.0;
***************
*** 160,164 ****
_min = _breaks[0];
double max = _breaks[n-1];
! double _range = max - _min;
_i_n = int(_range / spacing) + 1;
_table.resize(_i_n);
--- 160,164 ----
_min = _breaks[0];
double max = _breaks[n-1];
! float _range = static_cast<float>(max - _min);
_i_n = int(_range / spacing) + 1;
_table.resize(_i_n);
***************
*** 166,170 ****
int i;
for (i=0; i<_i_n; i++) {
! double x = _min + _range * i / (_i_n-1);
*element++ = getPrecise(x);
}
--- 166,170 ----
int i;
for (i=0; i<_i_n; i++) {
! float x = _min + _range * i / (_i_n-1);
*element++ = getPrecise(x);
}
***************
*** 185,189 ****
double y2 = _data[i+1];
double s = h * h / 6.0;
! v = y1*f1 + y2*f2 + (f1*(f1*f1 - 1.0)*d1 + f2*(f2*f2 - 1.0)*d2) * s;
return v;
}
--- 185,189 ----
double y2 = _data[i+1];
double s = h * h / 6.0;
! v = static_cast<float>(y1*f1 + y2*f2 + (f1*(f1*f1 - 1.0)*d1 + f2*(f2*f2 - 1.0)*d2) * s);
return v;
}
***************
*** 198,202 ****
double y1 = _table[idx];
double y2 = _table[idx+1];
! double z = f * y2 + (1.0 - f) * y1;
return z;
}
--- 198,202 ----
double y1 = _table[idx];
double y2 = _table[idx+1];
! float z = static_cast<float>(f * y2 + (1.0 - f) * y1);
return z;
}
|
