// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
//
double FunctionTable::integral( const int i, const double d ) const
{
- double f, res = 0.0;
- if( value( myData[2*i]+d, f ) )
- res = ( myData[2*i+1] + f ) / 2.0 * d;
-
+ double f1,f2, res = 0.0;
+ if( value( myData[2*i]+d, f1 ) )
+ if(!value(myData[2*i], f2))
+ f2 = myData[2*i+1];
+ res = (f2+f1) * d / 2.0;
return res;
}
bool FunctionTable::findBounds( const double x, int& x_ind_1, int& x_ind_2 ) const
{
- int n = myData.size();
+ int n = myData.size() / 2;
if( n==0 || x<myData[0] )
{
x_ind_1 = x_ind_2 = 0;
double FunctionExpr::integral( const double a, const double b ) const
{
double res = 0.0;
- CASCatch_TRY
- {
- math_GaussSingleIntegration _int( ( math_Function& )*this, a, b, 20 );
+ CASCatch_TRY {
+ // skl for IPAL13079 (bug on Mandriva) - other cast
+ //math_GaussSingleIntegration _int( ( math_Function& )*this, a, b, 20 );
+ math_GaussSingleIntegration _int( *static_cast<math_Function*>( const_cast<FunctionExpr*> (this) ), a, b, 20 );
if( _int.IsDone() )
res = _int.Value();
}