Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv1467
Modified Files:
Interpolate.cpp
Log Message:
*** see CHANGES.current ***
Index: Interpolate.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Interpolate.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Interpolate.cpp 18 Jul 2003 01:33:05 -0000 1.9
--- Interpolate.cpp 19 Jul 2003 13:56:50 -0000 1.10
***************
*** 190,195 ****
int i = find(_breaks, v);
double h = _breaks[i+1] - _breaks[i];
! double f1 = 1.0 - (v - _breaks[i]) / h;
! double f2 = 1.0 - (_breaks[i+1] - v) / h;
double d1 = _sd[i];
double d2 = _sd[i+1];
--- 190,195 ----
int i = find(_breaks, v);
double h = _breaks[i+1] - _breaks[i];
! double f1 = 1.0 - (v - _breaks[i]) / h;// 1.0 - t; ?
! double f2 = 1.0 - (_breaks[i+1] - v) / h; // t = (v - _breaks[i]) / h; ?
double d1 = _sd[i];
double d2 = _sd[i+1];
***************
*** 197,201 ****
double y2 = _data[i+1];
double s = h * h / 6.0;
! v = static_cast<value_t>(y1*f1 + y2*f2 + (f1*(f1*f1 - 1.0)*d1 + f2*(f2*f2 - 1.0)*d2) * s);
return v;
}
--- 197,201 ----
double y2 = _data[i+1];
double s = h * h / 6.0;
! v = static_cast<value_t>(y1*f1 + y2*f2 + (f1*(f1*f1 - 1.0)*d1 + f2*(f2*f2 - 1.0)*d2) * s);
return v;
}
|
